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

Merge branch '1.1-master' into master

Browse Source
This commit is contained in:
Andreas Gudian 2016-11-14 22:32:46 +01:00
commit f22eb766f2
7 changed files with 218 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/UpdateWrapper.java
View File

@ -78,6 +78,7 @@ public class UpdateWrapper extends AssignmentWrapper {
imported.addAll( super.getImportTypes() );
if ( targetImplementationType != null ) {
imported.add( targetImplementationType );
imported.addAll( targetImplementationType.getTypeParameters() );
}
return imported;
}

37
processor/src/test/java/org/mapstruct/ap/test/bugs/_955/CarMapper.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._955;
import org.mapstruct.Mapper;
import org.mapstruct.MappingTarget;
import org.mapstruct.ap.test.bugs._955.dto.Car;
import org.mapstruct.ap.test.bugs._955.dto.SuperCar;
import org.mapstruct.factory.Mappers;
/**
*
* @author Sjaak Derksen
*/
@Mapper(uses = {CustomMapper.class})
public interface CarMapper {
CarMapper INSTANCE = Mappers.getMapper( CarMapper.class );
SuperCar mapCar(Car source, @MappingTarget SuperCar destination);
}

34
processor/src/test/java/org/mapstruct/ap/test/bugs/_955/CustomMapper.java Normal file
View File

@ -0,0 +1,34 @@
/**
* 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._955;
import java.util.Map;
import org.mapstruct.MappingTarget;
import org.mapstruct.ap.test.bugs._955.dto.Person;
/**
*
* @author Sjaak Derksen
*/
public class CustomMapper {
public Map<String, Person> merge(Map<String, Person> source, @MappingTarget Map<String, Person> destination) {
return destination;
}
}

41
processor/src/test/java/org/mapstruct/ap/test/bugs/_955/Issue955Test.java Normal file
View File

@ -0,0 +1,41 @@
/**
* 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._955;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mapstruct.ap.test.bugs._955.dto.Car;
import org.mapstruct.ap.test.bugs._955.dto.Person;
import org.mapstruct.ap.test.bugs._955.dto.SuperCar;
import org.mapstruct.ap.testutil.IssueKey;
import org.mapstruct.ap.testutil.WithClasses;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
/**
*
* @author Sjaak Derksen
*/
@IssueKey( "955" )
@RunWith(AnnotationProcessorTestRunner.class)
@WithClasses( { CarMapper.class, CustomMapper.class, Car.class, SuperCar.class, Person.class } )
public class Issue955Test {
@Test
public void shouldCompile() { }
}

39
processor/src/test/java/org/mapstruct/ap/test/bugs/_955/dto/Car.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._955.dto;
import java.util.HashMap;
import java.util.Map;
/**
*
* @author Sjaak Derksen
*/
public class Car {
private Map<String, Person> persons = new HashMap<String, Person>();
public Map<String, Person> getPersons() {
return persons;
}
public void setPersons(Map<String, Person> persons) {
this.persons = persons;
}
}

27
processor/src/test/java/org/mapstruct/ap/test/bugs/_955/dto/Person.java Normal file
View File

@ -0,0 +1,27 @@
/**
* 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._955.dto;
/**
*
* @author Sjaak Derksen
*/
public class Person {
}

39
processor/src/test/java/org/mapstruct/ap/test/bugs/_955/dto/SuperCar.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._955.dto;
import java.util.HashMap;
import java.util.Map;
/**
*
* @author Sjaak Derksen
*/
public class SuperCar {
private Map<String, Person> persons = new HashMap<String, Person>();
public Map<String, Person> getPersons() {
return persons;
}
public void setPersons(Map<String, Person> persons) {
this.persons = persons;
}
}