[82] Update to 4.2.0 to pick up node-express-server generator (#83)

Signed-off-by: Keith Chong <kchong@ca.ibm.com>

Author: keithchong

dev/buildAll.gradle

@@ -74,7 +74,7 @@ def artifactsFolder = file(projDir + '/' + project.properties['ant.artifacts.fol
 def corelibFolder = file(projDir + project.properties['codewind.core.prereqlib.folder'])
 def excludeJson = "json-20090211.jar"
 def jsonFile = file(projDir + project.properties['codewind.core.prereqlib.folder'] + '/org.json_1.0.0.v201011060100.jar')
-def openApiCliFile = file(projDir + project.properties['codewind.core.prereqlib.folder'] + '/openapi-generator-cli-4.0.1.jar')
+def openApiCliFile = file(projDir + project.properties['codewind.core.prereqlib.folder'] + '/openapi-generator-cli-4.2.2.jar')
 
 def filePrefix = "codewind-openapi-eclipse"
 
@@ -109,7 +109,7 @@ task downloadJson(type: Download) {
 
 task downloadOpenApiCli(type: Download) {
     println("Downloading OpenAPI Cli jar")
-    sourceUrl = 'http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.0.1/openapi-generator-cli-4.0.1.jar'
+    sourceUrl = 'http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.2.2/openapi-generator-cli-4.2.2.jar'
     target = openApiCliFile
 }
 

dev/org.eclipse.codewind.openapi.core/.classpath

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/openapi-generator-cli-4.0.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/org.json_1.0.0.v201011060100.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

dev/org.eclipse.codewind.openapi.core/META-INF/MANIFEST.MF

@@ -17,7 +17,6 @@ Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-ClassPath: .,
- lib/openapi-generator-cli-4.0.1.jar,
  lib/org.json_1.0.0.v201011060100.jar
 Export-Package: org.eclipse.codewind.openapi.core,
  org.eclipse.codewind.openapi.core.commands;x-friends:="org.eclipse.codewind.openapi.ui",

dev/org.eclipse.codewind.openapi.core/src/org/eclipse/codewind/openapi/core/IOpenApiConstants.java

@@ -15,7 +15,7 @@
 public interface IOpenApiConstants {
 
 	public static final String OPENAPI_CLI_OVERRIDE_PROPERTY = "org.eclipse.codewind.openapi.cli.jar.path"; //$NON-NLS-1$
-	public static final String CODEGEN_JAR_401 = "openapi-generator-cli-4.0.1.jar";	//$NON-NLS-1$
+	public static final String CODEGEN_JAR = "openapi-generator-cli-4.2.2.jar"; //$NON-NLS-1$
 
 	public static final String CODEWIND_LANGUAGE = "language"; //$NON-NLS-1$
 	public static final String CODEWIND_PROJECT_NAME = "name"; //$NON-NLS-1$

dev/org.eclipse.codewind.openapi.test/src/org/eclipse/codewind/openapi/test/server/nodejs/NodeJsServerTest.java

@@ -23,7 +23,7 @@ public NodeJsServerTest() {
 		newProjectName = "NodejsServerProject";
 		targetOutputFolder = "/NodejsServerProject";
 		language = "Node.js";
-		generatorType = "nodejs-server";
+		generatorType = "nodejs-express-server";
 		sourceDefinition = Constants.PETSTORE_30;
 		targetDefinitionInProject = "a/b/c/mypetstore.yaml";
 	}
@@ -39,8 +39,8 @@ protected void verify() {
 		verifyGeneratedFile("README.md");
 		verifyGeneratedFile("index.js");
 		verifyGeneratedFile("api/openapi.yaml");
-		verifyGeneratedFile("controllers/Pets.js");
-		verifyGeneratedFile("service/PetsService.js");
-		verifyGeneratedFile("utils/writer.js");
+		verifyGeneratedFile("controllers/PetsController.js");
+		verifyGeneratedFile("services/PetsService.js");
+		verifyGeneratedFile("utils/openapiRouter.js");
 	}
 }

dev/org.eclipse.codewind.openapi.ui/src/org/eclipse/codewind/openapi/ui/Constants.java

@@ -93,7 +93,7 @@ public static enum PROJECT_TYPE { MAVEN, NODEJS, GO, NOT_ASSESSED, UNKNOWN};
             "jaxrs-resteasy",
             "jaxrs-resteasy-eap",
             "spring"},
-        {"Node.js", "nodejs-server"},
+        {"Node.js", "nodejs-express-server", "nodejs-server-deprecated"},
         {"Python", "python-flask"},
         {"Swift", ""},
         {"Ada", "ada-server"},

dev/org.eclipse.codewind.openapi.ui/src/org/eclipse/codewind/openapi/ui/commands/AbstractOpenApiGeneratorCommand.java

@@ -145,13 +145,13 @@ protected IStatus commonSetup(IProgressMonitor monitor) {
 		}
 
 		String jarOverride = System.getProperty(IOpenApiConstants.OPENAPI_CLI_OVERRIDE_PROPERTY);
-		// eg. -Dorg.eclipse.codewind.openapi.cli.jar.path=/Users/foo/openapi/openapi-generator-cli-4.0.0.jar
+		// eg. -Dorg.eclipse.codewind.openapi.cli.jar.path=/Users/foo/openapi/openapi-generator-cli-x.y.z.jar
 		// Allow users to override and provide their own codegen jar
 		if (jarOverride != null && jarOverride.contains("openapi-generator-cli")) {
 			codegenJar = argSurround + jarOverride + argSurround;
 		} else {
 			// else, use as default, the codegen jar that we bundle
-			codegenJar = argSurround + pluginLocation + "lib/" + IOpenApiConstants.CODEGEN_JAR_401 + argSurround; //$NON-NLS-1$		
+			codegenJar = argSurround + pluginLocation + "lib/" + IOpenApiConstants.CODEGEN_JAR + argSurround; //$NON-NLS-1$		
 		}
 
 		if (isWindows) {