Changed placeholder strings to make them more distinguishable from normal strings

Author: aljoshakoecher

lib/src/main/java/plc2skill/mapping/Plc2SkillMapper.java

@@ -36,10 +36,13 @@
 public class Plc2SkillMapper {
 
 	private final Logger logger = LoggerFactory.getLogger(getClass());
+	
+	private final String placeholderIdentifier = "__NodeIdRootComponent__";
+	private final String placeholderEndpointURL = "__ServerEndpointUrl__";
 
 	private QuadStore rmlMappingResult;
 	static String stateMachineTemplateFile = "PLCStateMachine.ttl";
-	static String pattern = "_Replace_";
+	static String pattern = "__SkillNamePlaceholder__";
 
 	private Path plcOpenFilePath;
 	private String endpointUrl;
@@ -111,7 +114,6 @@ private String completeMappingResult() {
 		// If a nodeIdRoot is given by the user, use it
 		if (nodeIdRoot != null) {
 			String stringMappingResult = RmlMapper.convertResultToString(this.rmlMappingResult);
-			String placeholderIdentifier = "PLCIdentifier";
 			resultWithIpPlaceholder = stringMappingResult.replaceAll(placeholderIdentifier, this.nodeIdRoot); // Replaces nodeID-Placeholder
 
 		} else {
@@ -135,15 +137,14 @@ private String completeMappingResult() {
 
 					}
 			} catch (Exception e) {
-				logger.error("Error while making a connection to the OPC UA server. Please check your endpointUrl and make sure the server is running.\n"
-						+ "No nodeIdRoot was provided and a connection to the OPC UA could not be made. The mapping result will contain incomplete nodeIds with unreplaced template strings.");
+				logger.error("Error while making a connection to the OPC UA server. Please check your endpointUrl and make sure the server is running.");
+				logger.error("No nodeIdRoot was provided and a connection to the OPC UA could not be made. The mapping result will contain incomplete nodeIds with unreplaced template strings.");
 				e.printStackTrace();
 			}
 
 			resultWithIpPlaceholder = RmlMapper.convertResultToString(rmlMappingResult);
 		}
 
-		String placeholderEndpointURL = "ServerIP";
 		String result = resultWithIpPlaceholder.replaceAll(placeholderEndpointURL, this.endpointUrl);
 		return result;
 	}
@@ -195,8 +196,8 @@ private String createStateMachines(Path plcOpenFilePath) {
 		// For every procedureNode: Create a customized state machine by replacing the placeholder and add it to the total stateMachin string
 		String mappedStateMachines = "";
 		for (int i = 0; i < procedureNodes.getLength(); i++) {
-			String nodeName = procedureNodes.item(i).getAttributes().getNamedItem("name").getNodeValue();
-			String stateMachine = stateMachineTemplate.replaceAll(pattern, nodeName);
+			String skillName = procedureNodes.item(i).getAttributes().getNamedItem("name").getNodeValue();
+			String stateMachine = stateMachineTemplate.replaceAll(pattern, skillName);
 			mappedStateMachines += stateMachine;
 		}
 

lib/src/main/resources/PLC2SkillMappingRules.ttl

@@ -24,7 +24,7 @@
         rr:predicateObjectMap[
         rr:predicate OPCUA:nodeId;
         rr:objectMap[
-            rr:template "PLCIdentifier.{./ancestor::resource/@name}.{./ancestor::resource/task/pouInstance/@name}.{@name}";
+            rr:template "__NodeIdRootComponent__.{./ancestor::resource/@name}.{./ancestor::resource/task/pouInstance/@name}.{@name}";
             rr:datatype xsd:string;
         ]
     ];
@@ -78,7 +78,7 @@
         rr:predicateObjectMap [
         rr:predicate OPCUA:nodeId;
         rr:objectMap [
-            rr:template "PLCIdentifier.{./ancestor::resource/@name}.{./ancestor::resource/task/pouInstance/@name}.{@name}.{./ancestor::instances/configurations/configuration/resource/addData/data/pou[@name=./type/derived/@name]/interface/inputVars/variable[./type/derived/@name='PLC2Skill.SkillParameter']/@name}.value";
+            rr:template "__NodeIdRootComponent__.{./ancestor::resource/@name}.{./ancestor::resource/task/pouInstance/@name}.{@name}.{./ancestor::instances/configurations/configuration/resource/addData/data/pou[@name=./type/derived/@name]/interface/inputVars/variable[./type/derived/@name='PLC2Skill.SkillParameter']/@name}.value";
             rr:datatype xsd:string; 
                 ]
         ];
@@ -132,7 +132,7 @@
         rr:predicateObjectMap [
         rr:predicate OPCUA:nodeId;
         rr:objectMap [
-            rr:template "PLCIdentifier.{./ancestor::resource/@name}.{./ancestor::resource/task/pouInstance/@name}.{@name}.{./ancestor::instances/configurations/configuration/resource/addData/data/pou[@name=./type/derived/@name]/interface/outputVars/variable[./type/derived/@name='PLC2Skill.SkillParameter']/@name}.value";
+            rr:template "__NodeIdRootComponent__.{./ancestor::resource/@name}.{./ancestor::resource/task/pouInstance/@name}.{@name}.{./ancestor::instances/configurations/configuration/resource/addData/data/pou[@name=./type/derived/@name]/interface/outputVars/variable[./type/derived/@name='PLC2Skill.SkillParameter']/@name}.value";
             rr:datatype xsd:string; 
                 ]
         ];
@@ -214,7 +214,7 @@
         rr:predicateObjectMap [
         rr:predicate OPCUA:nodeId;
         rr:objectMap [
-            rr:template "PLCIdentifier.{./ancestor::resource/@name}.{./ancestor::resource/task/pouInstance/@name}.{@name}.currentState";
+            rr:template "__NodeIdRootComponent__.{./ancestor::resource/@name}.{./ancestor::resource/task/pouInstance/@name}.{@name}.currentState";
             rr:datatype xsd:string; 
                 ]
         ];
@@ -1119,7 +1119,7 @@
         rr:predicateObjectMap[
         rr:predicate OPCUA:nodeId;
         rr:objectMap[
-            rr:template "PLCIdentifier.{./ancestor::resource/@name}.{./ancestor::resource/task/pouInstance/@name}.{@name}.transition";
+            rr:template "__NodeIdRootComponent__.{./ancestor::resource/@name}.{./ancestor::resource/task/pouInstance/@name}.{@name}.transition";
             rr:datatype xsd:string
         ]
 
@@ -1619,7 +1619,7 @@
 	rr:predicateObjectMap [
     rr:predicate OPCUA:hasEndpointUrl;
     rr:objectMap [   
-	rr:template "ServerIP";
+	rr:template "__ServerEndpointUrl__";
 	rr:datatype xsd:string
 ]];	
 		rr:predicateObjectMap [