Merge pull request #107 from hendrikebbers/106-fix

Fix for issue 106: Change folder of BIN and ABI artifacts

.gitignore

@@ -114,9 +114,4 @@ fabric.properties
 # *.ipr
 
 # Sonarlint plugin
-.idea/sonarlint
-
-# End of https://www.gitignore.io/api/intellij
-.idea/jarRepositories.xml
-.idea/encodings.xml
-.idea/jarRepositories.xml
+**/.idea/*

src/main/java/org/web3j/mavenplugin/JavaClassGeneratorMojo.java

@@ -78,7 +78,7 @@ public class JavaClassGeneratorMojo extends AbstractMojo {
     protected String outputJavaParentContractClassName;
 
     private Path createPath(String destinationPath) throws IOException {
-        Path path = Paths.get(destinationPath, packageName);
+        Path path = Paths.get(destinationPath, packageName.replace('.', '/'));
 
         if (!path.toFile().exists()) {
             Files.createDirectories(path);

src/test/java/org/web3j/mavenplugin/IssueITest.java

@@ -280,4 +280,22 @@ public void issue83_solidityVersion_withABI() throws Exception {
                 .collect(Collectors.toList());
         assertEquals("EtherWallet.java", files.get(0).getFileName().toString());
     }
+
+    @Test
+    public void issue106_ABI_and_BIN_destination() throws Exception {
+        File pom = new File(resources.getBasedir("issue/106"), "pom.xml");
+        assertNotNull(pom);
+        assertTrue(pom.exists());
+
+        JavaClassGeneratorMojo mojo = (JavaClassGeneratorMojo) mojoRule.lookupMojo("generate-sources", pom);
+        assertNotNull(mojo);
+
+        mojo.sourceDestination = testFolder.getRoot().getPath();
+        mojo.outputDirectory.setAbi(testFolder.getRoot().getPath() + "/abi");
+        mojo.outputDirectory.setBin(testFolder.getRoot().getPath() + "/bin");
+        mojo.execute();
+
+        assertTrue(Paths.get(testFolder.getRoot().getPath(), "abi", "com", "sample", "generated", "Sample.json").toFile().exists());
+        assertTrue(Paths.get(testFolder.getRoot().getPath(), "bin", "com", "sample", "generated", "Sample.bin").toFile().exists());
+    }
 }

src/test/projects/issue/106/pom.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.zuehlke.bc</groupId>
+    <artifactId>project-to-test</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>Mojo Test Project</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.web3j</groupId>
+                <artifactId>web3j-maven-plugin</artifactId>
+                <version>4.8.7</version>
+                <configuration>
+                    <soliditySourceFiles>
+                        <directory>src/test/resources/issue-106</directory>
+                        <includes>
+                            <include>**/*.sol</include>
+                        </includes>
+                    </soliditySourceFiles>
+                    <outputFormat>java,abi,bin</outputFormat>
+                    <packageName>com.sample.generated</packageName>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

src/test/resources/issue-106/sample.sol

@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.8.1 < 0.9.0;
+
+
+library Sample {
+    function convert(uint amount, uint conversionRate) pure public returns (uint convertedAmount)
+    {
+        return amount * conversionRate;
+    }
+}