Move classes to other packages

cardil · cardil · commit 038259e65dd3 · 2018-05-03T22:16:48.000+02:00
diff --git a/src/main/java/pl/wavesoftware/lang/TriConsumer.java b/src/main/java/pl/wavesoftware/lang/TriConsumer.java
@@ -1,4 +1,4 @@
-package pl.wavesoftware.utils.mapstruct.lang;
+package pl.wavesoftware.lang;
 
 import java.util.Objects;
 import java.util.function.Consumer;
diff --git a/src/main/java/pl/wavesoftware/lang/package-info.java b/src/main/java/pl/wavesoftware/lang/package-info.java
@@ -3,6 +3,6 @@
  * @since 2018-05-03
  */
 @ParametersAreNonnullByDefault
-package pl.wavesoftware.utils.mapstruct;
+package pl.wavesoftware.lang;
 
 import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/src/main/java/pl/wavesoftware/utils/mapstruct/Mappings.java b/src/main/java/pl/wavesoftware/utils/mapstruct/Mappings.java
diff --git a/src/main/java/pl/wavesoftware/utils/mapstruct/cycles/package-info.java b/src/main/java/pl/wavesoftware/utils/mapstruct/cycles/package-info.java
diff --git a/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/AbstractCompositeContextProvider.java b/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/AbstractCompositeContextProvider.java
@@ -1,10 +1,7 @@
-package pl.wavesoftware.utils.mapstruct;
+package pl.wavesoftware.utils.mapstruct.jpa;
 
 import lombok.RequiredArgsConstructor;
-import pl.wavesoftware.utils.mapstruct.CompositeContext.CompositeContextBuilder;
-import pl.wavesoftware.utils.mapstruct.cycles.CyclicGraphContext;
-import pl.wavesoftware.utils.mapstruct.jpa.JpaMappingContext;
-import pl.wavesoftware.utils.mapstruct.jpa.JpaMappingContextFactory;
+import pl.wavesoftware.utils.mapstruct.jpa.CompositeContext.CompositeContextBuilder;
 
 import javax.annotation.Nullable;
 import java.util.function.Supplier;
diff --git a/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/CompositeContext.java b/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/CompositeContext.java
@@ -1,4 +1,4 @@
-package pl.wavesoftware.utils.mapstruct;
+package pl.wavesoftware.utils.mapstruct.jpa;
 
 import org.mapstruct.BeforeMapping;
 import org.mapstruct.MappingTarget;
diff --git a/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/CompositeContextMapping.java b/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/CompositeContextMapping.java
@@ -1,6 +1,6 @@
-package pl.wavesoftware.utils.mapstruct;
+package pl.wavesoftware.utils.mapstruct.jpa;
 
