rename and remove dead code

2016-06-14 17:37:33 +02:00
parent 1062fa467e
commit 027ff93ae4
64 changed files with 87 additions and 1281 deletions
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringMVCServerOptionsProvider.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringMVCServerOptionsProvider.java
@@ -1,32 +0,0 @@
-package io.swagger.codegen.options;
-
-import io.swagger.codegen.CodegenConstants;
-import io.swagger.codegen.languages.SpringMVCServerCodegen;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class SpringMVCServerOptionsProvider extends JavaOptionsProvider {
-    public static final String CONFIG_PACKAGE_VALUE = "configPackage";
-    public static final String LIBRARY_VALUE = "j8-async"; //FIXME hidding value from super class
-
-    @Override
-    public String getLanguage() {
-        return "spring-mvc";
-    }
-
-    @Override
-    public Map<String, String> createOptions() {
-        Map<String, String> options = new HashMap<String, String>(super.createOptions());
-        options.put(SpringMVCServerCodegen.CONFIG_PACKAGE, CONFIG_PACKAGE_VALUE);
-        options.put(CodegenConstants.LIBRARY, LIBRARY_VALUE);
-        options.put(SpringMVCServerCodegen.USE_RX_JAVA, "false");
-
-        return options;
-    }
-
-    @Override
-    public boolean isServer() {
-        return true;
-    }
-}
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringBootServerOptionsProvider.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringBootServerOptionsProvider.java
@@ -1,15 +1,15 @@
 package io.swagger.codegen.options;

 import io.swagger.codegen.CodegenConstants;
-import io.swagger.codegen.languages.SpringBootServerCodegen;
+import io.swagger.codegen.languages.SpringCodegen;

 import java.util.HashMap;
 import java.util.Map;

