diff --git a/src/main/java/de/tudresden/inf/st/pnml/gen/Main.java b/src/main/java/de/tudresden/inf/st/pnml/gen/Main.java index f65e2badb9af8dc6d84e2f9e0f86318da2d7844f..a993fdbda0d11ee29172e0d67b0b6c7bacc0d651 100644 --- a/src/main/java/de/tudresden/inf/st/pnml/gen/Main.java +++ b/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); diff --git a/src/main/java/de/tudresden/inf/st/pnml/gen/builders/PackageStructureBuilder.java b/src/main/java/de/tudresden/inf/st/pnml/gen/builders/PackageStructureBuilder.java index 6c0ce0c69fd4984f54c3f58e97b7f8502a6597d7..e9864301b80adbee6652b6798ebf1da2b70135c4 100644 --- a/src/main/java/de/tudresden/inf/st/pnml/gen/builders/PackageStructureBuilder.java +++ b/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,17 +96,20 @@ public class PackageStructureBuilder { private static void buildDinerosGeneratedFilesStructure(DinerosPackage dinerosPackage, List<PetriNet> nets, List<NetInfo> petriNetFilePaths) { - GradleFile buildGradle = new GradleFile(); - buildGradle.setName("build.gradle"); - buildGradle.setFileID(UUID.randomUUID().toString()); - dinerosPackage.addFile(buildGradle); - - GradleFile gradleProbs = new GradleFile(); - gradleProbs.setName("gradle.properties"); - gradleProbs.setFileID(UUID.randomUUID().toString()); - for (PackageDirectory pd : dinerosPackage.allDirectories()) { + if (pd.getName().equals(dinerosPackage.getRootName())) { + GradleFile buildGradle = new GradleFile(); + buildGradle.setName("build.gradle"); + buildGradle.setFileID(UUID.randomUUID().toString()); + pd.addFile(buildGradle); + + GradleFile gradleProbs = new GradleFile(); + gradleProbs.setName("gradle.properties"); + gradleProbs.setFileID(UUID.randomUUID().toString()); + pd.addFile(gradleProbs); + } + if (pd.getName().equals(dinerosPackage.getNamespace())) { MainFile mainFile = new MainFile(); mainFile.setName("Main"); @@ -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()); } } diff --git a/src/main/java/de/tudresden/inf/st/pnml/gen/data/MainExecutionContext.java b/src/main/java/de/tudresden/inf/st/pnml/gen/data/MainExecutionContext.java index b4322c60e5ed6613525806603de62f086c62ef8c..351e7a350657ff0869828e037ae54db2759aaa56 100644 --- a/src/main/java/de/tudresden/inf/st/pnml/gen/data/MainExecutionContext.java +++ b/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() { diff --git a/src/main/resources/mustache/build.mustache b/src/main/resources/mustache/build.mustache index 462bee6704715f4ee904eb0eb20c99ef50fce49d..bc1d7869fface206f1d6b998effe7690970b3d21 100644 --- a/src/main/resources/mustache/build.mustache +++ b/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' }