Adding first tests

Author: cardil

.travis.yml

@@ -1,2 +1,12 @@
 language: java
-script: ./mvnw verify
+script: ./mvnw install --fail-at-end
+matrix:
+  include:
+  - jdk: openjdk8
+    env: JACOCO=true COVERALLS=true
+  - jdk: oraclejdk8
+  - jdk: oraclejdk9
+  - jdk: openjdk8
+    env: GDMSESSION=sonar
+  - jdk: openjdk8
+    env: SONAR=publish

pom.xml

@@ -100,6 +100,13 @@
       <version>[1.2.0.Final,2.0.0)</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.mapstruct</groupId>
+      <artifactId>mapstruct-processor</artifactId>
+      <version>[1.2.0.Final,2.0.0)</version>
+      <scope>provided</scope>
+      <optional>true</optional>
+    </dependency>
 
     <!-- runtime -->
     <dependency>
@@ -121,6 +128,24 @@
       <version>3.9.1</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>2.18.3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
+      <version>4.2.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-core</artifactId>
+      <version>5.2.17.Final</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

src/main/java/pl/wavesoftware/utils/mapstruct/jpa/AbstractCompositeContextMapping.java

@@ -0,0 +1,27 @@
+package pl.wavesoftware.utils.mapstruct.jpa;
+
+import pl.wavesoftware.lang.TriConsumer;
+
+/**
+ * @author <a href="krzysztof.suszynski@wavesoftware.pl">Krzysztof Suszyński</a>
+ * @since 2018-05-02
+ */
+public abstract class AbstractCompositeContextMapping<I, O> extends AbstractMapping<I, O, CompositeContext> {
+  protected AbstractCompositeContextMapping(Class<I> sourceClass,
+                                            Class<O> targetClass) {
+    super(sourceClass, targetClass, CompositeContext.class);
+  }
+
+  public static <I, O> AbstractCompositeContextMapping<I, O> mapperFor(
+    Class<I> inputClass,
+    Class<O> outputClass,
+    TriConsumer<I, O, CompositeContext> consumer) {
+
+    return new AbstractCompositeContextMapping<I, O>(inputClass, outputClass) {
+      @Override
+      public void accept(I input, O output, CompositeContext context) {
+        consumer.accept(input, output, context);
+      }
+    };
+  }
+}

src/main/java/pl/wavesoftware/utils/mapstruct/jpa/AbstractCompositeContextProvider.java

@@ -1,7 +1,6 @@
 package pl.wavesoftware.utils.mapstruct.jpa;
 
 import lombok.RequiredArgsConstructor;
-import pl.wavesoftware.utils.mapstruct.jpa.CompositeContext.CompositeContextBuilder;
 
 import javax.annotation.Nullable;
 import java.util.function.Supplier;
@@ -36,7 +35,7 @@ public CompositeContext createNewContext() {
   }
 
   protected abstract JpaMappingContextFactory getJpaMappingContextFactory();
-  protected abstract Iterable<MappingProvider<?, ?, ?>> getMappingProviders();
+  protected abstract Iterable<MappingProvider> getMappingProviders();
   protected abstract IdentifierCollector getIdentifierCollector();
 
   @RequiredArgsConstructor

src/main/java/pl/wavesoftware/utils/mapstruct/jpa/AbstractMapping.java

@@ -0,0 +1,16 @@
+package pl.wavesoftware.utils.mapstruct.jpa;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * @author <a href="mailto:krzysztof.suszynski@wavesoftware.pl">Krzysztof Suszynski</a>
+ * @since 25.04.18
+ */
+@Getter
+@RequiredArgsConstructor
+public abstract class AbstractMapping<I, O, C> implements Mapping<I, O, C> {
+  private final Class<I> sourceClass;
+  private final Class<O> targetClass;
+  private final Class<C> contextClass;
+}

src/main/java/pl/wavesoftware/utils/mapstruct/jpa/CompositeContext.java

@@ -35,7 +35,7 @@ public CompositeContext(MappingContext... mappingContexts) {
    * @return a builder interface
    */
   public static CompositeContextBuilder builder() {
-    return new CompositeContextBuilder();
+    return new CompositeContextBuilderImpl();
   }
 
   @Override
@@ -71,16 +71,18 @@ public <T> Optional<T> getMappedInstanceOptional(Object source,
     return Optional.empty();
   }
 
-  public static final class CompositeContextBuilder {
+  private static final class CompositeContextBuilderImpl implements CompositeContextBuilder {
     private final List<MappingContext> mappingContexts = new ArrayList<>();
 
-    public CompositeContextBuilder addContext(MappingContext... mappingContexts) {
+    @Override
+    public CompositeContextBuilderImpl addContext(MappingContext... mappingContexts) {
       this.mappingContexts.addAll(
         Arrays.asList(mappingContexts)
       );
       return this;
     }
 
+    @Override
     public CompositeContext build() {
       return new CompositeContext(
         mappingContexts.toArray(new MappingContext[0])

src/main/java/pl/wavesoftware/utils/mapstruct/jpa/CompositeContextBuilder.java

@@ -0,0 +1,10 @@
+package pl.wavesoftware.utils.mapstruct.jpa;
+
+/**
+ * @author <a href="mailto:krzysztof.suszynski@wavesoftware.pl">Krzysztof Suszynski</a>
+ * @since 04.05.18
+ */
+public interface CompositeContextBuilder {
+  CompositeContextBuilder addContext(MappingContext... mappingContexts);
+  CompositeContext build();
+}

src/main/java/pl/wavesoftware/utils/mapstruct/jpa/CompositeContextMapping.java

@@ -73,7 +73,7 @@ private <I, O, C> void updateFromSourceTyped(I source, O managed) {
     Class<I> sourceClass = (Class<I>) source.getClass();
     Class<O> targetClass = (Class<O>) managed.getClass();
     C context = (C) storingMappingContext.get();
-    Mapping<I, O, C> mapping = mappings.getMapping(sourceClass, targetClass);
+    Mapping<I,O,C> mapping = mappings.getMapping(sourceClass, targetClass);
     mapping.accept(source, managed, context);
   }
 }

src/main/java/pl/wavesoftware/utils/mapstruct/jpa/JpaMappingContextImpl.java

@@ -1,17 +1,15 @@
 package pl.wavesoftware.utils.mapstruct.jpa;
 
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 import pl.wavesoftware.lang.TriConsumer;
 
 /**
  * @author <a href="mailto:krzysztof.suszynski@wavesoftware.pl">Krzysztof Suszynski</a>
- * @since 25.04.18
+ * @since 04.05.18
  */
-@Getter
-@RequiredArgsConstructor
-public abstract class Mapping<I, O, C> implements TriConsumer<I, O, C> {
-  private final Class<I> sourceClass;
-  private final Class<O> targetClass;
-  private final Class<C> contextClass;
+public interface Mapping<I, O, C> extends TriConsumer<I, O, C> {
+  Class<I> getSourceClass();
+
+  Class<O> getTargetClass();
+
+  Class<C> getContextClass();
 }