java10 compatibility

demand-forecasting-adapters/build.gradle

@@ -4,13 +4,7 @@ dependencies {
 	compile(project(":demand-forecasting-model"))
 	compile(project(":adapter-commons"))
 
-	compile("org.projectlombok:lombok:1.16.18")
-
-	runtime("org.postgresql:postgresql:42.1.4")
-
 	testCompile("org.springframework.boot:spring-boot-starter-test")
-	testCompile("org.spockframework:spock-core:1.1-groovy-2.4")
 	testCompile("org.spockframework:spock-spring:1.1-groovy-2.4")
 	testCompile("com.h2database:h2:1.4.194")
-	testCompile(project(":adapter-commons").sourceSets.test.output)
-}
+}

demand-forecasting-adapters/pom.xml

@@ -33,23 +33,11 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.16.18</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>42.1.4</version>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>org.spockframework</groupId>
             <artifactId>spock-core</artifactId>
@@ -62,12 +50,6 @@
             <version>1.1-groovy-2.4</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>net.bytebuddy</groupId>
-            <artifactId>byte-buddy</artifactId>
-            <version>1.7.9</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -83,7 +65,7 @@
         <distribution.management.release.url>http://localhost:8081/artifactory/libs-release-local</distribution.management.release.url>
         <distribution.management.snapshot.url>http://localhost:8081/artifactory/libs-snapshot-local</distribution.management.snapshot.url>
         <repo.with.binaries>http://localhost:8081/artifactory/libs-release-local</repo.with.binaries>
-        <maven-surefire.version>2.21.0</maven-surefire.version>
+        <maven-surefire.version>2.22.0</maven-surefire.version>
     </properties>
 
     <!-- [PIPELINE] -->
@@ -118,15 +100,16 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.7.0</version>
                 <configuration>
-                    <compilerArgs>
-                        <arg>-parameters</arg>
-                    </compilerArgs>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <compilerArgument>-parameters</compilerArgument>
                 </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.20.1</version>
+                <version>2.22.0</version>
                 <configuration>
                     <useFile>false</useFile>
                     <includes>

demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/delivery/planning/DeliveryAutoPlannerORMRepository.java

@@ -1,5 +1,6 @@
 package io.dddbyexamples.factory.delivery.planning;
 
+import io.dddbyexamples.factory.delivery.planning.definition.DeliveryPlannerDefinition;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
 import io.dddbyexamples.factory.delivery.planning.definition.DeliveryPlannerDefinitionDao;
@@ -17,6 +18,7 @@ public class DeliveryAutoPlannerORMRepository {
         return new DeliveryAutoPlanner(refNo,
                 dao.findById(refNo)
                         .map(DeliveryPlannerDefinitionEntity::getDefinition)
+                        .filter(def -> !def.isDisabled())
                         .map(x -> x.map(DeliveriesSuggestion::timesAndFractions))
                         .orElse(Collections.emptyMap()));
     }

demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinition.java

@@ -18,6 +18,7 @@ import java.util.stream.Collectors;
 public class DeliveryPlannerDefinition {
     @Singular
     private final Map<Demand.Schema, Map<LocalTime, Double>> definitions;
+    private final boolean disabled;
 
     public static Map<LocalTime, Double> of(LocalTime time, Double fraction) {
         return Collections.singletonMap(time, fraction);

demand-forecasting-adapters/src/test/groovy/io/dddbyexamples/factory/delivery/planning/DeliveryPlannerDefinitionSpec.groovy

@@ -5,12 +5,15 @@ import org.springframework.boot.test.context.SpringBootTest
 import io.dddbyexamples.factory.delivery.planning.definition.DeliveryPlannerDefinition
 import io.dddbyexamples.factory.delivery.planning.definition.DeliveryPlannerDefinitionDao
 import io.dddbyexamples.factory.delivery.planning.definition.DeliveryPlannerDefinitionEntity
+import org.springframework.test.context.ActiveProfiles
+import org.springframework.test.context.TestPropertySource
 import spock.lang.Specification
 
 import static java.time.LocalTime.of as time
 import static io.dddbyexamples.factory.delivery.planning.definition.DeliveryPlannerDefinition.of
 import static io.dddbyexamples.factory.demand.forecasting.Demand.Schema.*
 
+@ActiveProfiles("test")
 @SpringBootTest
 class DeliveryPlannerDefinitionSpec extends Specification {
 

demand-forecasting-adapters/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/ProductDemandORMRepositorySpec.groovy

@@ -1,24 +1,22 @@
 package io.dddbyexamples.factory.demand.forecasting
 
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.test.annotation.Commit
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest
 import io.dddbyexamples.factory.demand.forecasting.persistence.DemandDao
 import io.dddbyexamples.factory.demand.forecasting.persistence.DemandEntity
 import io.dddbyexamples.factory.demand.forecasting.persistence.ProductDemandDao
 import io.dddbyexamples.factory.demand.forecasting.persistence.ProductDemandEntity
+import org.springframework.test.context.ActiveProfiles
 import spock.lang.Specification
 
 import javax.persistence.EntityManager
-import javax.transaction.Transactional
 import java.time.Clock
 import java.time.Instant
 import java.time.LocalDate
 import java.time.ZoneId
 
-@SpringBootTest
-@Transactional
-@Commit
+@ActiveProfiles("test")
+@DataJpaTest
 class ProductDemandORMRepositorySpec extends Specification {
 
     def clock = Clock.fixed(Instant.now(), ZoneId.systemDefault())