From 18532ace8c70eb97dc8ee39240c46abd7b1ff2c0 Mon Sep 17 00:00:00 2001 From: sjaakd Date: Sun, 13 Sep 2015 23:22:01 +0200 Subject: [PATCH] #636 - adapt integration test for default and static interface methods (Java8) to eclipse compiler problem --- .../ap/test/bugs/_636/SourceTargetBaseMapper.java | 8 +------- .../mapstruct/ap/test/bugs/_636/SourceTargetMapper.java | 8 ++++++++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/integrationtest/src/test/resources/java8Test/src/main/java/org/mapstruct/ap/test/bugs/_636/SourceTargetBaseMapper.java b/integrationtest/src/test/resources/java8Test/src/main/java/org/mapstruct/ap/test/bugs/_636/SourceTargetBaseMapper.java index 86f383551..a30dbb83e 100644 --- a/integrationtest/src/test/resources/java8Test/src/main/java/org/mapstruct/ap/test/bugs/_636/SourceTargetBaseMapper.java +++ b/integrationtest/src/test/resources/java8Test/src/main/java/org/mapstruct/ap/test/bugs/_636/SourceTargetBaseMapper.java @@ -23,12 +23,6 @@ import org.mapstruct.Mapper; @Mapper public interface SourceTargetBaseMapper { + // TODO.. move default and static interface method here when problem in eclipse processor is fixed. - default Foo fooFromId(long id) { - return new Foo(id); - } - - static Bar barFromId(String id) { - return new Bar(id); - } } diff --git a/integrationtest/src/test/resources/java8Test/src/main/java/org/mapstruct/ap/test/bugs/_636/SourceTargetMapper.java b/integrationtest/src/test/resources/java8Test/src/main/java/org/mapstruct/ap/test/bugs/_636/SourceTargetMapper.java index 4caca2b0f..a1dfef4f5 100644 --- a/integrationtest/src/test/resources/java8Test/src/main/java/org/mapstruct/ap/test/bugs/_636/SourceTargetMapper.java +++ b/integrationtest/src/test/resources/java8Test/src/main/java/org/mapstruct/ap/test/bugs/_636/SourceTargetMapper.java @@ -33,4 +33,12 @@ public interface SourceTargetMapper extends SourceTargetBaseMapper { }) Target mapSourceToTarget(Source source); + default Foo fooFromId(long id) { + return new Foo(id); + } + + static Bar barFromId(String id) { + return new Bar(id); + } + }