diff --git a/naked-objects/dom/.factorypath b/naked-objects/dom/.factorypath deleted file mode 100644 index 765185eb9..000000000 --- a/naked-objects/dom/.factorypath +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/naked-objects/fixture/.factorypath b/naked-objects/fixture/.factorypath deleted file mode 100644 index af744dc75..000000000 --- a/naked-objects/fixture/.factorypath +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/naked-objects/integtests/.factorypath b/naked-objects/integtests/.factorypath deleted file mode 100644 index 132658ebc..000000000 --- a/naked-objects/integtests/.factorypath +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/naked-objects/webapp/.factorypath b/naked-objects/webapp/.factorypath deleted file mode 100644 index 7d4378761..000000000 --- a/naked-objects/webapp/.factorypath +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/strangler/src/main/java/com/iluwatar/strangler/App.java b/strangler/src/main/java/com/iluwater/strangler/App.java similarity index 98% rename from strangler/src/main/java/com/iluwatar/strangler/App.java rename to strangler/src/main/java/com/iluwater/strangler/App.java index bba0f7f74..73a01480a 100644 --- a/strangler/src/main/java/com/iluwatar/strangler/App.java +++ b/strangler/src/main/java/com/iluwater/strangler/App.java @@ -21,7 +21,7 @@ * THE SOFTWARE. */ -package com.iluwatar.strangler; +package com.iluwater.strangler; /** * diff --git a/strangler/src/main/java/com/iluwatar/strangler/HalfArithmetic.java b/strangler/src/main/java/com/iluwater/strangler/HalfArithmetic.java similarity index 88% rename from strangler/src/main/java/com/iluwatar/strangler/HalfArithmetic.java rename to strangler/src/main/java/com/iluwater/strangler/HalfArithmetic.java index be9c15ec5..f070e6ce3 100644 --- a/strangler/src/main/java/com/iluwatar/strangler/HalfArithmetic.java +++ b/strangler/src/main/java/com/iluwater/strangler/HalfArithmetic.java @@ -21,7 +21,7 @@ * THE SOFTWARE. */ -package com.iluwatar.strangler; +package com.iluwater.strangler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,10 +34,10 @@ public class HalfArithmetic { private static final Logger LOGGER = LoggerFactory.getLogger(HalfArithmetic.class); private static final String VERSION = "1.5"; - private final HalfSource newSource; - private final OldSource oldSource; + private HalfSource newSource; + private OldSource oldSource; - public HalfArithmetic(HalfSource newSource, OldSource oldSource) { + public HalfArithmetic(final HalfSource newSource, final OldSource oldSource) { this.newSource = newSource; this.oldSource = oldSource; } @@ -47,7 +47,7 @@ public class HalfArithmetic { * @param nums numbers need to add together * @return accumulate sum */ - public int sum(int... nums) { + public int sum(final int... nums) { LOGGER.info("Arithmetic sum {}", VERSION); return newSource.accumulateSum(nums); } @@ -57,7 +57,7 @@ public class HalfArithmetic { * @param nums numbers need to multiply together * @return accumulate multiplication */ - public int mul(int... nums) { + public int mul(final int... nums) { LOGGER.info("Arithmetic mul {}", VERSION); return oldSource.accumulateMul(nums); } @@ -67,7 +67,7 @@ public class HalfArithmetic { * @param nums numbers need to check * @return if has any zero, return true, else, return false */ - public boolean ifHasZero(int... nums) { + public boolean ifHasZero(final int... nums) { LOGGER.info("Arithmetic check zero {}", VERSION); return !newSource.ifNonZero(nums); } diff --git a/strangler/src/main/java/com/iluwatar/strangler/HalfSource.java b/strangler/src/main/java/com/iluwater/strangler/HalfSource.java similarity index 93% rename from strangler/src/main/java/com/iluwatar/strangler/HalfSource.java rename to strangler/src/main/java/com/iluwater/strangler/HalfSource.java index b83293335..3e99b7977 100644 --- a/strangler/src/main/java/com/iluwatar/strangler/HalfSource.java +++ b/strangler/src/main/java/com/iluwater/strangler/HalfSource.java @@ -21,7 +21,7 @@ * THE SOFTWARE. */ -package com.iluwatar.strangler; +package com.iluwater.strangler; import java.util.Arrays; import org.slf4j.Logger; @@ -38,7 +38,7 @@ public class HalfSource { * Implement accumulate sum with new technique. * Replace old one in {@link OldSource} */ - public int accumulateSum(int... nums) { + public int accumulateSum(final int... nums) { LOGGER.info("Source module {}", VERSION); return Arrays.stream(nums).reduce(0, Integer::sum); } @@ -47,7 +47,7 @@ public class HalfSource { * Check if all number is not zero. * New feature. */ - public boolean ifNonZero(int... nums) { + public boolean ifNonZero(final int... nums) { LOGGER.info("Source module {}", VERSION); return Arrays.stream(nums).allMatch(num -> num != 0); } diff --git a/strangler/src/main/java/com/iluwatar/strangler/NewArithmetic.java b/strangler/src/main/java/com/iluwater/strangler/NewArithmetic.java similarity index 90% rename from strangler/src/main/java/com/iluwatar/strangler/NewArithmetic.java rename to strangler/src/main/java/com/iluwater/strangler/NewArithmetic.java index 8e482c8b3..1d02602fa 100644 --- a/strangler/src/main/java/com/iluwatar/strangler/NewArithmetic.java +++ b/strangler/src/main/java/com/iluwater/strangler/NewArithmetic.java @@ -21,7 +21,7 @@ * THE SOFTWARE. */ -package com.iluwatar.strangler; +package com.iluwater.strangler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,9 +33,9 @@ public class NewArithmetic { private static final Logger LOGGER = LoggerFactory.getLogger(NewArithmetic.class); private static final String VERSION = "2.0"; - private final NewSource source; + private NewSource source; - public NewArithmetic(NewSource source) { + public NewArithmetic(final NewSource source) { this.source = source; } @@ -44,7 +44,7 @@ public class NewArithmetic { * @param nums numbers need to add together * @return accumulate sum */ - public int sum(int... nums) { + public int sum(final int... nums) { LOGGER.info("Arithmetic sum {}", VERSION); return source.accumulateSum(nums); } @@ -54,7 +54,7 @@ public class NewArithmetic { * @param nums numbers need to multiply together * @return accumulate multiplication */ - public int mul(int... nums) { + public int mul(final int... nums) { LOGGER.info("Arithmetic mul {}", VERSION); return source.accumulateMul(nums); } @@ -64,7 +64,7 @@ public class NewArithmetic { * @param nums numbers need to check * @return if has any zero, return true, else, return false */ - public boolean ifHasZero(int... nums) { + public boolean ifHasZero(final int... nums) { LOGGER.info("Arithmetic check zero {}", VERSION); return !source.ifNonZero(nums); } diff --git a/strangler/src/main/java/com/iluwatar/strangler/NewSource.java b/strangler/src/main/java/com/iluwater/strangler/NewSource.java similarity index 91% rename from strangler/src/main/java/com/iluwatar/strangler/NewSource.java rename to strangler/src/main/java/com/iluwater/strangler/NewSource.java index f53a31bd8..39dcefc6e 100644 --- a/strangler/src/main/java/com/iluwatar/strangler/NewSource.java +++ b/strangler/src/main/java/com/iluwater/strangler/NewSource.java @@ -21,7 +21,7 @@ * THE SOFTWARE. */ -package com.iluwatar.strangler; +package com.iluwater.strangler; import java.util.Arrays; import org.slf4j.Logger; @@ -35,7 +35,7 @@ public class NewSource { private static final Logger LOGGER = LoggerFactory.getLogger(NewSource.class); private static final String VERSION = "2.0"; - public int accumulateSum(int... nums) { + public int accumulateSum(final int... nums) { LOGGER.info("Source module {}", VERSION); return Arrays.stream(nums).reduce(0, Integer::sum); } @@ -44,12 +44,12 @@ public class NewSource { * Implement accumulate multiply with new technique. * Replace old one in {@link OldSource} */ - public int accumulateMul(int... nums) { + public int accumulateMul(final int... nums) { LOGGER.info("Source module {}", VERSION); return Arrays.stream(nums).reduce(1, (a, b) -> a * b); } - public boolean ifNonZero(int... nums) { + public boolean ifNonZero(final int... nums) { LOGGER.info("Source module {}", VERSION); return Arrays.stream(nums).allMatch(num -> num != 0); } diff --git a/strangler/src/main/java/com/iluwatar/strangler/OldArithmetic.java b/strangler/src/main/java/com/iluwater/strangler/OldArithmetic.java similarity index 91% rename from strangler/src/main/java/com/iluwatar/strangler/OldArithmetic.java rename to strangler/src/main/java/com/iluwater/strangler/OldArithmetic.java index e9d57987a..80d0dd1f9 100644 --- a/strangler/src/main/java/com/iluwatar/strangler/OldArithmetic.java +++ b/strangler/src/main/java/com/iluwater/strangler/OldArithmetic.java @@ -21,7 +21,7 @@ * THE SOFTWARE. */ -package com.iluwatar.strangler; +package com.iluwater.strangler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,9 +33,9 @@ public class OldArithmetic { private static final Logger LOGGER = LoggerFactory.getLogger(OldArithmetic.class); private static final String VERSION = "1.0"; - private final OldSource source; + private OldSource source; - public OldArithmetic(OldSource source) { + public OldArithmetic(final OldSource source) { this.source = source; } @@ -44,7 +44,7 @@ public class OldArithmetic { * @param nums numbers need to add together * @return accumulate sum */ - public int sum(int... nums) { + public int sum(final int... nums) { LOGGER.info("Arithmetic sum {}", VERSION); return source.accumulateSum(nums); } @@ -54,7 +54,7 @@ public class OldArithmetic { * @param nums numbers need to multiply together * @return accumulate multiplication */ - public int mul(int... nums) { + public int mul(final int... nums) { LOGGER.info("Arithmetic mul {}", VERSION); return source.accumulateMul(nums); } diff --git a/strangler/src/main/java/com/iluwatar/strangler/OldSource.java b/strangler/src/main/java/com/iluwater/strangler/OldSource.java similarity index 90% rename from strangler/src/main/java/com/iluwatar/strangler/OldSource.java rename to strangler/src/main/java/com/iluwater/strangler/OldSource.java index 0ac0b5a07..403c8fbfb 100644 --- a/strangler/src/main/java/com/iluwatar/strangler/OldSource.java +++ b/strangler/src/main/java/com/iluwater/strangler/OldSource.java @@ -21,7 +21,7 @@ * THE SOFTWARE. */ -package com.iluwatar.strangler; +package com.iluwater.strangler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,12 +31,12 @@ import org.slf4j.LoggerFactory; */ public class OldSource { private static final Logger LOGGER = LoggerFactory.getLogger(OldSource.class); - private static final String VERSION = "1.0"; + private static final String VERSION = "1.0"; /** * Implement accumulate sum with old technique. */ - public int accumulateSum(int... nums) { + public int accumulateSum(final int... nums) { LOGGER.info("Source module {}", VERSION); var sum = 0; for (final var num : nums) { @@ -48,7 +48,7 @@ public class OldSource { /** * Implement accumulate multiply with old technique. */ - public int accumulateMul(int... nums) { + public int accumulateMul(final int... nums) { LOGGER.info("Source module {}", VERSION); var sum = 1; for (final var num : nums) { diff --git a/strangler/src/test/java/com/iluwatar/strangler/AppTest.java b/strangler/src/test/java/com/iluwater/strangler/AppTest.java similarity index 97% rename from strangler/src/test/java/com/iluwatar/strangler/AppTest.java rename to strangler/src/test/java/com/iluwater/strangler/AppTest.java index a9e878a94..d52eacf39 100644 --- a/strangler/src/test/java/com/iluwatar/strangler/AppTest.java +++ b/strangler/src/test/java/com/iluwater/strangler/AppTest.java @@ -21,7 +21,7 @@ * THE SOFTWARE. */ -package com.iluwatar.strangler; +package com.iluwater.strangler; import org.junit.jupiter.api.Test; diff --git a/strangler/src/test/java/com/iluwatar/strangler/HalfArithmeticTest.java b/strangler/src/test/java/com/iluwater/strangler/HalfArithmeticTest.java similarity index 91% rename from strangler/src/test/java/com/iluwatar/strangler/HalfArithmeticTest.java rename to strangler/src/test/java/com/iluwater/strangler/HalfArithmeticTest.java index 004631966..2bee75fb0 100644 --- a/strangler/src/test/java/com/iluwatar/strangler/HalfArithmeticTest.java +++ b/strangler/src/test/java/com/iluwater/strangler/HalfArithmeticTest.java @@ -21,7 +21,7 @@ * THE SOFTWARE. */ -package com.iluwatar.strangler; +package com.iluwater.strangler; import org.junit.jupiter.api.Test; @@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.*; * Test methods in HalfArithmetic */ class HalfArithmeticTest { - private static final HalfArithmetic arithmetic = new HalfArithmetic(new HalfSource(), new OldSource()); + private static HalfArithmetic arithmetic = new HalfArithmetic(new HalfSource(), new OldSource()); @Test public void testSum() { diff --git a/strangler/src/test/java/com/iluwatar/strangler/HalfSourceTest.java b/strangler/src/test/java/com/iluwater/strangler/HalfSourceTest.java similarity index 94% rename from strangler/src/test/java/com/iluwatar/strangler/HalfSourceTest.java rename to strangler/src/test/java/com/iluwater/strangler/HalfSourceTest.java index a8f9fc6ac..5d88a881f 100644 --- a/strangler/src/test/java/com/iluwatar/strangler/HalfSourceTest.java +++ b/strangler/src/test/java/com/iluwater/strangler/HalfSourceTest.java @@ -21,19 +21,18 @@ * THE SOFTWARE. */ -package com.iluwatar.strangler; +package com.iluwater.strangler; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; - import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test methods in HalfSource */ public class HalfSourceTest { - private static final HalfSource source = new HalfSource(); + private static HalfSource source = new HalfSource(); @Test public void testAccumulateSum() { diff --git a/strangler/src/test/java/com/iluwatar/strangler/NewArithmeticTest.java b/strangler/src/test/java/com/iluwater/strangler/NewArithmeticTest.java similarity index 92% rename from strangler/src/test/java/com/iluwatar/strangler/NewArithmeticTest.java rename to strangler/src/test/java/com/iluwater/strangler/NewArithmeticTest.java index edb20241b..4bd8d157a 100644 --- a/strangler/src/test/java/com/iluwatar/strangler/NewArithmeticTest.java +++ b/strangler/src/test/java/com/iluwater/strangler/NewArithmeticTest.java @@ -21,7 +21,7 @@ * THE SOFTWARE. */ -package com.iluwatar.strangler; +package com.iluwater.strangler; import org.junit.jupiter.api.Test; @@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.*; * Test methods in NewArithmetic */ class NewArithmeticTest { - private static final NewArithmetic arithmetic = new NewArithmetic(new NewSource()); + private static NewArithmetic arithmetic = new NewArithmetic(new NewSource()); @Test public void testSum() { diff --git a/strangler/src/test/java/com/iluwatar/strangler/NewSourceTest.java b/strangler/src/test/java/com/iluwater/strangler/NewSourceTest.java similarity index 94% rename from strangler/src/test/java/com/iluwatar/strangler/NewSourceTest.java rename to strangler/src/test/java/com/iluwater/strangler/NewSourceTest.java index 577cc0daf..890202bf7 100644 --- a/strangler/src/test/java/com/iluwatar/strangler/NewSourceTest.java +++ b/strangler/src/test/java/com/iluwater/strangler/NewSourceTest.java @@ -21,7 +21,7 @@ * THE SOFTWARE. */ -package com.iluwatar.strangler; +package com.iluwater.strangler; import org.junit.jupiter.api.Test; @@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; * Test methods in NewSource */ public class NewSourceTest { - private static final NewSource source = new NewSource(); + private static NewSource source = new NewSource(); @Test public void testAccumulateSum() { diff --git a/strangler/src/test/java/com/iluwatar/strangler/OldArithmeticTest.java b/strangler/src/test/java/com/iluwater/strangler/OldArithmeticTest.java similarity index 92% rename from strangler/src/test/java/com/iluwatar/strangler/OldArithmeticTest.java rename to strangler/src/test/java/com/iluwater/strangler/OldArithmeticTest.java index 7f653d311..a94744835 100644 --- a/strangler/src/test/java/com/iluwatar/strangler/OldArithmeticTest.java +++ b/strangler/src/test/java/com/iluwater/strangler/OldArithmeticTest.java @@ -21,7 +21,7 @@ * THE SOFTWARE. */ -package com.iluwatar.strangler; +package com.iluwater.strangler; import org.junit.jupiter.api.Test; @@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.*; * Test methods in OldArithmetic */ class OldArithmeticTest { - private static final OldArithmetic arithmetic = new OldArithmetic(new OldSource()); + private static OldArithmetic arithmetic = new OldArithmetic(new OldSource()); @Test public void testSum() { diff --git a/strangler/src/test/java/com/iluwatar/strangler/OldSourceTest.java b/strangler/src/test/java/com/iluwater/strangler/OldSourceTest.java similarity index 94% rename from strangler/src/test/java/com/iluwatar/strangler/OldSourceTest.java rename to strangler/src/test/java/com/iluwater/strangler/OldSourceTest.java index 12d6a6c14..691a07f43 100644 --- a/strangler/src/test/java/com/iluwatar/strangler/OldSourceTest.java +++ b/strangler/src/test/java/com/iluwater/strangler/OldSourceTest.java @@ -21,7 +21,7 @@ * THE SOFTWARE. */ -package com.iluwatar.strangler; +package com.iluwater.strangler; import org.junit.jupiter.api.Test; @@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; * Test methods in OldSource */ public class OldSourceTest { - private static final OldSource source = new OldSource(); + private static OldSource source = new OldSource(); @Test public void testAccumulateSum() {