[plc4x-build-tools] branch develop updated: - Replaced the java specific code generation parameter packageName with languageName and protocolName.

[cd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x-build-tools.git


The following commit(s) were added to refs/heads/develop by this push:
     new 1613dce  - Replaced the java specific code generation parameter packageName with languageName and protocolName.
1613dce is described below

commit 1613dce017129e993d7e2d7265a1a3e6c44ce5b3
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Tue Aug 27 10:03:07 2019 +0200

    - Replaced the java specific code generation parameter packageName with languageName and protocolName.
---
 .../plc4x/plugins/codegenerator/language/LanguageOutput.java       | 2 +-
 .../java/org/apache/plc4x/plugins/codegenerator/GenerateMojo.java  | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/code-generation/language-base/src/main/java/org/apache/plc4x/plugins/codegenerator/language/LanguageOutput.java b/code-generation/language-base/src/main/java/org/apache/plc4x/plugins/codegenerator/language/LanguageOutput.java
index c190a6f..e467e66 100644
--- a/code-generation/language-base/src/main/java/org/apache/plc4x/plugins/codegenerator/language/LanguageOutput.java
+++ b/code-generation/language-base/src/main/java/org/apache/plc4x/plugins/codegenerator/language/LanguageOutput.java
@@ -34,7 +34,7 @@ public interface LanguageOutput {
      */
     String getName();
 
-    void generate(File outputDir, String packageName, Map<String, ComplexTypeDefinition> types)
+    void generate(File outputDir, String languageName, String protocolName, Map<String, ComplexTypeDefinition> types)
         throws GenerationException;
 
 }
diff --git a/code-generation/plc4x-maven-plugin/src/main/java/org/apache/plc4x/plugins/codegenerator/GenerateMojo.java b/code-generation/plc4x-maven-plugin/src/main/java/org/apache/plc4x/plugins/codegenerator/GenerateMojo.java
index a550875..c1c6e49 100644
--- a/code-generation/plc4x-maven-plugin/src/main/java/org/apache/plc4x/plugins/codegenerator/GenerateMojo.java
+++ b/code-generation/plc4x-maven-plugin/src/main/java/org/apache/plc4x/plugins/codegenerator/GenerateMojo.java
@@ -128,8 +128,7 @@ public class GenerateMojo extends AbstractMojo {
             Map<String, ComplexTypeDefinition> types = protocol.getTypeDefinitions();
 
             // Generate output for the type definitions.
-            language.generate(outputDir, getPackageName(languageName) +
-                "." + protocolName.toLowerCase(), types);
+            language.generate(outputDir, languageName, protocolName, types);
         } catch (GenerationException e) {
             throw new MojoExecutionException("Error generating sources", e);
         }
@@ -138,8 +137,4 @@ public class GenerateMojo extends AbstractMojo {
         project.addCompileSourceRoot(outputDir.getPath());
     }
 
-    private String getPackageName(String languageName) {
-        return "org.apache.plc4x." + StringUtils.remove(languageName.toLowerCase(), '-');
-    }
-
 }