Merge pull request #580 from Imvertor/Development

Development naar 4.3

Author: melsk-r

src/main/java/nl/imvertor/MIMCompiler/MIMCompiler.java

@@ -119,9 +119,10 @@ public boolean generateDefault() throws Exception {
 		}
 
 		if (isRDFType) {
-			transformer.setXslParm("generate-readable-ids", "false");
+			transformer.setXslParm("generate-readable-ids", "true");
 			transformer.setXslParm("generate-all-ids", "true");
-		}
+			transformer.setXslParm("add-generated-id", "true");
+				}
 
 		succeeds = succeeds && transformer.transformStep("properties/WORK_EMBELLISH_FILE", "properties/WORK_MIMFORMAT_XMLPATH", xslFileParam); //TODO must relocate generation of WORK_LISTS_FILE to a EMBELLISH step.
 

src/main/java/nl/imvertor/OfficeCompiler/OfficeCompiler.java

@@ -101,10 +101,10 @@ public boolean validateSchemas() throws Exception {
 			String msg = "XML schema: " +  StringUtils.substringAfter(m.message, m.code + ": ")  + " [" + URLDecoder.decode(StringUtils.substringAfter(m.file,"/xsd/"), StandardCharsets.UTF_8.name()) + ":" + m.line + "]";
 			switch (m.type.toLowerCase()) {
 				case "error":
-					runner.error(logger, msg,"","XERCES-" + m.code);
+					runner.error(logger, msg,"","#XERCES-" + m.code);
 					break;
 				case "warning":
-					runner.warn(logger, msg,"","XERCES-" + m.code);
+					runner.warn(logger, msg,"","#XERCES-" + m.code);
 					break;
 				default: 
 					runner.debug(logger,"CHAIN", msg);

src/main/java/nl/imvertor/SchemaValidator/SchemaValidator.java

@@ -106,59 +106,18 @@ public boolean generateKING() throws Exception {
 		transformer.setXslParm("json-version","3.0");
 		succeeds = succeeds && transformer.transformStep("properties/ROUGH_OPENAPI_ENDPRODUCT_XML_FILE_PATH","properties/RESULT_OPENAPI_ENDPRODUCT_XML_FILE_PATH", "properties/IMVERTOR_METAMODEL_KINGBSM_OPENAPI_ENDPRODUCT_XML_XSLPATH");
 
-		succeeds = succeeds && transformer.transformStep("properties/RESULT_OPENAPI_ENDPRODUCT_XML_FILE_PATH","properties/RESULT_YAMLHEADER_FILE_PATH", "properties/IMVERTOR_METAMODEL_KING_YAMLHEADER_XSLPATH");
-		succeeds = succeeds && transformer.transformStep("properties/RESULT_OPENAPI_ENDPRODUCT_XML_FILE_PATH","properties/RESULT_YAMLBODY_FILE_PATH", "properties/IMVERTOR_METAMODEL_KING_YAMLBODY_XSLPATH");
-
-		// Next 2 lines are for generating json and yaml using saxon
+		// Next 2 lines are for generating json and yaml using a json mapping file
 		succeeds = succeeds && transformer.transformStep("properties/RESULT_OPENAPI_ENDPRODUCT_XML_FILE_PATH","properties/RESULT_JSONMAPPING_4_BODY_FILE_PATH", "properties/IMVERTOR_METAMODEL_KING_EP4JSONMAPPING_4BODY_XSLPATH");
 		succeeds = succeeds && transformer.transformStep("properties/RESULT_OPENAPI_ENDPRODUCT_XML_FILE_PATH","properties/RESULT_JSONMAPPING_4_HEADER_FILE_PATH","properties/IMVERTOR_METAMODEL_KING_EP4JSONMAPPING_4HEADER_XSLPATH");
 
 		transformer.setXslParm("json-version","2.0");
-		succeeds = succeeds && transformer.transformStep("properties/RESULT_OPENAPI_ENDPRODUCT_XML_FILE_PATH","properties/RESULT_YAMLBODY_FILE_PATH2", "properties/IMVERTOR_METAMODEL_KING_YAMLBODY_XSLPATH");
 
-		// Next line is for generating json using saxon
+		// Next line is for generating json using a json mapping file
 		succeeds = succeeds && transformer.transformStep("properties/RESULT_OPENAPI_ENDPRODUCT_XML_FILE_PATH","properties/RESULT_JSONMAPPING_4_BODY_FILE_PATH2", "properties/IMVERTOR_METAMODEL_KING_EP4JSONMAPPING_4BODY_XSLPATH");
 
-		if (succeeds) {
-			// concatenate
-			YamlFile headerFile = new YamlFile(configurator.getXParm("properties/RESULT_YAMLHEADER_FILE_PATH"));
-			JsonFile bodyFile = new JsonFile(configurator.getXParm("properties/RESULT_YAMLBODY_FILE_PATH"));
-					 //bodyFile.prettyPrint();
-			YamlFile yamlFile = new YamlFile(configurator.getXParm("properties/RESULT_YAML_FILE_PATH2"));
-			JsonFile bodyFile2 = new JsonFile(configurator.getXParm("properties/RESULT_YAMLBODY_FILE_PATH2"));
-				 	 //bodyFile2.prettyPrint();
-	
-			// validate
-			String hc = headerFile.getContent();
-			succeeds = succeeds && YamlFile.validate(hc);
-			succeeds = succeeds && bodyFile.toYaml(yamlFile);
-			String bc = yamlFile.getContent();
-			
-			// in all cases copy results to app folder
-			yamlFile.setContent(hc + "\n" + bc);
-			
-			// convert for debug purposes the Yaml file generated in line 111 to a Json-mapping file.
-			JsonFile headerJSONFile = new JsonFile(configurator.getXParm("properties/RESULT_YAML_4_HEADER_FILE_PATH2"));
-			XmlFile jsonXmlMappingFile4header = new XmlFile(configurator.getXParm("properties/RESULT_JSONMAPPING_4_JSONHEADER_FILE_PATH"));
-			
-			headerFile.toJson(headerJSONFile);
-			headerJSONFile.toXml(jsonXmlMappingFile4header);
-		
-			//String schemaName = configurator.getXParm("appinfo/OpenAPI-schema-name");
-		
-			// copy to the app folder
-			AnyFile appYamlFile = new AnyFile(yamlFolder,"openapi.yaml");
-			AnyFile appJsonFile = new AnyFile(yamlFolder,"openapi.json");
-			AnyFile appJson2File = new AnyFile(yamlFolder,"openapi_draft04.json");
-			yamlFile.copyFile(appYamlFile);
-			bodyFile.copyFile(appJsonFile);
-			bodyFile2.copyFile(appJson2File);
-		} 
-		// pretty print and store to json folder
+		// This is the code for generating yaml and json schema's
 		if (succeeds) {
 
-			AnyFolder appFolder = new AnyFolder(configurator.getXParm("system/work-app-folder-path"));
-
 			// convert the json xml to Json without schema reference and than to yaml.
 			XmlFile xmlMappingFileBody = new XmlFile(configurator.getXParm("properties/RESULT_JSONMAPPING_4_BODY_FILE_PATH"));
 			JsonFile jsonFileBody = new JsonFile(configurator.getXParm("properties/RESULT_JSON_4_BODY_FILE_PATH"));
@@ -182,12 +141,6 @@ public boolean generateKING() throws Exception {
 			xmlMappingFileHeader.toJson(jsonFileHeader);
 			jsonFileHeader.toYaml(yamlFileHeader);
 
-			// convert for debug purposes the Json file generated in line 112 to a Json-mapping file.
-			JsonFile jsonbodyFile = new JsonFile(configurator.getXParm("properties/RESULT_YAMLBODY_FILE_PATH"));
-			XmlFile xmlMappingFileBody3 = new XmlFile(configurator.getXParm("properties/RESULT_JSONMAPPING_4_BODY_FILE_PATH3"));
-
-			jsonbodyFile.toXml(xmlMappingFileBody3);
-			
 			// validate
 			String hc = yamlFileHeader.getContent();
 			String bc = yamlFileBody.getContent();
@@ -197,12 +150,10 @@ public boolean generateKING() throws Exception {
 			// concatenate the yamlbody to the yamlheader
 			yamlFile.setContent(hc + "\n" + bc);			
 
-			//String schemaName = configurator.getXParm("appinfo/OpenAPI-schema-name");
-
 			// copy to the imvert folder !!! Must be changed to the app folder in future
-			AnyFile appYamlFile = new AnyFile(appFolder,"openapi-test.yaml");
-			AnyFile appJsonFile = new AnyFile(appFolder,"openapi-test.json");
-			AnyFile appJson2File = new AnyFile(appFolder,"openapi_draft04-test.json");
+			AnyFile appYamlFile = new AnyFile(yamlFolder,"openapi.yaml");
+			AnyFile appJsonFile = new AnyFile(yamlFolder,"openapi.json");
+			AnyFile appJson2File = new AnyFile(yamlFolder,"openapi_draft04.json");
 			yamlFile.copyFile(appYamlFile);
 			jsonFileBody.copyFile(appJsonFile);
 			jsonFileBody2.copyFile(appJson2File);

src/main/java/nl/imvertor/YamlCompiler/YamlCompiler.java

@@ -250,6 +250,10 @@ public AnyFolder getBaseFolder() {
 	public AnyFolder getWorkFolder() {
 		return workFolder;
 	}
+	
+	public AnyFolder getInputFolder() {
+		return inputFolder;
+	}
 
 	public AnyFolder getWorkFolder(String subfolderName) {
 		return new AnyFolder(workFolder,subfolderName);
@@ -1040,7 +1044,7 @@ private void loadFromPropertyFile(String filePath) throws Exception {
 			String optionName = e.nextElement().toString();
 			String value = properties.getProperty(optionName);
 			// process file properties in context of the current file
-			if (optionName.equals("umlfile") | optionName.equals("zipfile") | optionName.equals("hisfile")) {
+			if (optionName.equals("umlfile") | optionName.equals("zipfile") | optionName.equals("hisfile") | optionName.equals("documentorfile")) {
 				File parent = (new File(filePath)).getParentFile();
 				if (AnyFile.isAbsolutePath(value))
 					value = (new File(value)).getCanonicalPath();

src/main/java/nl/imvertor/common/Configurator.java

@@ -23,6 +23,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 
 import net.sf.saxon.event.PipelineConfiguration;
@@ -173,7 +174,14 @@ public void writeMsg(String src, String type, String name, String text, String i
 						cfg.addProperty("messages/message[" + messageIndex + "]/steptext", m.group(3));
 					}
 					if (id != null) cfg.addProperty("messages/message[" + messageIndex + "]/id", id);
-					cfg.addProperty("messages/message[" + messageIndex + "]/wiki", (wiki != null) ? wiki : "NOWIKI");
+					
+					// bepaal of de wiki message apart moet worden afgehandeld. Dat is bijv. #XERCES-s4s-att-invalid-value
+					if (wiki == null) 
+						wiki = "NOWIKI";
+					else if (wiki.startsWith("#")) {
+						wiki = StringUtils.split(wiki.substring(1),'-')[0]; 
+					}
+					cfg.addProperty("messages/message[" + messageIndex + "]/wiki", wiki);
 				}
 			}
 		}

src/main/java/nl/imvertor/common/Messenger.java

@@ -66,8 +66,8 @@ public AnyFolder(File parent, String filename) {
 	}
 
 	/**
-	 * Create a copy of this folder within the target folder. 
-	 * Example /a -> /b creates : /b/a/*
+	 * Create a copy of the files in this folder within the target folder. 
+	 * Example /a/m -> /b creates : /b/m/*
 	 * 
 	 * @param targetFolder
 	 * @throws Exception
@@ -109,6 +109,20 @@ public void copy(String targetFolderPath) throws Exception {
 		copy(new AnyFolder(targetFolderPath),true);
 	}
 
+	/**
+	 * Copy this folder as a new subfolder within target folder, under the source folder name.
+	 * Overwrite any existing files/folders.
+	 * 
+	 *  Example /a -> /b creates : /b/a
+	 * 
+	 * @param targetFolderPath
+	 * @throws Exception
+	 */
+	public void copyFolder(AnyFolder targetFolder) throws Exception {
+		targetFolder = new AnyFolder(targetFolder.getCanonicalPath() + "/" + getName());
+		FileUtils.copyDirectory(this, targetFolder);
+	}
+
 	public boolean hasFile(String filename) throws IOException {
 		if (!this.exists() || this.isFile()) return false;
 		return (new File(this.getCanonicalPath() + File.separator + filename)).isFile(); 

src/main/java/nl/imvertor/common/file/AnyFolder.java

@@ -5,13 +5,15 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.NameValuePair;
@@ -220,13 +222,7 @@ public int getStatus() {
 		return status;
 	}
 	public String getResponseBody(HttpResponse response) throws Exception, IOException {
-		BufferedReader in = new BufferedReader(new InputStreamReader(response.getEntity().getContent()));
-		String inputLine;
-		StringBuffer responseText = new StringBuffer();
-		while ((inputLine = in.readLine()) != null)
-			responseText.append(inputLine);
-		in.close();
-		return responseText.toString();
+		return IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
 	}
 
 }

src/main/java/nl/imvertor/common/file/HttpFile.java

@@ -90,10 +90,10 @@ public void parse(Configurator configurator) throws Exception {
 			 } else if (ext.equals("yml")) {
 
 				 // TODO
-				 configurator.getRunner().error(logger,"Not a supported RDF file extension: " + ext,null,"rdf-uns","some-wiki-ref");
+				 configurator.getRunner().error(logger,"Not a supported RDF file extension: \"" + ext + "\"",null,"rdf-uns","RDF-NASRFE1");
 
 			 } else 
-				configurator.getRunner().fatal(logger,"Not a known RDF file extension: " + ext,null,"rdf-unk","some-wiki-ref");
+				configurator.getRunner().fatal(logger,"Not a known RDF file extension: \"" + ext + "\"",null,"rdf-unk","RDF-NAKRFE1");
 
 			 isOpen = true;
 		} else {

src/main/java/nl/imvertor/common/file/RdfFile.java

@@ -113,14 +113,14 @@ public void parse(Configurator configurator, String ttlDataFilePath) throws Exce
 	            } catch (RepositoryException exception) {
 	                Throwable cause = exception.getCause();
 	                if (cause instanceof ValidationException) {
-	                	runner.error(logger, "Shacl validator reports RDF error: " + exception.getMessage());
+	                	runner.error(logger, "Shacl validator reports RDF error: \"" + exception.getMessage() + "\"","shacl-parse","SHACL-SVRRE1");
 	                } else 
 	                    throw exception;
 	            }
             }
 
 		} catch (Exception e) {
-			runner.warn(logger, "Shacl validator schema file \"" + getName() + "\" invalid, cannot validate RDF. " + e.getMessage(),"rdf-parse","some-wiki-ref");
+			runner.warn(logger, "Shacl validator schema file \"" + getName() + "\" invalid, cannot validate RDF: \"" + e.getMessage() + "\"","rdf-parse","SHACL-SVSF1ICVR2");
 		}
 
 	}