From 73711cc6837bc20394d612759f3de66764300c5d Mon Sep 17 00:00:00 2001 From: Filip Hrisafov Date: Sun, 25 Feb 2018 21:58:05 +0100 Subject: [PATCH] #782 Rename Lombok Integration test classes --- .../abstractBuilder/AbstractBuilderTest.java | 28 ++++++------ ...get.java => AbstractImmutableProduct.java} | 12 ++--- ...ilder.java => AbstractProductBuilder.java} | 8 ++-- ...tableTarget.java => ImmutableProduct.java} | 28 ++++++------ .../{Target.java => Product.java} | 6 +-- .../{Source.java => ProductDto.java} | 30 ++++++------- ...leTargetMapper.java => ProductMapper.java} | 8 ++-- ... => AbstractGenericTargetBuilderTest.java} | 44 ++++++++++++------- .../{AbstractChildTarget.java => Child.java} | 4 +- .../abstractGenericTarget/ChildSource.java | 14 +++--- ...ildTargetImpl.java => ImmutableChild.java} | 26 +++++------ ...ntTargetImpl.java => ImmutableParent.java} | 36 +++++++-------- ...ChildTargetImpl.java => MutableChild.java} | 12 ++--- ...rentTargetImpl.java => MutableParent.java} | 22 +++++----- ...{AbstractParentTarget.java => Parent.java} | 6 +-- ...actTargetMapper.java => ParentMapper.java} | 12 ++--- .../abstractGenericTarget/ParentSource.java | 20 ++++----- ...getTest.java => ImmutableProductTest.java} | 2 +- ...yTest.java => ProductTypeFactoryTest.java} | 2 +- ....java => NestedProductPropertiesTest.java} | 2 +- ...rgetTest.java => UnmappedProductTest.java} | 2 +- 21 files changed, 167 insertions(+), 157 deletions(-) rename processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/{AbstractImmutableTarget.java => AbstractImmutableProduct.java} (77%) rename processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/{AbstractTargetBuilder.java => AbstractProductBuilder.java} (83%) rename processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/{ImmutableTarget.java => ImmutableProduct.java} (59%) rename processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/{Target.java => Product.java} (92%) rename processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/{Source.java => ProductDto.java} (66%) rename processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/{ImmutableTargetMapper.java => ProductMapper.java} (80%) rename processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/{AbstractTargetBuilderTest.java => AbstractGenericTargetBuilderTest.java} (56%) rename processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/{AbstractChildTarget.java => Child.java} (93%) rename processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/{ImmutableChildTargetImpl.java => ImmutableChild.java} (61%) rename processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/{ImmutableParentTargetImpl.java => ImmutableParent.java} (58%) rename processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/{MutableChildTargetImpl.java => MutableChild.java} (81%) rename processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/{MutableParentTargetImpl.java => MutableParent.java} (64%) rename processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/{AbstractParentTarget.java => Parent.java} (86%) rename processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/{AbstractTargetMapper.java => ParentMapper.java} (74%) rename processor/src/test/java/org/mapstruct/ap/test/collection/immutabletarget/{ImmutableTargetTest.java => ImmutableProductTest.java} (98%) rename processor/src/test/java/org/mapstruct/ap/test/factories/targettype/{TargetTypeFactoryTest.java => ProductTypeFactoryTest.java} (98%) rename processor/src/test/java/org/mapstruct/ap/test/nestedtargetproperties/{NestedTargetPropertiesTest.java => NestedProductPropertiesTest.java} (99%) rename processor/src/test/java/org/mapstruct/ap/test/unmappedtarget/{UnmappedTargetTest.java => UnmappedProductTest.java} (99%) diff --git a/processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/AbstractBuilderTest.java b/processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/AbstractBuilderTest.java index cba7830a8..94ccde4b8 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/AbstractBuilderTest.java +++ b/processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/AbstractBuilderTest.java @@ -30,12 +30,12 @@ import static org.assertj.core.api.Assertions.assertThat; * builder class, and some of the properties are written by the concrete builder implementation. */ @WithClasses({ - Target.class, - AbstractTargetBuilder.class, - AbstractImmutableTarget.class, - ImmutableTarget.class, - Source.class, - ImmutableTargetMapper.class + Product.class, + AbstractProductBuilder.class, + AbstractImmutableProduct.class, + ImmutableProduct.class, + ProductDto.class, + ProductMapper.class }) @RunWith(AnnotationProcessorTestRunner.class) public class AbstractBuilderTest { @@ -51,20 +51,20 @@ public class AbstractBuilderTest { */ @Test public void testThatAbstractBuilderMapsAllProperties() { - ImmutableTarget sourceOne = ImmutableTargetMapper.INSTANCE.fromMutable( new Source( "foo", 31 ) ); + ImmutableProduct product = ProductMapper.INSTANCE.fromMutable( new ProductDto( "router", 31 ) ); - assertThat( sourceOne.getBar() ).isEqualTo( 31 ); - assertThat( sourceOne.getFoo() ).isEqualTo( "foo" ); + assertThat( product.getPrice() ).isEqualTo( 31 ); + assertThat( product.getName() ).isEqualTo( "router" ); } @Test public void testThatAbstractBuilderReverseMapsAllProperties() { - Source sourceOne = ImmutableTargetMapper.INSTANCE.fromImmutable( ImmutableTarget.builder() - .bar( 31 ) - .foo( "foo" ) + ProductDto product = ProductMapper.INSTANCE.fromImmutable( ImmutableProduct.builder() + .price( 31000 ) + .name( "car" ) .build() ); - assertThat( sourceOne.getBar() ).isEqualTo( 31 ); - assertThat( sourceOne.getFoo() ).isEqualTo( "foo" ); + assertThat( product.getPrice() ).isEqualTo( 31000 ); + assertThat( product.getName() ).isEqualTo( "car" ); } } diff --git a/processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/AbstractImmutableTarget.java b/processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/AbstractImmutableProduct.java similarity index 77% rename from processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/AbstractImmutableTarget.java rename to processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/AbstractImmutableProduct.java index 6c59b4b5a..4be4ab3ca 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/AbstractImmutableTarget.java +++ b/processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/AbstractImmutableProduct.java @@ -21,15 +21,15 @@ package org.mapstruct.ap.test.builder.abstractBuilder; /** * @author Filip Hrisafov */ -public abstract class AbstractImmutableTarget implements Target { +public abstract class AbstractImmutableProduct implements Product { - private final String foo; + private final String name; - public AbstractImmutableTarget(AbstractTargetBuilder builder) { - this.foo = builder.foo; + public AbstractImmutableProduct(AbstractProductBuilder builder) { + this.name = builder.name; } - public String getFoo() { - return foo; + public String getName() { + return name; } } diff --git a/processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/AbstractTargetBuilder.java b/processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/AbstractProductBuilder.java similarity index 83% rename from processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/AbstractTargetBuilder.java rename to processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/AbstractProductBuilder.java index 4869dbe36..b462b6775 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/AbstractTargetBuilder.java +++ b/processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/AbstractProductBuilder.java @@ -18,12 +18,12 @@ */ package org.mapstruct.ap.test.builder.abstractBuilder; -public abstract class AbstractTargetBuilder { +public abstract class AbstractProductBuilder { - protected String foo; + protected String name; - public AbstractTargetBuilder foo(String foo) { - this.foo = foo; + public AbstractProductBuilder name(String name) { + this.name = name; return this; } diff --git a/processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/ImmutableTarget.java b/processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/ImmutableProduct.java similarity index 59% rename from processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/ImmutableTarget.java rename to processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/ImmutableProduct.java index a09cfedf5..9745673ec 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/ImmutableTarget.java +++ b/processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/ImmutableProduct.java @@ -18,35 +18,35 @@ */ package org.mapstruct.ap.test.builder.abstractBuilder; -public class ImmutableTarget extends AbstractImmutableTarget { +public class ImmutableProduct extends AbstractImmutableProduct { - private final Integer bar; + private final Integer price; - public ImmutableTarget(ImmutableTargetBuilder builder) { + public ImmutableProduct(ImmutableProductBuilder builder) { super( builder ); - this.bar = builder.bar; + this.price = builder.price; } - public static ImmutableTargetBuilder builder() { - return new ImmutableTargetBuilder(); + public static ImmutableProductBuilder builder() { + return new ImmutableProductBuilder(); } @Override - public Integer getBar() { - return bar; + public Integer getPrice() { + return price; } - public static class ImmutableTargetBuilder extends AbstractTargetBuilder { - private Integer bar; + public static class ImmutableProductBuilder extends AbstractProductBuilder { + private Integer price; - public ImmutableTargetBuilder bar(Integer bar) { - this.bar = bar; + public ImmutableProductBuilder price(Integer price) { + this.price = price; return this; } @Override - public ImmutableTarget build() { - return new ImmutableTarget( this ); + public ImmutableProduct build() { + return new ImmutableProduct( this ); } } } diff --git a/processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/Target.java b/processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/Product.java similarity index 92% rename from processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/Target.java rename to processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/Product.java index 855cf5b1f..b8b819740 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/Target.java +++ b/processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/Product.java @@ -18,8 +18,8 @@ */ package org.mapstruct.ap.test.builder.abstractBuilder; -public interface Target { - String getFoo(); +public interface Product { + String getName(); - Integer getBar(); + Integer getPrice(); } diff --git a/processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/Source.java b/processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/ProductDto.java similarity index 66% rename from processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/Source.java rename to processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/ProductDto.java index b7e57cec6..30b4c9d8a 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/Source.java +++ b/processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/ProductDto.java @@ -18,31 +18,31 @@ */ package org.mapstruct.ap.test.builder.abstractBuilder; -public class Source { - private String foo; - private Integer bar; +public class ProductDto { + private String name; + private Integer price; - public Source() { + public ProductDto() { } - public Source(String foo, Integer bar) { - this.foo = foo; - this.bar = bar; + public ProductDto(String name, Integer price) { + this.name = name; + this.price = price; } - public String getFoo() { - return foo; + public String getName() { + return name; } - public void setFoo(String foo) { - this.foo = foo; + public void setName(String name) { + this.name = name; } - public Integer getBar() { - return bar; + public Integer getPrice() { + return price; } - public void setBar(Integer bar) { - this.bar = bar; + public void setPrice(Integer price) { + this.price = price; } } diff --git a/processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/ImmutableTargetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/ProductMapper.java similarity index 80% rename from processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/ImmutableTargetMapper.java rename to processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/ProductMapper.java index f41bfe3c7..937935a37 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/ImmutableTargetMapper.java +++ b/processor/src/test/java/org/mapstruct/ap/test/builder/abstractBuilder/ProductMapper.java @@ -22,11 +22,11 @@ import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; @Mapper -public interface ImmutableTargetMapper { +public interface ProductMapper { - ImmutableTargetMapper INSTANCE = Mappers.getMapper( ImmutableTargetMapper.class ); + ProductMapper INSTANCE = Mappers.getMapper( ProductMapper.class ); - ImmutableTarget fromMutable(Source source); + ImmutableProduct fromMutable(ProductDto source); - Source fromImmutable(ImmutableTarget source); + ProductDto fromImmutable(ImmutableProduct source); } diff --git a/processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/AbstractTargetBuilderTest.java b/processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/AbstractGenericTargetBuilderTest.java similarity index 56% rename from processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/AbstractTargetBuilderTest.java rename to processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/AbstractGenericTargetBuilderTest.java index 02e751078..cf3913c17 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/AbstractTargetBuilderTest.java +++ b/processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/AbstractGenericTargetBuilderTest.java @@ -18,44 +18,54 @@ */ package org.mapstruct.ap.test.builder.abstractGenericTarget; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; import org.mapstruct.ap.testutil.WithClasses; import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * Verifies that abstract builders work when mapping to an abstract property type. */ @WithClasses({ - AbstractChildTarget.class, - AbstractParentTarget.class, + Child.class, + Parent.class, ChildSource.class, - ImmutableChildTargetImpl.class, - ImmutableParentTargetImpl.class, - MutableChildTargetImpl.class, - MutableParentTargetImpl.class, + ImmutableChild.class, + ImmutableParent.class, + MutableChild.class, + MutableParent.class, ParentSource.class, - AbstractTargetMapper.class + ParentMapper.class }) @RunWith(AnnotationProcessorTestRunner.class) -public class AbstractTargetBuilderTest { +public class AbstractGenericTargetBuilderTest { @Test public void testAbstractTargetMapper() { ParentSource parent = new ParentSource(); parent.setCount( 4 ); - parent.setNested( new ChildSource( "Phineas" ) ); + parent.setChild( new ChildSource( "Phineas" ) ); + parent.setNonGenericChild( new ChildSource( "Ferb" ) ); // transform - AbstractParentTarget immutableTarget = AbstractTargetMapper.INSTANCE.toImmutable( parent ); - AbstractParentTarget mutableTarget = AbstractTargetMapper.INSTANCE.toMutable( parent ); + Parent immutableParent = ParentMapper.INSTANCE.toImmutable( parent ); + assertThat( immutableParent.getCount() ).isEqualTo( 4 ); + assertThat( immutableParent.getChild().getName() ).isEqualTo( "Phineas" ); + assertThat( immutableParent.getNonGenericChild() ) + .isNotNull() + .isInstanceOf( ImmutableChild.class ); + assertThat( immutableParent.getNonGenericChild().getName() ).isEqualTo( "Ferb" ); - assertThat( mutableTarget.getCount() ).isEqualTo( 4 ); - assertThat( mutableTarget.getNested().getBar() ).isEqualTo( "Phineas" ); + Parent mutableParent = ParentMapper.INSTANCE.toMutable( parent ); + + assertThat( mutableParent.getCount() ).isEqualTo( 4 ); + assertThat( mutableParent.getChild().getName() ).isEqualTo( "Phineas" ); + assertThat( mutableParent.getNonGenericChild() ) + .isNotNull() + .isInstanceOf( ImmutableChild.class ); + assertThat( mutableParent.getNonGenericChild().getName() ).isEqualTo( "Ferb" ); - assertThat( immutableTarget.getCount() ).isEqualTo( 4 ); - assertThat( immutableTarget.getNested().getBar() ).isEqualTo( "Phineas" ); } } diff --git a/processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/AbstractChildTarget.java b/processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/Child.java similarity index 93% rename from processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/AbstractChildTarget.java rename to processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/Child.java index 0d8e5c290..306d4b1b6 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/AbstractChildTarget.java +++ b/processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/Child.java @@ -18,6 +18,6 @@ */ package org.mapstruct.ap.test.builder.abstractGenericTarget; -public interface AbstractChildTarget { - String getBar(); +public interface Child { + String getName(); } diff --git a/processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/ChildSource.java b/processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/ChildSource.java index 704c809d0..1884f8cef 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/ChildSource.java +++ b/processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/ChildSource.java @@ -19,20 +19,20 @@ package org.mapstruct.ap.test.builder.abstractGenericTarget; public class ChildSource { - private String bar; + private String name; public ChildSource() { } - public ChildSource(String bar) { - this.bar = bar; + public ChildSource(String name) { + this.name = name; } - public String getBar() { - return bar; + public String getName() { + return name; } - public void setBar(String bar) { - this.bar = bar; + public void setName(String name) { + this.name = name; } } diff --git a/processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/ImmutableChildTargetImpl.java b/processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/ImmutableChild.java similarity index 61% rename from processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/ImmutableChildTargetImpl.java rename to processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/ImmutableChild.java index 67bb62546..becdb4fab 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/ImmutableChildTargetImpl.java +++ b/processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/ImmutableChild.java @@ -18,31 +18,31 @@ */ package org.mapstruct.ap.test.builder.abstractGenericTarget; -public class ImmutableChildTargetImpl implements AbstractChildTarget { - private final String bar; +public class ImmutableChild implements Child { + private final String name; - private ImmutableChildTargetImpl(ImmutableChildTargetImpl.Builder builder) { - this.bar = builder.bar; + private ImmutableChild(ImmutableChild.Builder builder) { + this.name = builder.name; } - public static ImmutableChildTargetImpl.Builder builder() { - return new ImmutableChildTargetImpl.Builder(); + public static ImmutableChild.Builder builder() { + return new ImmutableChild.Builder(); } - public String getBar() { - return bar; + public String getName() { + return name; } public static class Builder { - private String bar; + private String name; - public ImmutableChildTargetImpl.Builder bar(String bar) { - this.bar = bar; + public ImmutableChild.Builder name(String name) { + this.name = name; return this; } - public ImmutableChildTargetImpl build() { - return new ImmutableChildTargetImpl( this ); + public ImmutableChild build() { + return new ImmutableChild( this ); } } } diff --git a/processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/ImmutableParentTargetImpl.java b/processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/ImmutableParent.java similarity index 58% rename from processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/ImmutableParentTargetImpl.java rename to processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/ImmutableParent.java index 6973943cc..392ccbf97 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/ImmutableParentTargetImpl.java +++ b/processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/ImmutableParent.java @@ -18,15 +18,15 @@ */ package org.mapstruct.ap.test.builder.abstractGenericTarget; -public class ImmutableParentTargetImpl implements AbstractParentTarget { +public class ImmutableParent implements Parent { private final int count; - private final ImmutableChildTargetImpl nested; - private final AbstractChildTarget nonGenericizedNested; + private final ImmutableChild child; + private final Child nonGenericChild; - public ImmutableParentTargetImpl(Builder builder) { + public ImmutableParent(Builder builder) { this.count = builder.count; - this.nested = builder.nested; - this.nonGenericizedNested = builder.nonGenericizedNested; + this.child = builder.child; + this.nonGenericChild = builder.nonGenericChild; } public static Builder builder() { @@ -34,8 +34,8 @@ public class ImmutableParentTargetImpl implements AbstractParentTarget { +public class MutableParent implements Parent { private int count; - private ImmutableChildTargetImpl nested; - private AbstractChildTarget nonGenericizedNested; + private ImmutableChild child; + private Child nonGenericChild; @Override public int getCount() { @@ -33,20 +33,20 @@ public class MutableParentTargetImpl implements AbstractParentTarget { +public interface Parent { int getCount(); - T getNested(); + T getChild(); - AbstractChildTarget getNonGenericizedNested(); + Child getNonGenericChild(); } diff --git a/processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/AbstractTargetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/ParentMapper.java similarity index 74% rename from processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/AbstractTargetMapper.java rename to processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/ParentMapper.java index a1e5217ae..372f34dc0 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/AbstractTargetMapper.java +++ b/processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/ParentMapper.java @@ -22,18 +22,18 @@ import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; @Mapper -public interface AbstractTargetMapper { +public interface ParentMapper { - AbstractTargetMapper INSTANCE = Mappers.getMapper( AbstractTargetMapper.class ); + ParentMapper INSTANCE = Mappers.getMapper( ParentMapper.class ); - ImmutableParentTargetImpl toImmutable(ParentSource parentSource); + ImmutableParent toImmutable(ParentSource parentSource); - MutableParentTargetImpl toMutable(ParentSource parentSource); + MutableParent toMutable(ParentSource parentSource); /** - * This method allows mapstruct to successfully write to {@link ImmutableParentTargetImpl#nonGenericizedNested} + * This method allows mapstruct to successfully write to {@link ImmutableParent#nonGenericChild} * by providing a concrete class to convert to. */ - ImmutableChildTargetImpl toChild(ChildSource child); + ImmutableChild toChild(ChildSource child); } diff --git a/processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/ParentSource.java b/processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/ParentSource.java index 4470547c0..bf0f378bb 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/ParentSource.java +++ b/processor/src/test/java/org/mapstruct/ap/test/builder/abstractGenericTarget/ParentSource.java @@ -20,15 +20,15 @@ package org.mapstruct.ap.test.builder.abstractGenericTarget; public class ParentSource { private int count; - private ChildSource nested; - private ChildSource nonGenericizedNested; + private ChildSource child; + private ChildSource nonGenericChild; - public ChildSource getNonGenericizedNested() { - return nonGenericizedNested; + public ChildSource getNonGenericChild() { + return nonGenericChild; } - public void setNonGenericizedNested(ChildSource nonGenericizedNested) { - this.nonGenericizedNested = nonGenericizedNested; + public void setNonGenericChild(ChildSource nonGenericChild) { + this.nonGenericChild = nonGenericChild; } public int getCount() { @@ -39,11 +39,11 @@ public class ParentSource { this.count = count; } - public ChildSource getNested() { - return nested; + public ChildSource getChild() { + return child; } - public void setNested(ChildSource nested) { - this.nested = nested; + public void setChild(ChildSource child) { + this.child = child; } } diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/immutabletarget/ImmutableTargetTest.java b/processor/src/test/java/org/mapstruct/ap/test/collection/immutabletarget/ImmutableProductTest.java similarity index 98% rename from processor/src/test/java/org/mapstruct/ap/test/collection/immutabletarget/ImmutableTargetTest.java rename to processor/src/test/java/org/mapstruct/ap/test/collection/immutabletarget/ImmutableProductTest.java index 5d331a4f8..15561a43d 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/collection/immutabletarget/ImmutableTargetTest.java +++ b/processor/src/test/java/org/mapstruct/ap/test/collection/immutabletarget/ImmutableProductTest.java @@ -39,7 +39,7 @@ import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner; @RunWith(AnnotationProcessorTestRunner.class) @WithClasses({CupboardDto.class, CupboardEntity.class, CupboardMapper.class}) @IssueKey( "1126" ) -public class ImmutableTargetTest { +public class ImmutableProductTest { @Test public void shouldHandleImmutableTarget() { diff --git a/processor/src/test/java/org/mapstruct/ap/test/factories/targettype/TargetTypeFactoryTest.java b/processor/src/test/java/org/mapstruct/ap/test/factories/targettype/ProductTypeFactoryTest.java similarity index 98% rename from processor/src/test/java/org/mapstruct/ap/test/factories/targettype/TargetTypeFactoryTest.java rename to processor/src/test/java/org/mapstruct/ap/test/factories/targettype/ProductTypeFactoryTest.java index c0b6217f2..4e61915d1 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/factories/targettype/TargetTypeFactoryTest.java +++ b/processor/src/test/java/org/mapstruct/ap/test/factories/targettype/ProductTypeFactoryTest.java @@ -31,7 +31,7 @@ import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner; @WithClasses( { Foo9Base.class, Foo9Child.class, Bar9Base.class, Bar9Child.class, Bar9Factory.class, TargetTypeFactoryTestMapper.class } ) @RunWith( AnnotationProcessorTestRunner.class ) -public class TargetTypeFactoryTest { +public class ProductTypeFactoryTest { @Test public void shouldUseFactoryTwoCreateBaseClassDueToTargetType() { diff --git a/processor/src/test/java/org/mapstruct/ap/test/nestedtargetproperties/NestedTargetPropertiesTest.java b/processor/src/test/java/org/mapstruct/ap/test/nestedtargetproperties/NestedProductPropertiesTest.java similarity index 99% rename from processor/src/test/java/org/mapstruct/ap/test/nestedtargetproperties/NestedTargetPropertiesTest.java rename to processor/src/test/java/org/mapstruct/ap/test/nestedtargetproperties/NestedProductPropertiesTest.java index c1976d656..012afbff9 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/nestedtargetproperties/NestedTargetPropertiesTest.java +++ b/processor/src/test/java/org/mapstruct/ap/test/nestedtargetproperties/NestedProductPropertiesTest.java @@ -50,7 +50,7 @@ import static org.assertj.core.api.Assertions.assertThat; } ) @IssueKey("389") @RunWith(AnnotationProcessorTestRunner.class) -public class NestedTargetPropertiesTest { +public class NestedProductPropertiesTest { @Rule public GeneratedSource generatedSource = new GeneratedSource().addComparisonToFixtureFor( diff --git a/processor/src/test/java/org/mapstruct/ap/test/unmappedtarget/UnmappedTargetTest.java b/processor/src/test/java/org/mapstruct/ap/test/unmappedtarget/UnmappedProductTest.java similarity index 99% rename from processor/src/test/java/org/mapstruct/ap/test/unmappedtarget/UnmappedTargetTest.java rename to processor/src/test/java/org/mapstruct/ap/test/unmappedtarget/UnmappedProductTest.java index cc5de42ac..b02a5d8d6 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/unmappedtarget/UnmappedTargetTest.java +++ b/processor/src/test/java/org/mapstruct/ap/test/unmappedtarget/UnmappedProductTest.java @@ -39,7 +39,7 @@ import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner; */ @IssueKey("35") @RunWith(AnnotationProcessorTestRunner.class) -public class UnmappedTargetTest { +public class UnmappedProductTest { @Test @WithClasses({ Source.class, Target.class, SourceTargetMapper.class })