From 68ea49996b04a633fcefa2ce3d35d59dd2a19d43 Mon Sep 17 00:00:00 2001 From: Loredana Date: Sun, 10 Feb 2019 18:24:45 +0200 Subject: [PATCH] update solid ex --- patterns/pom.xml | 1 + .../src/main/java/com/baeldung/d/Keyboard.java | 4 ---- patterns/{principles => }/solid/pom.xml | 17 +++++++---------- .../src/main/java/com/baeldung/d/Keyboard.java | 4 ++++ .../src/main/java/com/baeldung/d/Monitor.java | 0 .../java/com/baeldung/d/StandardKeyboard.java | 5 +++++ .../java/com/baeldung/d/Windows98Machine.java | 4 ++-- .../java/com/baeldung/d/Windows98MachineDI.java | 0 .../src/main/java/com/baeldung/i/BearCarer.java | 0 .../main/java/com/baeldung/i/BearCleaner.java | 0 .../main/java/com/baeldung/i/BearFeeder.java | 0 .../main/java/com/baeldung/i/BearKeeper.java | 0 .../main/java/com/baeldung/i/BearPetter.java | 0 .../main/java/com/baeldung/i/CrazyPerson.java | 0 .../solid/src/main/java/com/baeldung/l/Car.java | 0 .../main/java/com/baeldung/l/ElectricCar.java | 0 .../src/main/java/com/baeldung/l/Engine.java | 0 .../src/main/java/com/baeldung/l/MotorCar.java | 0 .../src/main/java/com/baeldung/o/Guitar.java | 0 .../baeldung/o/SuperCoolGuitarWithFlames.java | 0 .../src/main/java/com/baeldung/s/BadBook.java | 0 .../main/java/com/baeldung/s/BookPrinter.java | 0 .../src/main/java/com/baeldung/s/GoodBook.java | 0 23 files changed, 19 insertions(+), 16 deletions(-) delete mode 100644 patterns/principles/solid/src/main/java/com/baeldung/d/Keyboard.java rename patterns/{principles => }/solid/pom.xml (54%) create mode 100644 patterns/solid/src/main/java/com/baeldung/d/Keyboard.java rename patterns/{principles => }/solid/src/main/java/com/baeldung/d/Monitor.java (100%) create mode 100644 patterns/solid/src/main/java/com/baeldung/d/StandardKeyboard.java rename patterns/{principles => }/solid/src/main/java/com/baeldung/d/Windows98Machine.java (66%) rename patterns/{principles => }/solid/src/main/java/com/baeldung/d/Windows98MachineDI.java (100%) rename patterns/{principles => }/solid/src/main/java/com/baeldung/i/BearCarer.java (100%) rename patterns/{principles => }/solid/src/main/java/com/baeldung/i/BearCleaner.java (100%) rename patterns/{principles => }/solid/src/main/java/com/baeldung/i/BearFeeder.java (100%) rename patterns/{principles => }/solid/src/main/java/com/baeldung/i/BearKeeper.java (100%) rename patterns/{principles => }/solid/src/main/java/com/baeldung/i/BearPetter.java (100%) rename patterns/{principles => }/solid/src/main/java/com/baeldung/i/CrazyPerson.java (100%) rename patterns/{principles => }/solid/src/main/java/com/baeldung/l/Car.java (100%) rename patterns/{principles => }/solid/src/main/java/com/baeldung/l/ElectricCar.java (100%) rename patterns/{principles => }/solid/src/main/java/com/baeldung/l/Engine.java (100%) rename patterns/{principles => }/solid/src/main/java/com/baeldung/l/MotorCar.java (100%) rename patterns/{principles => }/solid/src/main/java/com/baeldung/o/Guitar.java (100%) rename patterns/{principles => }/solid/src/main/java/com/baeldung/o/SuperCoolGuitarWithFlames.java (100%) rename patterns/{principles => }/solid/src/main/java/com/baeldung/s/BadBook.java (100%) rename patterns/{principles => }/solid/src/main/java/com/baeldung/s/BookPrinter.java (100%) rename patterns/{principles => }/solid/src/main/java/com/baeldung/s/GoodBook.java (100%) diff --git a/patterns/pom.xml b/patterns/pom.xml index bc1f5173e2..3c3bb6d5ea 100644 --- a/patterns/pom.xml +++ b/patterns/pom.xml @@ -17,6 +17,7 @@ front-controller intercepting-filter design-patterns + solid diff --git a/patterns/principles/solid/src/main/java/com/baeldung/d/Keyboard.java b/patterns/principles/solid/src/main/java/com/baeldung/d/Keyboard.java deleted file mode 100644 index acb50cedb4..0000000000 --- a/patterns/principles/solid/src/main/java/com/baeldung/d/Keyboard.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.baeldung.d; - -public class Keyboard { -} diff --git a/patterns/principles/solid/pom.xml b/patterns/solid/pom.xml similarity index 54% rename from patterns/principles/solid/pom.xml rename to patterns/solid/pom.xml index 5d308f5120..2837504197 100644 --- a/patterns/principles/solid/pom.xml +++ b/patterns/solid/pom.xml @@ -4,17 +4,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.baeldung - solid/artifactId> + solid 1.0-SNAPSHOT - - - - junit - junit - 4.12 - test - - + + com.baeldung + patterns + 1.0.0-SNAPSHOT + .. + diff --git a/patterns/solid/src/main/java/com/baeldung/d/Keyboard.java b/patterns/solid/src/main/java/com/baeldung/d/Keyboard.java new file mode 100644 index 0000000000..cc6fc47d65 --- /dev/null +++ b/patterns/solid/src/main/java/com/baeldung/d/Keyboard.java @@ -0,0 +1,4 @@ +package com.baeldung.d; + +public interface Keyboard { +} diff --git a/patterns/principles/solid/src/main/java/com/baeldung/d/Monitor.java b/patterns/solid/src/main/java/com/baeldung/d/Monitor.java similarity index 100% rename from patterns/principles/solid/src/main/java/com/baeldung/d/Monitor.java rename to patterns/solid/src/main/java/com/baeldung/d/Monitor.java diff --git a/patterns/solid/src/main/java/com/baeldung/d/StandardKeyboard.java b/patterns/solid/src/main/java/com/baeldung/d/StandardKeyboard.java new file mode 100644 index 0000000000..cb0e229943 --- /dev/null +++ b/patterns/solid/src/main/java/com/baeldung/d/StandardKeyboard.java @@ -0,0 +1,5 @@ +package com.baeldung.d; + +public class StandardKeyboard implements Keyboard { + +} diff --git a/patterns/principles/solid/src/main/java/com/baeldung/d/Windows98Machine.java b/patterns/solid/src/main/java/com/baeldung/d/Windows98Machine.java similarity index 66% rename from patterns/principles/solid/src/main/java/com/baeldung/d/Windows98Machine.java rename to patterns/solid/src/main/java/com/baeldung/d/Windows98Machine.java index a9f130aedb..4d6ead9aa2 100644 --- a/patterns/principles/solid/src/main/java/com/baeldung/d/Windows98Machine.java +++ b/patterns/solid/src/main/java/com/baeldung/d/Windows98Machine.java @@ -2,13 +2,13 @@ package com.baeldung.d; public class Windows98Machine { - private final Keyboard keyboard; + private final StandardKeyboard keyboard; private final Monitor monitor; public Windows98Machine() { monitor = new Monitor(); - keyboard = new Keyboard(); + keyboard = new StandardKeyboard(); } diff --git a/patterns/principles/solid/src/main/java/com/baeldung/d/Windows98MachineDI.java b/patterns/solid/src/main/java/com/baeldung/d/Windows98MachineDI.java similarity index 100% rename from patterns/principles/solid/src/main/java/com/baeldung/d/Windows98MachineDI.java rename to patterns/solid/src/main/java/com/baeldung/d/Windows98MachineDI.java diff --git a/patterns/principles/solid/src/main/java/com/baeldung/i/BearCarer.java b/patterns/solid/src/main/java/com/baeldung/i/BearCarer.java similarity index 100% rename from patterns/principles/solid/src/main/java/com/baeldung/i/BearCarer.java rename to patterns/solid/src/main/java/com/baeldung/i/BearCarer.java diff --git a/patterns/principles/solid/src/main/java/com/baeldung/i/BearCleaner.java b/patterns/solid/src/main/java/com/baeldung/i/BearCleaner.java similarity index 100% rename from patterns/principles/solid/src/main/java/com/baeldung/i/BearCleaner.java rename to patterns/solid/src/main/java/com/baeldung/i/BearCleaner.java diff --git a/patterns/principles/solid/src/main/java/com/baeldung/i/BearFeeder.java b/patterns/solid/src/main/java/com/baeldung/i/BearFeeder.java similarity index 100% rename from patterns/principles/solid/src/main/java/com/baeldung/i/BearFeeder.java rename to patterns/solid/src/main/java/com/baeldung/i/BearFeeder.java diff --git a/patterns/principles/solid/src/main/java/com/baeldung/i/BearKeeper.java b/patterns/solid/src/main/java/com/baeldung/i/BearKeeper.java similarity index 100% rename from patterns/principles/solid/src/main/java/com/baeldung/i/BearKeeper.java rename to patterns/solid/src/main/java/com/baeldung/i/BearKeeper.java diff --git a/patterns/principles/solid/src/main/java/com/baeldung/i/BearPetter.java b/patterns/solid/src/main/java/com/baeldung/i/BearPetter.java similarity index 100% rename from patterns/principles/solid/src/main/java/com/baeldung/i/BearPetter.java rename to patterns/solid/src/main/java/com/baeldung/i/BearPetter.java diff --git a/patterns/principles/solid/src/main/java/com/baeldung/i/CrazyPerson.java b/patterns/solid/src/main/java/com/baeldung/i/CrazyPerson.java similarity index 100% rename from patterns/principles/solid/src/main/java/com/baeldung/i/CrazyPerson.java rename to patterns/solid/src/main/java/com/baeldung/i/CrazyPerson.java diff --git a/patterns/principles/solid/src/main/java/com/baeldung/l/Car.java b/patterns/solid/src/main/java/com/baeldung/l/Car.java similarity index 100% rename from patterns/principles/solid/src/main/java/com/baeldung/l/Car.java rename to patterns/solid/src/main/java/com/baeldung/l/Car.java diff --git a/patterns/principles/solid/src/main/java/com/baeldung/l/ElectricCar.java b/patterns/solid/src/main/java/com/baeldung/l/ElectricCar.java similarity index 100% rename from patterns/principles/solid/src/main/java/com/baeldung/l/ElectricCar.java rename to patterns/solid/src/main/java/com/baeldung/l/ElectricCar.java diff --git a/patterns/principles/solid/src/main/java/com/baeldung/l/Engine.java b/patterns/solid/src/main/java/com/baeldung/l/Engine.java similarity index 100% rename from patterns/principles/solid/src/main/java/com/baeldung/l/Engine.java rename to patterns/solid/src/main/java/com/baeldung/l/Engine.java diff --git a/patterns/principles/solid/src/main/java/com/baeldung/l/MotorCar.java b/patterns/solid/src/main/java/com/baeldung/l/MotorCar.java similarity index 100% rename from patterns/principles/solid/src/main/java/com/baeldung/l/MotorCar.java rename to patterns/solid/src/main/java/com/baeldung/l/MotorCar.java diff --git a/patterns/principles/solid/src/main/java/com/baeldung/o/Guitar.java b/patterns/solid/src/main/java/com/baeldung/o/Guitar.java similarity index 100% rename from patterns/principles/solid/src/main/java/com/baeldung/o/Guitar.java rename to patterns/solid/src/main/java/com/baeldung/o/Guitar.java diff --git a/patterns/principles/solid/src/main/java/com/baeldung/o/SuperCoolGuitarWithFlames.java b/patterns/solid/src/main/java/com/baeldung/o/SuperCoolGuitarWithFlames.java similarity index 100% rename from patterns/principles/solid/src/main/java/com/baeldung/o/SuperCoolGuitarWithFlames.java rename to patterns/solid/src/main/java/com/baeldung/o/SuperCoolGuitarWithFlames.java diff --git a/patterns/principles/solid/src/main/java/com/baeldung/s/BadBook.java b/patterns/solid/src/main/java/com/baeldung/s/BadBook.java similarity index 100% rename from patterns/principles/solid/src/main/java/com/baeldung/s/BadBook.java rename to patterns/solid/src/main/java/com/baeldung/s/BadBook.java diff --git a/patterns/principles/solid/src/main/java/com/baeldung/s/BookPrinter.java b/patterns/solid/src/main/java/com/baeldung/s/BookPrinter.java similarity index 100% rename from patterns/principles/solid/src/main/java/com/baeldung/s/BookPrinter.java rename to patterns/solid/src/main/java/com/baeldung/s/BookPrinter.java diff --git a/patterns/principles/solid/src/main/java/com/baeldung/s/GoodBook.java b/patterns/solid/src/main/java/com/baeldung/s/GoodBook.java similarity index 100% rename from patterns/principles/solid/src/main/java/com/baeldung/s/GoodBook.java rename to patterns/solid/src/main/java/com/baeldung/s/GoodBook.java