#353 Making use of non-void setters

This commit is contained in:
Gunnar Morling 2014-11-25 22:27:56 +01:00
parent 48c20d4dd0
commit ecc13a8f32
5 changed files with 170 additions and 6 deletions

View File

@ -72,12 +72,10 @@ public class Executables {
public static boolean isSetterMethod(ExecutableElement method) { public static boolean isSetterMethod(ExecutableElement method) {
String name = method.getSimpleName().toString(); String name = method.getSimpleName().toString();
if ( isPublic( method ) && name.startsWith( "set" ) && name.length() > 3 && method.getParameters() return isPublic( method ) &&
.size() == 1 && method.getReturnType().getKind() == TypeKind.VOID ) { name.startsWith( "set" ) &&
return true; name.length() > 3 &&
} method.getParameters().size() == 1;
return false;
} }
public static boolean isAdderMethod(ExecutableElement method) { public static boolean isAdderMethod(ExecutableElement method) {

View File

@ -0,0 +1,46 @@
/**
* Copyright 2012-2014 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.nonvoidsetter;
public class Actor {
private int oscars;
private String name;
public Actor(int oscars, String name) {
this.oscars = oscars;
this.name = name;
}
public int getOscars() {
return oscars;
}
public void setOscars(int oscars) {
this.oscars = oscars;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
}

View File

@ -0,0 +1,43 @@
/**
* Copyright 2012-2014 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.nonvoidsetter;
public class ActorDto {
private int oscars;
private String name;
public int getOscars() {
return oscars;
}
public ActorDto setOscars(int oscars) {
this.oscars = oscars;
return this;
}
public String getName() {
return name;
}
public ActorDto setName(String name) {
this.name = name;
return this;
}
}

View File

@ -0,0 +1,30 @@
/**
* Copyright 2012-2014 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.nonvoidsetter;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
@Mapper
public interface ActorMapper {
ActorMapper INSTANCE = Mappers.getMapper( ActorMapper.class );
ActorDto actorToActorDto(Actor actor);
}

View File

@ -0,0 +1,47 @@
/**
* Copyright 2012-2014 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.nonvoidsetter;
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;
import static org.fest.assertions.Assertions.assertThat;
/**
* Test for using non-void setters (fluent style) in the target.
*
* @author Gunnar Morling
*/
@WithClasses({ Actor.class, ActorDto.class, ActorMapper.class })
@RunWith(AnnotationProcessorTestRunner.class)
public class NonVoidSettersTest {
@Test
@IssueKey("353")
public void shouldMapAttributeWithoutSetterInSourceType() {
ActorDto target = ActorMapper.INSTANCE.actorToActorDto( new Actor( 3, "Hickory Black" ) );
assertThat( target ).isNotNull();
assertThat( target.getName() ).isEqualTo( "Hickory Black" );
assertThat( target.getOscars() ).isEqualTo( 3 );
}
}