From 8c8f27ca6b060f3be512499d433becd357c8c9b7 Mon Sep 17 00:00:00 2001 From: Gunnar Morling Date: Sat, 22 Feb 2014 10:43:46 +0100 Subject: [PATCH] #103 Formatting, added a todo --- processor/src/main/java/org/mapstruct/ap/model/Mapper.java | 1 - .../java/org/mapstruct/ap/model/common/Accessibility.java | 1 - .../main/java/org/mapstruct/ap/model/source/Method.java | 1 - .../mapstruct/ap/test/accessibility/AccessibilityTest.java | 7 ++++--- .../test/accessibility/DefaultSourceTargetMapperAbstr.java | 1 - .../test/accessibility/DefaultSourceTargetMapperIfc.java | 1 - .../java/org/mapstruct/ap/testutil/MapperTestBase.java | 1 + 7 files changed, 5 insertions(+), 8 deletions(-) diff --git a/processor/src/main/java/org/mapstruct/ap/model/Mapper.java b/processor/src/main/java/org/mapstruct/ap/model/Mapper.java index 80c49de72..4ffe10d46 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/Mapper.java +++ b/processor/src/main/java/org/mapstruct/ap/model/Mapper.java @@ -23,7 +23,6 @@ import java.util.Collection; import java.util.List; import java.util.SortedSet; import java.util.TreeSet; - import javax.annotation.Generated; import javax.lang.model.element.ElementKind; import javax.lang.model.element.TypeElement; diff --git a/processor/src/main/java/org/mapstruct/ap/model/common/Accessibility.java b/processor/src/main/java/org/mapstruct/ap/model/common/Accessibility.java index ff8182b4e..02f9e7d6f 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/common/Accessibility.java +++ b/processor/src/main/java/org/mapstruct/ap/model/common/Accessibility.java @@ -19,7 +19,6 @@ package org.mapstruct.ap.model.common; import java.util.Set; - import javax.lang.model.element.Modifier; /** diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/Method.java b/processor/src/main/java/org/mapstruct/ap/model/source/Method.java index 873350aea..f402c1097 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/Method.java +++ b/processor/src/main/java/org/mapstruct/ap/model/source/Method.java @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; - import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.Modifier; diff --git a/processor/src/test/java/org/mapstruct/ap/test/accessibility/AccessibilityTest.java b/processor/src/test/java/org/mapstruct/ap/test/accessibility/AccessibilityTest.java index c468bc90c..90b552767 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/accessibility/AccessibilityTest.java +++ b/processor/src/test/java/org/mapstruct/ap/test/accessibility/AccessibilityTest.java @@ -33,10 +33,11 @@ import org.testng.annotations.Test; * * @author Andreas Gudian */ -@WithClasses( { Source.class, Target.class, DefaultSourceTargetMapperAbstr.class, DefaultSourceTargetMapperIfc.class } ) +@WithClasses({ Source.class, Target.class, DefaultSourceTargetMapperAbstr.class, DefaultSourceTargetMapperIfc.class }) public class AccessibilityTest extends MapperTestBase { + @Test - @IssueKey( "103" ) + @IssueKey("103") public void testGeneratedModifiersFromAbstractClassAreCorrect() throws Exception { Class defaultFromAbstract = loadForMapper( DefaultSourceTargetMapperAbstr.class ); @@ -48,7 +49,7 @@ public class AccessibilityTest extends MapperTestBase { } @Test - @IssueKey( "103" ) + @IssueKey("103") public void testGeneratedModifiersFromInterfaceAreCorrect() throws Exception { Class defaultFromIfc = loadForMapper( DefaultSourceTargetMapperIfc.class ); diff --git a/processor/src/test/java/org/mapstruct/ap/test/accessibility/DefaultSourceTargetMapperAbstr.java b/processor/src/test/java/org/mapstruct/ap/test/accessibility/DefaultSourceTargetMapperAbstr.java index ff09fb2fb..18af6f59b 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/accessibility/DefaultSourceTargetMapperAbstr.java +++ b/processor/src/test/java/org/mapstruct/ap/test/accessibility/DefaultSourceTargetMapperAbstr.java @@ -22,7 +22,6 @@ import org.mapstruct.Mapper; /** * @author Andreas Gudian - * */ @Mapper abstract class DefaultSourceTargetMapperAbstr { diff --git a/processor/src/test/java/org/mapstruct/ap/test/accessibility/DefaultSourceTargetMapperIfc.java b/processor/src/test/java/org/mapstruct/ap/test/accessibility/DefaultSourceTargetMapperIfc.java index ed5c23bb8..04f0df525 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/accessibility/DefaultSourceTargetMapperIfc.java +++ b/processor/src/test/java/org/mapstruct/ap/test/accessibility/DefaultSourceTargetMapperIfc.java @@ -22,7 +22,6 @@ import org.mapstruct.Mapper; /** * @author Andreas Gudian - * */ @Mapper interface DefaultSourceTargetMapperIfc { diff --git a/processor/src/test/java/org/mapstruct/ap/testutil/MapperTestBase.java b/processor/src/test/java/org/mapstruct/ap/testutil/MapperTestBase.java index d2be5601c..7358be399 100644 --- a/processor/src/test/java/org/mapstruct/ap/testutil/MapperTestBase.java +++ b/processor/src/test/java/org/mapstruct/ap/testutil/MapperTestBase.java @@ -105,6 +105,7 @@ public abstract class MapperTestBase { createOutputDirs(); + // TODO #140 Is there a better way to do this? if ( !enhancedClassloader ) { // we need to make sure that the the generated classes are loaded by the same classloader as the test has // been loaded already. Otherwise some tests won't work.