-import pl.wavesoftware.utils.mapstruct.lang.TriConsumer;
+import pl.wavesoftware.lang.TriConsumer;
 
 /**
  * @author <a href="krzysztof.suszynski@wavesoftware.pl">Krzysztof Suszyński</a>
diff --git a/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/CyclicGraphContext.java b/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/CyclicGraphContext.java
@@ -1,10 +1,9 @@
-package pl.wavesoftware.utils.mapstruct.cycles;
+package pl.wavesoftware.utils.mapstruct.jpa;
 
 import org.mapstruct.BeforeMapping;
 import org.mapstruct.Context;
 import org.mapstruct.MappingTarget;
 import org.mapstruct.TargetType;
-import pl.wavesoftware.utils.mapstruct.MapStructContext;
 
 import javax.annotation.Nullable;
 import java.util.IdentityHashMap;
diff --git a/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/IdentifierCollector.java b/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/IdentifierCollector.java
@@ -1,4 +1,4 @@
-package pl.wavesoftware.utils.mapstruct;
+package pl.wavesoftware.utils.mapstruct.jpa;
 
 import java.util.Optional;
 
diff --git a/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/JpaMappingContext.java b/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/JpaMappingContext.java
@@ -1,7 +1,5 @@
 package pl.wavesoftware.utils.mapstruct.jpa;
 
-import pl.wavesoftware.utils.mapstruct.MappingContext;
-
 /**
  * @author <a href="mailto:krzysztof.suszynski@wavesoftware.pl">Krzysztof Suszynski</a>
  * @since 02.05.18
diff --git a/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/JpaMappingContextFactory.java b/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/JpaMappingContextFactory.java
@@ -1,9 +1,5 @@
 package pl.wavesoftware.utils.mapstruct.jpa;
 
-import pl.wavesoftware.utils.mapstruct.IdentifierCollector;
-import pl.wavesoftware.utils.mapstruct.StoringMappingContext;
-import pl.wavesoftware.utils.mapstruct.Mappings;
-
 import java.util.function.Supplier;
 
 /**
diff --git a/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/JpaMappingContextFactoryImpl.java b/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/JpaMappingContextFactoryImpl.java
@@ -1,9 +1,6 @@
 package pl.wavesoftware.utils.mapstruct.jpa;
 
 import lombok.RequiredArgsConstructor;
-import pl.wavesoftware.utils.mapstruct.IdentifierCollector;
-import pl.wavesoftware.utils.mapstruct.Mappings;
-import pl.wavesoftware.utils.mapstruct.StoringMappingContext;
 
 import javax.persistence.EntityManager;
 import java.util.function.Supplier;
diff --git a/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/JpaMappingContextImpl.java b/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/JpaMappingContextImpl.java
@@ -1,10 +1,6 @@
 package pl.wavesoftware.utils.mapstruct.jpa;
 
 import lombok.RequiredArgsConstructor;
-import pl.wavesoftware.utils.mapstruct.IdentifierCollector;
-import pl.wavesoftware.utils.mapstruct.Mapping;
-import pl.wavesoftware.utils.mapstruct.Mappings;
-import pl.wavesoftware.utils.mapstruct.StoringMappingContext;
 
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
diff --git a/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/MapStructContext.java b/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/MapStructContext.java
@@ -1,4 +1,4 @@
-package pl.wavesoftware.utils.mapstruct;
+package pl.wavesoftware.utils.mapstruct.jpa;
 
 import org.mapstruct.BeforeMapping;
 import org.mapstruct.TargetType;
diff --git a/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/MapStructContextProvider.java b/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/MapStructContextProvider.java
@@ -1,4 +1,4 @@
-package pl.wavesoftware.utils.mapstruct;
+package pl.wavesoftware.utils.mapstruct.jpa;
 
 /**
  * @author <a href="krzysztof.suszynski@wavesoftware.pl">Krzysztof Suszyński</a>
diff --git a/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/Mapping.java b/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/Mapping.java
@@ -1,8 +1,8 @@
-package pl.wavesoftware.utils.mapstruct;
+package pl.wavesoftware.utils.mapstruct.jpa;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import pl.wavesoftware.utils.mapstruct.lang.TriConsumer;
+import pl.wavesoftware.lang.TriConsumer;
 
 /**
  * @author <a href="mailto:krzysztof.suszynski@wavesoftware.pl">Krzysztof Suszynski</a>
diff --git a/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/MappingContext.java b/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/MappingContext.java
@@ -1,4 +1,4 @@
-package pl.wavesoftware.utils.mapstruct;
+package pl.wavesoftware.utils.mapstruct.jpa;
 
 import java.util.Optional;
 
diff --git a/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/MappingProvider.java b/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/MappingProvider.java
@@ -1,4 +1,4 @@
-package pl.wavesoftware.utils.mapstruct;
+package pl.wavesoftware.utils.mapstruct.jpa;
 
 /**
  * @author <a href="mailto:krzysztof.suszynski@wavesoftware.pl">Krzysztof Suszynski</a>
diff --git a/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/Mappings.java b/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/Mappings.java
@@ -0,0 +1,54 @@
+package pl.wavesoftware.utils.mapstruct.jpa;
+
+/**
+ * Mappings represents a set of {@link Mapping}'s with a method to search for specific one.
+ *
+ * @author <a href="mailto:krzysztof.suszynski@wavesoftware.pl">Krzysztof Suszynski</a>
+ * @since 25.04.18
+ */
+public interface Mappings {
+
+  /**
+   * Searches for a Mapping for given source and target class. Source class is a class
+   * that we map from and target class is a class that we map to.
+   *
+   * @param sourceClass a source class to map from
+   * @param targetClass a target class to map to
+   * @param <S> a type of source class
+   * @param <T> a type of target class
+   * @param <C> a type of context that will be used for mapping
+   * @return a Mapping object for given configuration. If mapping is not found this method will
+   * fail with runtime exception as an indication of configuration error.
+   */
+  <S, T, C> Mapping<S, T, C> getMapping(Class<S> sourceClass,
+                                        Class<T> targetClass);
+
+  /**
+   * Returns a builder for Mappings.
+   *
+   * @return a builder interface
+   */
+  static MappingsBuilder builder() {
+    return new MappingsBuilderImpl();
+  }
+
+  /**
+   * A builder interface for {@link Mappings} class.
+   */
+  interface MappingsBuilder {
+    /**
+     * Adds a mapping to the builder
+     *
+     * @param mapping a mapping to add
+     */
+    void addMapping(Mapping<?, ?, ?> mapping);
+
+    /**
+     * Will build a Mappings class
+     *
+     * @return a builded Mappings
+     */
+    Mappings build();
+  }
+
+}
diff --git a/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/MappingsBuilderImpl.java b/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/MappingsBuilderImpl.java
@@ -0,0 +1,48 @@
+package pl.wavesoftware.utils.mapstruct.jpa;
+
+import lombok.RequiredArgsConstructor;
+import pl.wavesoftware.eid.exceptions.Eid;
+import pl.wavesoftware.eid.exceptions.EidIllegalStateException;
+import pl.wavesoftware.utils.mapstruct.jpa.Mappings.MappingsBuilder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author <a href="krzysztof.suszynski@wavesoftware.pl">Krzysztof Suszyński</a>
+ * @since 2018-05-03
+ */
+final class MappingsBuilderImpl implements MappingsBuilder {
+  private final List<Mapping<?, ?, ?>> mappings = new ArrayList<>();
+
+  @Override
+  public void addMapping(Mapping<?, ?, ?> mapping) {
+    mappings.add(mapping);
+  }
+
+  @Override
+  public Mappings build() {
+    return new MappingsImpl(mappings);
+  }
+
+  @RequiredArgsConstructor
+  private static final class MappingsImpl implements Mappings {
+    private final Iterable<Mapping<?, ?, ?>> mappings;
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <I, O, C> Mapping<I, O, C> getMapping(Class<I> sourceClass,
+                                                 Class<O> targetClass) {
+      for (Mapping<?, ?, ?> mapping : mappings) {
+        if (mapping.getSourceClass() == sourceClass && mapping.getTargetClass() == targetClass) {
+          return (Mapping<I, O, C>) mapping;
+        }
+      }
+      throw new EidIllegalStateException(
+        new Eid("20180425:135245"),
+        "Mapping for source class %s and target class %s is not configured!",
+        sourceClass.getName(), targetClass.getName()
+      );
+    }
+  }
+}
diff --git a/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/StoringMappingContext.java b/src/main/java/pl/wavesoftware/utils/mapstruct/jpa/StoringMappingContext.java
@@ -1,4 +1,4 @@
-package pl.wavesoftware.utils.mapstruct;
+package pl.wavesoftware.utils.mapstruct.jpa;
 
 import org.mapstruct.BeforeMapping;
 import org.mapstruct.MappingTarget;
diff --git a/src/main/java/pl/wavesoftware/utils/mapstruct/lang/package-info.java b/src/main/java/pl/wavesoftware/utils/mapstruct/lang/package-info.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package pl.wavesoftware.utils.mapstruct.lang;`
	`1`	`+package pl.wavesoftware.lang;`
`2`	`2`
`3`	`3`	`import java.util.Objects;`
`4`	`4`	`import java.util.function.Consumer;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package pl.wavesoftware.utils.mapstruct;`
	`1`	`+package pl.wavesoftware.utils.mapstruct.jpa;`
`2`	`2`
`3`	`3`	`import org.mapstruct.BeforeMapping;`
`4`	`4`	`import org.mapstruct.MappingTarget;`