Reorganized

fdpro · fdpro · commit c5c3e0b2a801 · 2019-06-26T19:24:19.000+02:00
diff --git a/src/main/java/com/fdpro/trainings/functionaljava/examples/BiFunctionExamples.java b/src/main/java/com/fdpro/trainings/functionaljava/examples/BiFunctionExamples.java
@@ -1,4 +1,6 @@
-package com.fdpro.trainings.functionaljava;
+package com.fdpro.trainings.functionaljava.examples;
+
+import com.fdpro.trainings.functionaljava.model.Person;
 
 import java.util.function.BiFunction;
 
diff --git a/src/main/java/com/fdpro/trainings/functionaljava/examples/ConsumerExamples.java b/src/main/java/com/fdpro/trainings/functionaljava/examples/ConsumerExamples.java
@@ -1,4 +1,6 @@
-package com.fdpro.trainings.functionaljava;
+package com.fdpro.trainings.functionaljava.examples;
+
+import com.fdpro.trainings.functionaljava.model.Person;
 
 import java.util.List;
 import java.util.function.Consumer;
diff --git a/src/main/java/com/fdpro/trainings/functionaljava/examples/FunctionExamples.java b/src/main/java/com/fdpro/trainings/functionaljava/examples/FunctionExamples.java
@@ -1,4 +1,6 @@
-package com.fdpro.trainings.functionaljava;
+package com.fdpro.trainings.functionaljava.examples;
+
+import com.fdpro.trainings.functionaljava.model.Person;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/fdpro/trainings/functionaljava/examples/PredicateExample.java b/src/main/java/com/fdpro/trainings/functionaljava/examples/PredicateExample.java
@@ -1,4 +1,6 @@
-package com.fdpro.trainings.functionaljava;
+package com.fdpro.trainings.functionaljava.examples;
+
+import com.fdpro.trainings.functionaljava.model.Person;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/fdpro/trainings/functionaljava/examples/SupplierExample.java b/src/main/java/com/fdpro/trainings/functionaljava/examples/SupplierExample.java
@@ -1,4 +1,6 @@
-package com.fdpro.trainings.functionaljava;
+package com.fdpro.trainings.functionaljava.examples;
+
+import com.fdpro.trainings.functionaljava.model.Database;
 
 import java.util.function.Supplier;
 
diff --git a/src/main/java/com/fdpro/trainings/functionaljava/model/Database.java b/src/main/java/com/fdpro/trainings/functionaljava/model/Database.java
@@ -1,4 +1,4 @@
-package com.fdpro.trainings.functionaljava;
+package com.fdpro.trainings.functionaljava.model;
 
 public interface Database {
 
diff --git a/src/main/java/com/fdpro/trainings/functionaljava/model/HeavyDatabase.java b/src/main/java/com/fdpro/trainings/functionaljava/model/HeavyDatabase.java
@@ -1,4 +1,4 @@
-package com.fdpro.trainings.functionaljava;
+package com.fdpro.trainings.functionaljava.model;
 
 public class HeavyDatabase implements Database {
 
diff --git a/src/main/java/com/fdpro/trainings/functionaljava/model/LightweightDatabase.java b/src/main/java/com/fdpro/trainings/functionaljava/model/LightweightDatabase.java
@@ -1,4 +1,4 @@
-package com.fdpro.trainings.functionaljava;
+package com.fdpro.trainings.functionaljava.model;
 
 public class LightweightDatabase implements Database {
     private boolean available;
diff --git a/src/main/java/com/fdpro/trainings/functionaljava/model/Person.java b/src/main/java/com/fdpro/trainings/functionaljava/model/Person.java
@@ -1,4 +1,4 @@
-package com.fdpro.trainings.functionaljava;
+package com.fdpro.trainings.functionaljava.model;
 
 import java.util.Objects;
 
diff --git a/src/test/java/com/fdpro/trainings/functionaljava/examples/BiFunctionExamplesTest.java b/src/test/java/com/fdpro/trainings/functionaljava/examples/BiFunctionExamplesTest.java
@@ -1,5 +1,7 @@
-package com.fdpro.trainings.functionaljava;
+package com.fdpro.trainings.functionaljava.examples;
 
+import com.fdpro.trainings.functionaljava.examples.BiFunctionExamples;
+import com.fdpro.trainings.functionaljava.model.Person;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/com/fdpro/trainings/functionaljava/examples/ConsumerExamplesTest.java b/src/test/java/com/fdpro/trainings/functionaljava/examples/ConsumerExamplesTest.java
@@ -1,5 +1,7 @@
-package com.fdpro.trainings.functionaljava;
+package com.fdpro.trainings.functionaljava.examples;
 
+import com.fdpro.trainings.functionaljava.examples.ConsumerExamples;
+import com.fdpro.trainings.functionaljava.model.Person;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/com/fdpro/trainings/functionaljava/examples/FunctionExamplesTest.java b/src/test/java/com/fdpro/trainings/functionaljava/examples/FunctionExamplesTest.java
@@ -1,5 +1,7 @@
-package com.fdpro.trainings.functionaljava;
+package com.fdpro.trainings.functionaljava.examples;
 
+import com.fdpro.trainings.functionaljava.examples.FunctionExamples;
+import com.fdpro.trainings.functionaljava.model.Person;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/com/fdpro/trainings/functionaljava/examples/GeneralExamplesTest.java b/src/test/java/com/fdpro/trainings/functionaljava/examples/GeneralExamplesTest.java
@@ -1,4 +1,4 @@
-package com.fdpro.trainings.functionaljava;
+package com.fdpro.trainings.functionaljava.examples;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/com/fdpro/trainings/functionaljava/examples/PredicateExampleTest.java b/src/test/java/com/fdpro/trainings/functionaljava/examples/PredicateExampleTest.java
@@ -1,5 +1,7 @@
-package com.fdpro.trainings.functionaljava;
+package com.fdpro.trainings.functionaljava.examples;
 
+import com.fdpro.trainings.functionaljava.examples.PredicateExample;
+import com.fdpro.trainings.functionaljava.model.Person;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/com/fdpro/trainings/functionaljava/examples/SupplierExampleTest.java b/src/test/java/com/fdpro/trainings/functionaljava/examples/SupplierExampleTest.java
@@ -1,5 +1,9 @@
-package com.fdpro.trainings.functionaljava;
+package com.fdpro.trainings.functionaljava.examples;
 
+import com.fdpro.trainings.functionaljava.examples.SupplierExample;
+import com.fdpro.trainings.functionaljava.model.Database;
+import com.fdpro.trainings.functionaljava.model.HeavyDatabase;
+import com.fdpro.trainings.functionaljava.model.LightweightDatabase;
 import org.junit.jupiter.api.Test;
 
 import java.util.function.Supplier;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.fdpro.trainings.functionaljava;`
	`1`	`+package com.fdpro.trainings.functionaljava.model;`
`2`	`2`
`3`	`3`	`public interface Database {`
`4`	`4`