third_codes/mapstruct
1
0
Fork 0
mirror of https://github.com/mapstruct/mapstruct.git synced 2025-07-12 00:00:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

#849 Missing imports for generic type parameters on Iterable and Maps

Browse Source
This commit is contained in:
sjaakd 2016-08-27 21:26:46 +02:00
parent e793853fc8
commit ccb0f34575
5 changed files with 167 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
processor/src/main/java/org/mapstruct/ap/internal/model/assignment/GetterWrapperForCollectionsAndMaps.java
View File

@ -75,6 +75,7 @@ public class GetterWrapperForCollectionsAndMaps extends AssignmentWrapper {
Set<Type> imported = new HashSet<Type>();
imported.addAll( super.getImportTypes() );
imported.add( localVarType ); /* is a local var */
imported.addAll( localVarType.getTypeParameters() );
return imported;
}

37
processor/src/test/java/org/mapstruct/ap/test/bugs/_849/Issue849Mapper.java Normal file
View File

@ -0,0 +1,37 @@
/**
* Copyright 2012-2016 Gunnar Morling (http://www.gunnarmorling.de/)
* and/or other contributors as indicated by the @authors tag. See the
* copyright.txt file in the distribution for a full listing of all
* contributors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.bugs._849;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
/**
*
* @author Sjaak Derksen
*/
@Mapper
public interface Issue849Mapper {
Issue849Mapper INSTANCE = Mappers.getMapper( Issue849Mapper.class );
@Mapping(source = "sourceList", target = "targetList")
Target mapSourceToTarget(Source source);
}

50
processor/src/test/java/org/mapstruct/ap/test/bugs/_849/Issue849Test.java Normal file
View File

@ -0,0 +1,50 @@
/**
* Copyright 2012-2016 Gunnar Morling (http://www.gunnarmorling.de/)
* and/or other contributors as indicated by the @authors tag. See the
* copyright.txt file in the distribution for a full listing of all
* contributors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.bugs._849;
import java.io.Serializable;
import java.util.Arrays;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mapstruct.ap.testutil.IssueKey;
import org.mapstruct.ap.testutil.WithClasses;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
/**
* @author Andreas Gudian
*
*/
@WithClasses({ Source.class, Target.class, Issue849Mapper.class })
@RunWith(AnnotationProcessorTestRunner.class)
public class Issue849Test {
@Test
@IssueKey("849")
public void shouldCompileWithAllImportsDeclared() {
Source source = new Source();
source.setSourceList( Arrays.asList( (Serializable) "test" ) );
Target target = Issue849Mapper.INSTANCE.mapSourceToTarget( source );
assertThat( target.getTargetList() ).containsExactly( "test" );
}
}

39
processor/src/test/java/org/mapstruct/ap/test/bugs/_849/Source.java Normal file
View File

@ -0,0 +1,39 @@
/**
* Copyright 2012-2016 Gunnar Morling (http://www.gunnarmorling.de/)
* and/or other contributors as indicated by the @authors tag. See the
* copyright.txt file in the distribution for a full listing of all
* contributors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.bugs._849;
import java.io.Serializable;
import java.util.List;
/**
*
* @author Sjaak Derksen
*/
public class Source {
private List<Serializable> sourceList;
public List<Serializable> getSourceList() {
return sourceList;
}
public void setSourceList(List<Serializable> sourceList) {
this.sourceList = sourceList;
}
}

40
processor/src/test/java/org/mapstruct/ap/test/bugs/_849/Target.java Normal file
View File

@ -0,0 +1,40 @@
/**
* Copyright 2012-2016 Gunnar Morling (http://www.gunnarmorling.de/)
* and/or other contributors as indicated by the @authors tag. See the
* copyright.txt file in the distribution for a full listing of all
* contributors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.bugs._849;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
/**
*
* @author Sjaak Derksen
*/
public class Target {
private List<Serializable> targetList;
public List<Serializable> getTargetList() {
if ( targetList == null ) {
targetList = new ArrayList<Serializable>();
}
return targetList;
}
}