From 379992c84e345dbf8505e274046c24193c1f5b37 Mon Sep 17 00:00:00 2001 From: Graham Cox Date: Tue, 15 Aug 2023 11:56:05 +0100 Subject: [PATCH] BAEL-6813: Moved Magic Square code to core-java-lang-math-3 (#14587) * BAEL-6813: Moved Magic Square code to core-java-lang-math-3 * Fix code to work below Java 11 * Fix unrelated broken test --- .../java/com/baeldung/jar/JarAppUnitTest.java | 6 ++- .../magicsquare/GenerationUnitTest.java | 2 +- .../baeldung}/magicsquare/MagicSquare.java | 6 ++- .../magicsquare/ValidationUnitTest.java | 2 +- core-java-modules/core-java-leetcode/pom.xml | 39 ------------------- core-java-modules/pom.xml | 1 - 6 files changed, 11 insertions(+), 45 deletions(-) rename core-java-modules/{core-java-leetcode/src/test/java/com/baeldung/leetcode => core-java-lang-math-3/src/test/java/com/baeldung}/magicsquare/GenerationUnitTest.java (95%) rename core-java-modules/{core-java-leetcode/src/test/java/com/baeldung/leetcode => core-java-lang-math-3/src/test/java/com/baeldung}/magicsquare/MagicSquare.java (96%) rename core-java-modules/{core-java-leetcode/src/test/java/com/baeldung/leetcode => core-java-lang-math-3/src/test/java/com/baeldung}/magicsquare/ValidationUnitTest.java (92%) delete mode 100644 core-java-modules/core-java-leetcode/pom.xml diff --git a/core-java-modules/core-java-jar/src/test/java/com/baeldung/jar/JarAppUnitTest.java b/core-java-modules/core-java-jar/src/test/java/com/baeldung/jar/JarAppUnitTest.java index 707ce79624..fc40aa01c5 100644 --- a/core-java-modules/core-java-jar/src/test/java/com/baeldung/jar/JarAppUnitTest.java +++ b/core-java-modules/core-java-jar/src/test/java/com/baeldung/jar/JarAppUnitTest.java @@ -3,10 +3,14 @@ package com.baeldung.jar; import org.junit.Assert; import org.junit.jupiter.api.Test; +import java.util.regex.Pattern; + public class JarAppUnitTest { @Test public void findClassTest(){ - Assert.assertTrue(JarApp.findObjectMapperClass().endsWith("jackson-databind-2.13.3.jar")); + Pattern databindPattern = Pattern.compile(".*jackson-databind-(\\d)+\\.(\\d)+\\.(\\d)\\.jar$"); + + Assert.assertTrue(databindPattern.matcher(JarApp.findObjectMapperClass()).matches()); } } diff --git a/core-java-modules/core-java-leetcode/src/test/java/com/baeldung/leetcode/magicsquare/GenerationUnitTest.java b/core-java-modules/core-java-lang-math-3/src/test/java/com/baeldung/magicsquare/GenerationUnitTest.java similarity index 95% rename from core-java-modules/core-java-leetcode/src/test/java/com/baeldung/leetcode/magicsquare/GenerationUnitTest.java rename to core-java-modules/core-java-lang-math-3/src/test/java/com/baeldung/magicsquare/GenerationUnitTest.java index 308c655bd1..f02200462e 100644 --- a/core-java-modules/core-java-leetcode/src/test/java/com/baeldung/leetcode/magicsquare/GenerationUnitTest.java +++ b/core-java-modules/core-java-lang-math-3/src/test/java/com/baeldung/magicsquare/GenerationUnitTest.java @@ -1,4 +1,4 @@ -package com.baeldung.leetcode.magicsquare; +package com.baeldung.magicsquare; import org.junit.jupiter.api.Test; diff --git a/core-java-modules/core-java-leetcode/src/test/java/com/baeldung/leetcode/magicsquare/MagicSquare.java b/core-java-modules/core-java-lang-math-3/src/test/java/com/baeldung/magicsquare/MagicSquare.java similarity index 96% rename from core-java-modules/core-java-leetcode/src/test/java/com/baeldung/leetcode/magicsquare/MagicSquare.java rename to core-java-modules/core-java-lang-math-3/src/test/java/com/baeldung/magicsquare/MagicSquare.java index 5e16f2e0db..b6e7ac24f5 100644 --- a/core-java-modules/core-java-leetcode/src/test/java/com/baeldung/leetcode/magicsquare/MagicSquare.java +++ b/core-java-modules/core-java-lang-math-3/src/test/java/com/baeldung/magicsquare/MagicSquare.java @@ -1,4 +1,4 @@ -package com.baeldung.leetcode.magicsquare; +package com.baeldung.magicsquare; import org.junit.platform.commons.util.StringUtils; @@ -172,7 +172,9 @@ public class MagicSquare { int value = getCell(x, y); if (value == 0) { sb.append(" "); - sb.append(".".repeat(largestNumberLength)); + for (int i = 0; i < largestNumberLength; ++i) { + sb.append("."); + } sb.append(" "); } else { sb.append(String.format(formatString, value)); diff --git a/core-java-modules/core-java-leetcode/src/test/java/com/baeldung/leetcode/magicsquare/ValidationUnitTest.java b/core-java-modules/core-java-lang-math-3/src/test/java/com/baeldung/magicsquare/ValidationUnitTest.java similarity index 92% rename from core-java-modules/core-java-leetcode/src/test/java/com/baeldung/leetcode/magicsquare/ValidationUnitTest.java rename to core-java-modules/core-java-lang-math-3/src/test/java/com/baeldung/magicsquare/ValidationUnitTest.java index 93f36931e6..6b0ec600bb 100644 --- a/core-java-modules/core-java-leetcode/src/test/java/com/baeldung/leetcode/magicsquare/ValidationUnitTest.java +++ b/core-java-modules/core-java-lang-math-3/src/test/java/com/baeldung/magicsquare/ValidationUnitTest.java @@ -1,4 +1,4 @@ -package com.baeldung.leetcode.magicsquare; +package com.baeldung.magicsquare; import org.junit.jupiter.api.Test; diff --git a/core-java-modules/core-java-leetcode/pom.xml b/core-java-modules/core-java-leetcode/pom.xml deleted file mode 100644 index eb91308c64..0000000000 --- a/core-java-modules/core-java-leetcode/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - 4.0.0 - core-java-leetcode - core-java-leetcode - jar - - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - ../../pom.xml - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - ${maven.compiler.source.version} - ${maven.compiler.target.version} - - - - - - - 11 - 11 - - - diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml index a6f0382186..e9bb86e500 100644 --- a/core-java-modules/pom.xml +++ b/core-java-modules/pom.xml @@ -108,7 +108,6 @@ core-java-lang-operators-2 core-java-lang-syntax core-java-lang-syntax-2 - core-java-leetcode core-java-locale core-java-networking core-java-networking-2