-public class SpringBootServerOptionsProvider extends JavaOptionsProvider {
+public class SpringOptionsProvider extends JavaOptionsProvider {
    public static final String CONFIG_PACKAGE_VALUE = "configPackage";
    public static final String BASE_PACKAGE_VALUE = "basePackage";
-    public static final String LIBRARY_VALUE = "j8-async"; //FIXME hidding value from super class
+    public static final String LIBRARY_VALUE = "spring-mvc"; //FIXME hidding value from super class
    public static final String INTERFACE_ONLY = "true";
    public static final String SINGLE_CONTENT_TYPES = "true";
    public static final String JAVA_8 = "true";
@@ -17,19 +17,19 @@ public class SpringBootServerOptionsProvider extends JavaOptionsProvider {

    @Override
    public String getLanguage() {
-        return "springboot";
+        return "spring";
    }

    @Override
    public Map<String, String> createOptions() {
        Map<String, String> options = new HashMap<String, String>(super.createOptions());
-        options.put(SpringBootServerCodegen.CONFIG_PACKAGE, CONFIG_PACKAGE_VALUE);
-        options.put(SpringBootServerCodegen.BASE_PACKAGE, BASE_PACKAGE_VALUE);
+        options.put(SpringCodegen.CONFIG_PACKAGE, CONFIG_PACKAGE_VALUE);
+        options.put(SpringCodegen.BASE_PACKAGE, BASE_PACKAGE_VALUE);
        options.put(CodegenConstants.LIBRARY, LIBRARY_VALUE);
-        options.put(SpringBootServerCodegen.INTERFACE_ONLY, INTERFACE_ONLY);
-        options.put(SpringBootServerCodegen.SINGLE_CONTENT_TYPES, SINGLE_CONTENT_TYPES);
-        options.put(SpringBootServerCodegen.JAVA_8, JAVA_8);
-        options.put(SpringBootServerCodegen.ASYNC, ASYNC);
+        options.put(SpringCodegen.INTERFACE_ONLY, INTERFACE_ONLY);
+        options.put(SpringCodegen.SINGLE_CONTENT_TYPES, SINGLE_CONTENT_TYPES);
+        options.put(SpringCodegen.JAVA_8, JAVA_8);
+        options.put(SpringCodegen.ASYNC, ASYNC);

        return options;
    }
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/spring/SpringOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/spring/SpringOptionsTest.java
@@ -0,0 +1,68 @@
+package io.swagger.codegen.spring;
+
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.java.JavaClientOptionsTest;
+import io.swagger.codegen.languages.SpringCodegen;
+import io.swagger.codegen.options.SpringOptionsProvider;
+
+import mockit.Expectations;
+import mockit.Tested;
+
+public class SpringOptionsTest extends JavaClientOptionsTest {
+
+    @Tested
+    private SpringCodegen clientCodegen;
+
+    public SpringOptionsTest() {
+        super(new SpringOptionsProvider());
+    }
+
+    @Override
+    protected CodegenConfig getCodegenConfig() {
+        return clientCodegen;
+    }
+
+    @SuppressWarnings("unused")
+    @Override
+    protected void setExpectations() {
+        new Expectations(clientCodegen) {{
+            clientCodegen.setModelPackage(SpringOptionsProvider.MODEL_PACKAGE_VALUE);
+            times = 1;
+            clientCodegen.setApiPackage(SpringOptionsProvider.API_PACKAGE_VALUE);
+            times = 1;
+            clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SpringOptionsProvider.SORT_PARAMS_VALUE));
+            times = 1;
+            clientCodegen.setInvokerPackage(SpringOptionsProvider.INVOKER_PACKAGE_VALUE);
+            times = 1;
+            clientCodegen.setGroupId(SpringOptionsProvider.GROUP_ID_VALUE);
+            times = 1;
+            clientCodegen.setArtifactId(SpringOptionsProvider.ARTIFACT_ID_VALUE);
+            times = 1;
+            clientCodegen.setArtifactVersion(SpringOptionsProvider.ARTIFACT_VERSION_VALUE);
+            times = 1;
+            clientCodegen.setSourceFolder(SpringOptionsProvider.SOURCE_FOLDER_VALUE);
+            times = 1;
+            clientCodegen.setLocalVariablePrefix(SpringOptionsProvider.LOCAL_PREFIX_VALUE);
+            times = 1;
+            clientCodegen.setSerializableModel(Boolean.valueOf(SpringOptionsProvider.SERIALIZABLE_MODEL_VALUE));
+            times = 1;
+            clientCodegen.setLibrary(SpringOptionsProvider.LIBRARY_VALUE);
+            times = 1;
+            clientCodegen.setFullJavaUtil(Boolean.valueOf(SpringOptionsProvider.FULL_JAVA_UTIL_VALUE));
+            times = 1;
+            clientCodegen.setConfigPackage(SpringOptionsProvider.CONFIG_PACKAGE_VALUE);
+            times = 1;
+            clientCodegen.setBasePackage(SpringOptionsProvider.BASE_PACKAGE_VALUE);
+            times = 1;
+            clientCodegen.setInterfaceOnly(Boolean.valueOf(SpringOptionsProvider.INTERFACE_ONLY));
+            times = 1;
+            clientCodegen.setSingleContentTypes(Boolean.valueOf(SpringOptionsProvider.SINGLE_CONTENT_TYPES));
+            times = 1;
+            clientCodegen.setJava8(Boolean.valueOf(SpringOptionsProvider.JAVA_8));
+            times = 1;
+            clientCodegen.setAsync(Boolean.valueOf(SpringOptionsProvider.ASYNC));
+            times = 1;
+
+        }};
+    }
+}
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/springboot/SpringBootServerOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/springboot/SpringBootServerOptionsTest.java
@@ -1,68 +0,0 @@
-package io.swagger.codegen.springboot;
-
-import io.swagger.codegen.AbstractOptionsTest;
-import io.swagger.codegen.CodegenConfig;
-import io.swagger.codegen.languages.SpringBootServerCodegen;
-import io.swagger.codegen.options.SpringBootServerOptionsProvider;
-
-import mockit.Expectations;
-import mockit.Tested;
-
-public class SpringBootServerOptionsTest extends AbstractOptionsTest {
-
-    @Tested
-    private SpringBootServerCodegen clientCodegen;
-
-    public SpringBootServerOptionsTest() {
-        super(new SpringBootServerOptionsProvider());
-    }
-
-    @Override
-    protected CodegenConfig getCodegenConfig() {
-        return clientCodegen;
-    }
-
-    @SuppressWarnings("unused")
-    @Override
-    protected void setExpectations() {
-        new Expectations(clientCodegen) {{
-            clientCodegen.setModelPackage(SpringBootServerOptionsProvider.MODEL_PACKAGE_VALUE);
-            times = 1;
-            clientCodegen.setApiPackage(SpringBootServerOptionsProvider.API_PACKAGE_VALUE);
-            times = 1;
-            clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SpringBootServerOptionsProvider.SORT_PARAMS_VALUE));
-            times = 1;
-            clientCodegen.setInvokerPackage(SpringBootServerOptionsProvider.INVOKER_PACKAGE_VALUE);
-            times = 1;
-            clientCodegen.setGroupId(SpringBootServerOptionsProvider.GROUP_ID_VALUE);
-            times = 1;
-            clientCodegen.setArtifactId(SpringBootServerOptionsProvider.ARTIFACT_ID_VALUE);
-            times = 1;
-            clientCodegen.setArtifactVersion(SpringBootServerOptionsProvider.ARTIFACT_VERSION_VALUE);
-            times = 1;
-            clientCodegen.setSourceFolder(SpringBootServerOptionsProvider.SOURCE_FOLDER_VALUE);
-            times = 1;
-            clientCodegen.setLocalVariablePrefix(SpringBootServerOptionsProvider.LOCAL_PREFIX_VALUE);
-            times = 1;
-            clientCodegen.setSerializableModel(Boolean.valueOf(SpringBootServerOptionsProvider.SERIALIZABLE_MODEL_VALUE));
-            times = 1;
-            clientCodegen.setLibrary(SpringBootServerOptionsProvider.LIBRARY_VALUE);
-            times = 1;
-            clientCodegen.setFullJavaUtil(Boolean.valueOf(SpringBootServerOptionsProvider.FULL_JAVA_UTIL_VALUE));
-            times = 1;
-            clientCodegen.setConfigPackage(SpringBootServerOptionsProvider.CONFIG_PACKAGE_VALUE);
-            times = 1;
-            clientCodegen.setBasePackage(SpringBootServerOptionsProvider.BASE_PACKAGE_VALUE);
-            times = 1;
-            clientCodegen.setInterfaceOnly(Boolean.valueOf(SpringBootServerOptionsProvider.INTERFACE_ONLY));
-            times = 1;
-            clientCodegen.setSingleContentTypes(Boolean.valueOf(SpringBootServerOptionsProvider.SINGLE_CONTENT_TYPES));
-            times = 1;
-            clientCodegen.setJava8(Boolean.valueOf(SpringBootServerOptionsProvider.JAVA_8));
-            times = 1;
-            clientCodegen.setAsync(Boolean.valueOf(SpringBootServerOptionsProvider.ASYNC));
-            times = 1;
-
-        }};
-    }
-}
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/springmvc/SpringMVCServerOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/springmvc/SpringMVCServerOptionsTest.java
@@ -1,58 +0,0 @@
-package io.swagger.codegen.springmvc;
-
-import io.swagger.codegen.AbstractOptionsTest;
-import io.swagger.codegen.CodegenConfig;
-import io.swagger.codegen.java.JavaClientOptionsTest;
-import io.swagger.codegen.languages.SpringMVCServerCodegen;
-import io.swagger.codegen.options.SpringMVCServerOptionsProvider;
-
-import mockit.Expectations;
-import mockit.Tested;
-
-public class SpringMVCServerOptionsTest extends AbstractOptionsTest {
-
-    @Tested
-    private SpringMVCServerCodegen clientCodegen;
-
-    public SpringMVCServerOptionsTest() {
-        super(new SpringMVCServerOptionsProvider());
-    }
-
-    @Override
-    protected CodegenConfig getCodegenConfig() {
-        return clientCodegen;
-    }
-
-    @SuppressWarnings("unused")
-    @Override
-    protected void setExpectations() {
-        new Expectations(clientCodegen) {{
-            clientCodegen.setModelPackage(SpringMVCServerOptionsProvider.MODEL_PACKAGE_VALUE);
-            times = 1;
-            clientCodegen.setApiPackage(SpringMVCServerOptionsProvider.API_PACKAGE_VALUE);
-            times = 1;
-            clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SpringMVCServerOptionsProvider.SORT_PARAMS_VALUE));
-            times = 1;
-            clientCodegen.setInvokerPackage(SpringMVCServerOptionsProvider.INVOKER_PACKAGE_VALUE);
-            times = 1;
-            clientCodegen.setGroupId(SpringMVCServerOptionsProvider.GROUP_ID_VALUE);
-            times = 1;
-            clientCodegen.setArtifactId(SpringMVCServerOptionsProvider.ARTIFACT_ID_VALUE);
-            times = 1;
-            clientCodegen.setArtifactVersion(SpringMVCServerOptionsProvider.ARTIFACT_VERSION_VALUE);
-            times = 1;
-            clientCodegen.setSourceFolder(SpringMVCServerOptionsProvider.SOURCE_FOLDER_VALUE);
-            times = 1;
-            clientCodegen.setLocalVariablePrefix(SpringMVCServerOptionsProvider.LOCAL_PREFIX_VALUE);
-            times = 1;
-            clientCodegen.setSerializableModel(Boolean.valueOf(SpringMVCServerOptionsProvider.SERIALIZABLE_MODEL_VALUE));
-            times = 1;
-            clientCodegen.setLibrary(SpringMVCServerOptionsProvider.LIBRARY_VALUE);
-            times = 1;
-            clientCodegen.setFullJavaUtil(Boolean.valueOf(SpringMVCServerOptionsProvider.FULL_JAVA_UTIL_VALUE));
-            times = 1;
-            clientCodegen.setConfigPackage(SpringMVCServerOptionsProvider.CONFIG_PACKAGE_VALUE);
-            times = 1;
-        }};
-    }
-}