Merge remote-tracking branch 'origin/master' into release/4.5.5

Author: antonydenyer

src/main/java/org/web3j/console/project/ProjectStructure.java

@@ -79,7 +79,7 @@ private String generatePath(final String... a) {
 
     private String formatPackageName(final String packageName) {
         if (packageName.contains(".")) {
-            return packageName.replace("\\.", File.separator);
+            return packageName.replace(".", File.separator);
         }
         return packageName;
     }

src/test/java/org/web3j/console/project/InteractiveImporterTest.java

@@ -26,7 +26,7 @@
 
 public class InteractiveImporterTest {
     private static final String FORMATTED_SOLIDITY_PATH =
-            "/web3j/console/src/test/resources/Solidity".replaceAll("/", File.separator);
+            "/web3j/console/src/test/resources/Solidity".replace("/", File.separator);
     private InputStream inputStream;
     private String tempDirPath;
 

src/test/java/org/web3j/console/project/ProjectImporterTest.java

@@ -98,7 +98,7 @@ public void testWithPicoCliWhenArgumentsAreEmpty() {
     public void testWhenInteractiveAndArgumentsAreCorrect()
             throws IOException, InterruptedException {
         String formattedPath =
-                "/web3j/console/src/test/resources/Solidity".replaceAll("/", File.separator);
+                "/web3j/console/src/test/resources/Solidity".replace("/", File.separator);
         final String[] args = {"import"};
         Process process =
                 executeClassAsSubProcessAndReturnProcess(

src/test/java/org/web3j/console/project/ProjectTest.java

@@ -38,8 +38,8 @@ public void setUpProject(@TempDir Path tempDirPath) throws Exception {
                         .loadGradlewWrapperSettings("gradlew-wrapper.properties.template")
                         .loadGradleJar("gradle-wrapper.jar")
                         .loadSolidityGreeter("Greeter.sol")
-                        .withPackageNameReplacement(s -> s.replaceAll("<package_name>", "test"))
-                        .withProjectNameReplacement(s -> s.replaceAll("<project_name>", "test"))
+                        .withPackageNameReplacement(s -> s.replace("<package_name>", "test"))
+                        .withProjectNameReplacement(s -> s.replace("<project_name>", "test"))
                         .build();
         Project.builder()
                 .withTemplateProvider(templateProviderNew)

src/test/java/org/web3j/console/project/TemplateProviderTest.java

@@ -33,8 +33,8 @@ public void init() throws IOException {
                         .loadGradleSettings("settings.gradle.template")
                         .loadGradlewWrapperSettings("gradlew-wrapper.properties.template")
                         .loadGradleJar("gradle-wrapper.jar")
-                        .withPackageNameReplacement(s -> s.replaceAll("<package_name>", "test"))
-                        .withProjectNameReplacement(s -> s.replaceAll("<project_name>", "test"))
+                        .withPackageNameReplacement(s -> s.replace("<package_name>", "test"))
+                        .withProjectNameReplacement(s -> s.replace("<project_name>", "test"))
                         .build();
     }