[63] For Codewind projects, use a subset of all server generators (#68)

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

Author: keithchong

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

@@ -19,6 +19,7 @@ public interface IOpenApiConstants {
 
 	public static final String CODEWIND_LANGUAGE = "language"; //$NON-NLS-1$
 	public static final String CODEWIND_PROJECT_NAME = "name"; //$NON-NLS-1$
+	public static final String CODEWIND_PROJECT_TYPE = "projectType"; //$NON-NLS-1$
 	public static final String CODEWIND_PROJECT_FULL_LOCAL_PATH = "fullLocalPath"; //$NON-NLS-1$
 	public static final String CODEWIND_PROJECT_LANGUAGE = "projectLanguage"; //$NON-NLS-1$
 	public static final String CODEWIND_GET_ID_METHOD = "getId"; //$NON-NLS-1$

dev/org.eclipse.codewind.openapi.core/src/org/eclipse/codewind/openapi/core/util/Util.java

@@ -29,7 +29,7 @@
 
 public class Util {
 
-	private static String UNKNOWN_LANGUAGE = "unknown"; //$NON-NLS-1$
+	private static String UNKNOWN_VALUE = "unknown"; //$NON-NLS-1$
 
 	public Util() {
 	}
@@ -52,7 +52,7 @@ public static String getProjectLanguage(IProject project) {
 				Object object = jobj.get(IOpenApiConstants.CODEWIND_LANGUAGE);
 				if (object != null) {
 					String lang = object.toString();
-					if (UNKNOWN_LANGUAGE.equals(lang)) {
+					if (UNKNOWN_VALUE.equals(lang)) {
 						lang = ""; //$NON-NLS-1$
 					}
 					return lang;
@@ -78,7 +78,7 @@ public static String getProjectLanguage(IProject project) {
 									Object object = jobj.get(IOpenApiConstants.CODEWIND_LANGUAGE);
 									if (object != null) {
 										String lang = object.toString();
-										if (UNKNOWN_LANGUAGE.equals(lang)) {
+										if (UNKNOWN_VALUE.equals(lang)) {
 											lang = ""; //$NON-NLS-1$
 										}
 										return lang;
@@ -133,7 +133,7 @@ public static String getProjectLanguage(Object obj) {
 
 			if (languageObject instanceof String) {
 				String language = (String)languageObject;
-				if (UNKNOWN_LANGUAGE.equals(language)) { //$NON-NLS-1$
+				if (UNKNOWN_VALUE.equals(language)) { //$NON-NLS-1$
 					language = ""; //$NON-NLS-1$
 				}
 				return language;
@@ -144,6 +144,33 @@ public static String getProjectLanguage(Object obj) {
 		return ""; //$NON-NLS-1$
 	}
 
+	/**
+	 * 
+	 * @param obj
+	 * @return a non-null string
+	 */
+	public static String getProjectTypeId(Object obj) {
+		Class<?> clazz = obj.getClass();
+		try {
+			Field field = clazz.getField(IOpenApiConstants.CODEWIND_PROJECT_TYPE);
+			Object projectTypeObject = field.get(obj);
+			Class<?> projectTypeClass = projectTypeObject.getClass();
+			Method getIdMethod = projectTypeClass.getMethod(IOpenApiConstants.CODEWIND_GET_ID_METHOD); //$NON-NLS-1$
+			Object typeObject = getIdMethod.invoke(projectTypeObject);
+			
+			if (typeObject instanceof String) {
+				String typeId = (String)typeObject;
+				if (UNKNOWN_VALUE.equals(typeId)) { //$NON-NLS-1$
+					typeId = ""; //$NON-NLS-1$
+				}
+				return typeId;
+			}
+		} catch (Exception e) {
+			Activator.log(IStatus.ERROR, e);
+		}
+		return ""; //$NON-NLS-1$
+	}
+	
 	public static IProject getProject(Object obj) {
 		Class<?> clazz = obj.getClass();
 		String projectName = null;

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

@@ -108,4 +108,15 @@ public static enum PROJECT_TYPE { MAVEN, NODEJS, GO, NOT_ASSESSED, UNKNOWN};
         {"Rust", "rust-server"},
         {"Scala", "scala-finch","scala-lagom-server", "scalatra"}
     };
+
+    public static String SPRING_SERVER = "spring";
+    public static String LIBERTY_AND_DOCKER_SERVER_GENERATORS[] = { // The supported/tested server generators for Liberty
+        "jaxrs-spec",
+        "jaxrs-cxf"
+    };
+
+    public static String SPRING_PROJECT_TYPE_ID = "spring";
+    public static String LIBERTY_PROJECT_TYPE_ID = "liberty";
+    public static String JAVA_DOCKER_PROJECT_TYPE_ID = "docker";
+
 }

dev/org.eclipse.codewind.openapi.ui/src/org/eclipse/codewind/openapi/ui/wizard/AbstractGenerateWizardPage.java

@@ -79,6 +79,7 @@ public abstract class AbstractGenerateWizardPage extends WizardPage {
 
 	protected boolean isCodewindProject = false;
 	protected String codewindProjectLanguage = ""; //$NON-NLS-1$
+	protected String codewindProjectTypeId = ""; //$NON-NLS-1$
 	protected String initialOutputFolder = null;
 
 	public AbstractGenerateWizardPage(String pageName) {
@@ -191,7 +192,6 @@ public void widgetSelected(SelectionEvent e) {
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan = 2;
 		languages.setLayoutData(gd);
-		languages.addModifyListener(e -> dialogChanged(e));
 
 		label = new Label(container, SWT.NULL);
 		label.setText(Messages.WIZARD_PAGE_GENERATOR_TYPE);
@@ -202,10 +202,11 @@ public void widgetSelected(SelectionEvent e) {
 		gd.horizontalSpan = 2;
 		generatorTypes.setToolTipText(Messages.WIZARD_PAGE_GENERATOR_TYPE_TOOLTIP);
 		generatorTypes.setLayoutData(gd);
-		generatorTypes.addModifyListener(e -> dialogChanged(e));
 
 		initialize();
 		dialogChanged(null);
+		languages.addModifyListener(e -> dialogChanged(e));
+		generatorTypes.addModifyListener(e -> dialogChanged(e));
 		setControl(container);
 	}
 
@@ -233,6 +234,11 @@ protected void determineProjectType() {
 					codewindProjectLanguage = possibleLanguage;
 				}
 				project = Util.getProject(obj);
+				
+				String possibleProjectTypeId = Util.getProjectTypeId(obj);
+				if (possibleProjectTypeId.length() > 0) {
+					this.codewindProjectTypeId = possibleProjectTypeId;
+				}
 			}
 		}
 

dev/org.eclipse.codewind.openapi.ui/src/org/eclipse/codewind/openapi/ui/wizard/GenerateServerWizardPage.java

@@ -28,17 +28,43 @@ public GenerateServerWizardPage(ISelection selection) {
 	@Override
 	protected void populateGeneratorTypesCombo(String language) {
 		generatorTypes.removeAll();
+		// For specific Codewind overrides, populate the combo here.
+
+		// Populate with all known generators
 		for (int i = 0; i < Constants.ALL_SERVER_LANGUAGES.length; i++) {
 			if (Constants.ALL_SERVER_LANGUAGES[i][0].equals(language)) {
 				for (int j = 1; j < Constants.ALL_SERVER_LANGUAGES[i].length; j++) {
 					generatorTypes.add(Constants.ALL_SERVER_LANGUAGES[i][j]);						
 				}
-				if (generatorTypes.getItemCount() > 0) {
-					generatorTypes.select(0);										
-				}
 				break;
 			}
-		}		
+		}
+
+		if (language == "Java") {
+			// Spring
+			if (isCodewindProject && this.codewindProjectTypeId.equals(Constants.SPRING_PROJECT_TYPE_ID)) {
+				if (generatorTypes.indexOf(Constants.SPRING_SERVER) >= 0) {
+					generatorTypes.remove(Constants.SPRING_SERVER);									
+				}
+				generatorTypes.add(Constants.SPRING_SERVER, 0); // Put it first
+			}
+
+			// For Liberty
+			if (isCodewindProject && this.codewindProjectTypeId.equals(Constants.LIBERTY_PROJECT_TYPE_ID) || this.codewindProjectTypeId.equals(Constants.JAVA_DOCKER_PROJECT_TYPE_ID)) {
+				int length = Constants.LIBERTY_AND_DOCKER_SERVER_GENERATORS.length;
+				for (int i = 0; i < length; i++) {
+					if (generatorTypes.indexOf(Constants.LIBERTY_AND_DOCKER_SERVER_GENERATORS[i]) >= 0) {
+						generatorTypes.remove(Constants.LIBERTY_AND_DOCKER_SERVER_GENERATORS[i]);									
+					}
+				}
+				for (int i = length - 1; i >= 0; i--) {
+					generatorTypes.add(Constants.LIBERTY_AND_DOCKER_SERVER_GENERATORS[i], 0); // Put them at the top of the list						
+				}
+			}
+		}
+		if (generatorTypes.getItemCount() > 0) {
+			generatorTypes.select(0);										
+		}
 	}
 
 	@Override