fixed gen of gradle build

src/main/java/de/tudresden/inf/st/pnml/gen/Main.java

@@ -18,13 +18,13 @@ public class Main {
 
     public static void main(java.lang.String[] args) throws IOException {
 
-        if(args.length != 1){
-            System.out.println("Error: Invalid arguments.");
-            return;
-        }
+       // if(args.length != 1){
+     //       System.out.println("Error: Invalid arguments.");
+    //        return;
+    //    }
 
-        String configPath = args[0];
-        //String configPath = "src/test/resources/GeneratorConfig.json";
+        //String configPath = args[0];
+        String configPath = "src/test/resources/GeneratorConfig.json";
 
         ObjectMapper generatorConfigObjectMapper = new ObjectMapper();
         GeneratorConfig gc = generatorConfigObjectMapper.readValue(Files.readString(Paths.get(configPath)), GeneratorConfig.class);

src/main/java/de/tudresden/inf/st/pnml/gen/builders/PackageStructureBuilder.java

@@ -64,13 +64,11 @@ public class PackageStructureBuilder {
             if(pf.isTemplateFile()) {
 
                 if(pf.isJavaFile()){
-                  //  System.out.println("Writing file " + pf.getName() +  " to: " + packagePath + "/" + packageDirectory.getName() + "/" + pf.getName() + ".java");
-
+                    System.out.println("Writing file " + pf.getName() +  " to: " + packagePath + "/" + packageDirectory.getName() + "/" + pf.getName() + ".java");
                     //System.out.println("Content: \n" + pf.asTemplateFile().getFileContent());
-
                     writeToFile(packagePath + "/" + packageDirectory.getName() + "/" + pf.getName() + ".java", pf.asTemplateFile().getFileContent());
                 }else {
-                    //System.out.println("Writing file " + pf.getName() +  " to: " + packagePath + "/" + packageDirectory.getName() + "/" + pf.getName());
+                    System.out.println("Writing file " + pf.getName() +  " to: " + packagePath + "/" + packageDirectory.getName() + "/" + pf.getName());
                     writeToFile(packagePath + "/" + packageDirectory.getName() + "/" + pf.getName(), pf.asTemplateFile().getFileContent());
                 }
             }
@@ -98,16 +96,19 @@ public class PackageStructureBuilder {
 
     private static void buildDinerosGeneratedFilesStructure(DinerosPackage dinerosPackage, List<PetriNet> nets, List<NetInfo> petriNetFilePaths) {
 
+        for (PackageDirectory pd : dinerosPackage.allDirectories()) {
+
+            if (pd.getName().equals(dinerosPackage.getRootName())) {
                 GradleFile buildGradle = new GradleFile();
                 buildGradle.setName("build.gradle");
                 buildGradle.setFileID(UUID.randomUUID().toString());
-        dinerosPackage.addFile(buildGradle);
+                pd.addFile(buildGradle);
 
                 GradleFile gradleProbs = new GradleFile();
                 gradleProbs.setName("gradle.properties");
                 gradleProbs.setFileID(UUID.randomUUID().toString());
-
-        for (PackageDirectory pd : dinerosPackage.allDirectories()) {
+                pd.addFile(gradleProbs);
+            }
 
             if (pd.getName().equals(dinerosPackage.getNamespace())) {
                 MainFile mainFile = new MainFile();
@@ -334,8 +335,6 @@ public class PackageStructureBuilder {
                                              List<String> petriNetFiles, String rosHost, String rosMasterUri, String mqttHost) {
 
         Set<String> visitedPackageFileIDs = new HashSet<>();
-        Map<String, Integer> subscriberCountMap = initSubscriberCountMap(nets);
-        Map<String, Integer> serviceCountMap = initServiceCountMap(nets);
 
         for (PackageFile pf : dinerosPackage.allPackageFiles()) {
             if (pf.isMapperFile()) {
@@ -367,7 +366,6 @@ public class PackageStructureBuilder {
 
                             if (transitionType.equals(PnmlConstants.TRANSITION_TYPE_TOPIC_LIMITED_IN)
                                     || transitionType.equals(PnmlConstants.TRANSITION_TYPE_TOPIC_UNLIMITED_IN)) {
-                                System.out.println("t:" + t.getId());
                                 pf.setName("Node" + pf.asSubscriberFile().getNetCount() + "Subscriber" + pf.asSubscriberFile().getSubscriberCount());
                                 pf.asSubscriberFile().generate();
                                 //subscriberCountMap.put(nets.get(i).getId(), subscriberCountMap.get(nets.get(i).getId()) + 1);
@@ -383,9 +381,9 @@ public class PackageStructureBuilder {
                             String transitionType = t.asInputSignalTransition().getStaticTransitionInformation().getType();
 
                             if (transitionType.equals(PnmlConstants.TRANSITION_TYPE_SERVICE_REQUEST_OUT)) {
-                                pf.setName("Node" + i + "Server" + (serviceCountMap.get(nets.get(i).getId()) - 1));
+                                pf.setName("Node" + pf.asServerFile().getNetCount() + "Subscriber" + pf.asServerFile().getServerCount());
                                 pf.asServerFile().generate();
-                                serviceCountMap.put(nets.get(i).getId(), serviceCountMap.get(nets.get(i).getId()) + 1);
+                               // serviceCountMap.put(nets.get(i).getId(), serviceCountMap.get(nets.get(i).getId()) + 1);
                                 visitedPackageFileIDs.add(pf.getFileID());
                             }
                         }

src/main/java/de/tudresden/inf/st/pnml/gen/data/MainExecutionContext.java

@@ -3,13 +3,13 @@ package de.tudresden.inf.st.pnml.gen.data;
 public class MainExecutionContext {
 
     private String rosHost;
-    private String rostMasterUri;
+    private String rosMasterUri;
     private String mqttHost;
     private String packageNamespace;
 
-    public MainExecutionContext(String rosHost, String rostMasterUri, String mqttHost, String packageNamespace) {
+    public MainExecutionContext(String rosHost, String rosMasterUri, String mqttHost, String packageNamespace) {
         this.rosHost = rosHost;
-        this.rostMasterUri = rostMasterUri;
+        this.rosMasterUri = rosMasterUri;
         this.mqttHost = mqttHost;
         this.packageNamespace = packageNamespace;
     }
@@ -22,12 +22,12 @@ public class MainExecutionContext {
         this.rosHost = rosHost;
     }
 
-    public String getRostMasterUri() {
-        return rostMasterUri;
+    public String getRosMasterUri() {
+        return rosMasterUri;
     }
 
-    public void setRostMasterUri(String rostMasterUri) {
-        this.rostMasterUri = rostMasterUri;
+    public void setRosMasterUri(String rosMasterUri) {
+        this.rosMasterUri = rosMasterUri;
     }
 
     public String getMqttHost() {

src/main/resources/mustache/build.mustache

@@ -20,7 +20,7 @@ repositories {
 
 dependencies {
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.3'
-    compile fileTree(include: ['pnml-relast-engine-fatjar-{{pnmlRelastersion}}.jar'], dir: './libs')
+    compile fileTree(include: ['pnml-relast-engine-fatjar-{{pnmlRelastVersion}}.jar'], dir: './libs')
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }