Improve formatting and package access for creational patterns

mperor · mperor · commit 812f71e4fbdf · 2025-02-12T11:37:50.000+01:00
diff --git a/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/builder/chain/inner/Task.java b/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/builder/chain/inner/Task.java
@@ -13,9 +13,9 @@ public class Task {
     private Task() {
     }
 
+    // Deep copy is required here!
     private Task(Task task) {
         this.id = ID_GENERATOR.getAndIncrement();
-        // Deep copy is required here!
         this.description = task.description;
         this.done = task.done;
     }
diff --git a/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/builder/chain/nested/User.java b/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/builder/chain/nested/User.java
@@ -14,15 +14,15 @@ public class User {
     private User() {
     }
 
+    // Deep copy is required here!
     private User(User user) {
         this.id = ID_GENERATOR.getAndIncrement();
-        // Deep copy is required here!
         this.name = user.name;
         this.password = user.password;
         this.email = user.email;
     }
 
-    int getId() {
+    public int getId() {
         return id;
     }
 
diff --git a/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/builder/chain/outer/Person.java b/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/builder/chain/outer/Person.java
@@ -9,6 +9,7 @@ public class Person {
     private final LocalDate dateOfBirth;
     private final String address;
 
+    // Deep copy is required here!
     private Person(PersonBuilder builder) {
         this.firstName = builder.getFirstName();
         this.lastName = builder.getLastName();
@@ -35,5 +36,4 @@ public String getAddress() {
     public static Person build(PersonBuilder builder) {
         return new Person(builder);
     }
-
 }
diff --git a/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/builder/chain/outer/PersonBuilder.java b/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/builder/chain/outer/PersonBuilder.java
@@ -44,5 +44,4 @@ public LocalDate getDateOfBirth() {
     public String getAddress() {
         return address;
     }
-
 }
diff --git a/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/abs/DatabaseConnection.java b/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/abs/DatabaseConnection.java
@@ -1,5 +1,6 @@
 package pl.mperor.lab.java.design.pattern.creational.factory.abs;
 
-public interface DatabaseConnection {
+interface DatabaseConnection {
+
     void connect();
 }
diff --git a/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/abs/DevStarterFactory.java b/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/abs/DevStarterFactory.java
@@ -1,6 +1,6 @@
 package pl.mperor.lab.java.design.pattern.creational.factory.abs;
 
-public class DevStarterFactory implements StarterFactory {
+class DevStarterFactory implements StarterFactory {
 
     @Override
     public DatabaseConnection getDatabaseConnection() {
diff --git a/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/abs/LoggingService.java b/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/abs/LoggingService.java
@@ -1,5 +1,6 @@
 package pl.mperor.lab.java.design.pattern.creational.factory.abs;
 
-public interface LoggingService {
+interface LoggingService {
+
     void init();
 }
diff --git a/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/abs/ProdStarterFactory.java b/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/abs/ProdStarterFactory.java
@@ -1,6 +1,6 @@
 package pl.mperor.lab.java.design.pattern.creational.factory.abs;
 
-public class ProdStarterFactory implements StarterFactory {
+class ProdStarterFactory implements StarterFactory {
 
     @Override
     public DatabaseConnection getDatabaseConnection() {
diff --git a/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/abs/SecurityPolicy.java b/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/abs/SecurityPolicy.java
@@ -1,5 +1,6 @@
 package pl.mperor.lab.java.design.pattern.creational.factory.abs;
 
-public interface SecurityPolicy {
+interface SecurityPolicy {
+
     void applyPolicy();
 }
diff --git a/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/abs/StarterFactory.java b/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/abs/StarterFactory.java
@@ -1,6 +1,6 @@
 package pl.mperor.lab.java.design.pattern.creational.factory.abs;
 
-public interface StarterFactory {
+interface StarterFactory {
 
     DatabaseConnection getDatabaseConnection();
 
diff --git a/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/basic/Animal.java b/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/basic/Animal.java
@@ -1,4 +1,4 @@
 package pl.mperor.lab.java.design.pattern.creational.factory.basic;
 
-public sealed interface Animal permits Cat, Dog, Fly {
+sealed interface Animal permits Cat, Dog, Fly {
 }
diff --git a/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/basic/AnimalFactory.java b/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/basic/AnimalFactory.java
@@ -1,6 +1,6 @@
 package pl.mperor.lab.java.design.pattern.creational.factory.basic;
 
-public interface AnimalFactory<T> {
+interface AnimalFactory<T> {
 
     Animal getNewInstance(T type);
 }
diff --git a/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/basic/AnimalFactoryClassImpl.java b/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/basic/AnimalFactoryClassImpl.java
@@ -1,6 +1,6 @@
 package pl.mperor.lab.java.design.pattern.creational.factory.basic;
 
-public class AnimalFactoryClassImpl implements AnimalFactory<Class<? extends Animal>> {
+class AnimalFactoryClassImpl implements AnimalFactory<Class<? extends Animal>> {
 
     @Override
     public Animal getNewInstance(Class<? extends Animal> type) {
diff --git a/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/basic/AnimalFactoryEnumImpl.java b/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/basic/AnimalFactoryEnumImpl.java
@@ -4,14 +4,14 @@
 
 import static pl.mperor.lab.java.design.pattern.creational.factory.basic.AnimalFactoryEnumImpl.AnimalType;
 
-public class AnimalFactoryEnumImpl implements AnimalFactory<AnimalType> {
+class AnimalFactoryEnumImpl implements AnimalFactory<AnimalType> {
 
     @Override
     public Animal getNewInstance(AnimalType type) {
         return type.getCreator().get();
     }
 
-    public enum AnimalType {
+    enum AnimalType {
         DOG(Dog::new),
         CAT(Cat::new),
         FLY(Fly::new);
@@ -26,5 +26,4 @@ public Supplier<Animal> getCreator() {
             return creator;
         }
     }
-
 }
diff --git a/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/basic/AnimalFactoryMapImpl.java b/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/basic/AnimalFactoryMapImpl.java
@@ -4,7 +4,7 @@
 import java.util.Map;
 import java.util.function.Supplier;
 
-public class AnimalFactoryMapImpl implements AnimalFactory<String> {
+class AnimalFactoryMapImpl implements AnimalFactory<String> {
 
     private final Map<String, Supplier<Animal>> nameToCreator = new HashMap<>();
 
diff --git a/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/basic/AnimalFactorySwitchExpressionImpl.java b/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/basic/AnimalFactorySwitchExpressionImpl.java
@@ -1,6 +1,6 @@
 package pl.mperor.lab.java.design.pattern.creational.factory.basic;
 
-public class AnimalFactorySwitchExpressionImpl implements AnimalFactory<Animal> {
+class AnimalFactorySwitchExpressionImpl implements AnimalFactory<Animal> {
 
     public static class Instances {
         public static final Animal CAT = new Cat();
diff --git a/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/basic/Cat.java b/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/basic/Cat.java
@@ -1,6 +1,6 @@
 package pl.mperor.lab.java.design.pattern.creational.factory.basic;
 
-public record Cat() implements Animal {
+record Cat() implements Animal {
 
     public static final String NAME = "Cat";
 
diff --git a/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/basic/Dog.java b/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/basic/Dog.java
@@ -1,6 +1,6 @@
 package pl.mperor.lab.java.design.pattern.creational.factory.basic;
 
-public record Dog() implements Animal {
+record Dog() implements Animal {
 
     public static final String NAME = "Dog";
 
diff --git a/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/basic/Fly.java b/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/basic/Fly.java
@@ -1,12 +1,11 @@
 package pl.mperor.lab.java.design.pattern.creational.factory.basic;
 
-public record Fly() implements Animal {
+record Fly() implements Animal {
 
     public static final String NAME = "Fly";
 
     @Override
     public String toString() {
         return NAME;
     }
-
 }
diff --git a/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/stat/method/Category.java b/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/factory/stat/method/Category.java
@@ -4,6 +4,7 @@
 import java.util.Map;
 
 class Category {
+
     private static final Map<String, Category> CACHE = new HashMap<>();
 
     private final String name;
diff --git a/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/prototype/DNA.java b/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/prototype/DNA.java
@@ -1,4 +1,4 @@
 package pl.mperor.lab.java.design.pattern.creational.prototype;
 
-public record DNA(String sequence) {
+record DNA(String sequence) {
 }
diff --git a/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/prototype/Sheep.java b/DesignPatterns/src/main/java/pl/mperor/lab/java/design/pattern/creational/prototype/Sheep.java
@@ -3,7 +3,7 @@
 import java.time.Year;
 import java.util.function.Function;
 
-public class Sheep {
+class Sheep {
 
     private String name;
     private DNA dna;
@@ -28,10 +28,6 @@ String getName() {
         return name;
     }
 
-    void setName(String name) {
-        this.name = name;
-    }
-
     DNA getDna() {
         return dna;
     }
@@ -44,11 +40,11 @@ Breed getBreed() {
         return breed;
     }
 
-    public Sheep clone(Function<CloneBuilder, Sheep> cloning) {
+    Sheep clone(Function<CloneBuilder, Sheep> cloning) {
         return cloning.apply(new CloneBuilder(new Sheep(this)));
     }
 
-    public class CloneBuilder {
+    class CloneBuilder {
         private Sheep clone;
 
         public CloneBuilder(Sheep clone) {
diff --git a/DesignPatterns/src/test/java/pl/mperor/lab/java/design/pattern/creational/factory/abs/AppStarterAbstractFactoryTest.java b/DesignPatterns/src/test/java/pl/mperor/lab/java/design/pattern/creational/factory/abs/AppStarterAbstractFactoryTest.java
@@ -32,5 +32,4 @@ public void shouldAllowToCreateAppStarterForConcreteProfile() {
 
         TestUtils.resetSystemOut();
     }
-
 }
diff --git a/DesignPatterns/src/test/java/pl/mperor/lab/java/design/pattern/creational/factory/basic/AnimalFactoryTest.java b/DesignPatterns/src/test/java/pl/mperor/lab/java/design/pattern/creational/factory/basic/AnimalFactoryTest.java
@@ -12,8 +12,8 @@ public class AnimalFactoryTest {
     public void animalFactoryMapImplShouldBeAbleToCreateAnimalsByNames() {
         AnimalFactory<String> factory = new AnimalFactoryMapImpl();
         Assertions.assertInstanceOf(Dog.class, factory.getNewInstance("Dog"));
-        Assertions.assertInstanceOf(Fly.class, factory.getNewInstance("Fly"));
-        Assertions.assertInstanceOf(Cat.class, factory.getNewInstance("Cat"));
+        Assertions.assertInstanceOf(Fly.class, factory.getNewInstance(Fly.class.getSimpleName()));
+        Assertions.assertInstanceOf(Cat.class, factory.getNewInstance(Cat.NAME));
 
         Assertions.assertNotSame(factory.getNewInstance("Dog"), factory.getNewInstance("Dog"));
         Assertions.assertThrows(IllegalArgumentException.class, () -> factory.getNewInstance("Fish"));
diff --git a/DesignPatterns/src/test/java/pl/mperor/lab/java/design/pattern/creational/prototype/SheepPrototypeTest.java b/DesignPatterns/src/test/java/pl/mperor/lab/java/design/pattern/creational/prototype/SheepPrototypeTest.java
@@ -17,6 +17,7 @@ public void testSheepCloning() {
         Assertions.assertNotSame(originalSheep, clonedSheep);
         Assertions.assertSame(originalSheep.getDna(), clonedSheep.getDna());
         Assertions.assertSame(originalSheep.getBreed(), clonedSheep.getBreed());
+        Assertions.assertNotEquals(originalSheep.getName(), clonedSheep.getName());
         Assertions.assertNotEquals(originalSheep.getYearOfBirth(), clonedSheep.getYearOfBirth());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@ public class Task {`
`13`	`13`	`private Task() {`
`14`	`14`	`}`
`15`	`15`
	`16`	`+ // Deep copy is required here!`
`16`	`17`	`private Task(Task task) {`
`17`	`18`	`this.id = ID_GENERATOR.getAndIncrement();`
`18`		`- // Deep copy is required here!`
`19`	`19`	`this.description = task.description;`
`20`	`20`	`this.done = task.done;`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,15 +14,15 @@ public class User {`
`14`	`14`	`private User() {`
`15`	`15`	`}`
`16`	`16`
	`17`	`+ // Deep copy is required here!`
`17`	`18`	`private User(User user) {`
`18`	`19`	`this.id = ID_GENERATOR.getAndIncrement();`
`19`		`- // Deep copy is required here!`
`20`	`20`	`this.name = user.name;`
`21`	`21`	`this.password = user.password;`
`22`	`22`	`this.email = user.email;`
`23`	`23`	`}`
`24`	`24`
`25`		`- int getId() {`
	`25`	`+ public int getId() {`
`26`	`26`	`return id;`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ public class Person {`
`9`	`9`	`private final LocalDate dateOfBirth;`
`10`	`10`	`private final String address;`
`11`	`11`
	`12`	`+ // Deep copy is required here!`
`12`	`13`	`private Person(PersonBuilder builder) {`
`13`	`14`	`this.firstName = builder.getFirstName();`
`14`	`15`	`this.lastName = builder.getLastName();`
`@@ -35,5 +36,4 @@ public String getAddress() {`
`35`	`36`	`public static Person build(PersonBuilder builder) {`
`36`	`37`	`return new Person(builder);`
`37`	`38`	`}`
`38`		`-`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,5 +44,4 @@ public LocalDate getDateOfBirth() {`
`44`	`44`	`public String getAddress() {`
`45`	`45`	`return address;`
`46`	`46`	`}`
`47`		`-`
`48`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package pl.mperor.lab.java.design.pattern.creational.factory.abs;`
`2`	`2`
`3`		`-public interface DatabaseConnection {`
	`3`	`+interface DatabaseConnection {`
	`4`	`+`
`4`	`5`	`void connect();`
`5`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package pl.mperor.lab.java.design.pattern.creational.factory.abs;`
`2`	`2`
`3`		`-public interface LoggingService {`
	`3`	`+interface LoggingService {`
	`4`	`+`
`4`	`5`	`void init();`
`5`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package pl.mperor.lab.java.design.pattern.creational.factory.abs;`
`2`	`2`
`3`		`-public interface SecurityPolicy {`
	`3`	`+interface SecurityPolicy {`
	`4`	`+`
`4`	`5`	`void applyPolicy();`
`5`	`6`	`}`