Remove jsonschema2pojo-scalagen and remove targetLanguage support

Closes #1199
joelittlejohn · Feb 25, 2021 · a3d3934 · a3d3934
1 parent a6eb2fe
commit a3d3934
Show file tree

Hide file tree

Showing 157 changed files with 12 additions and 10,321 deletions.
diff --git a/jsonschema2pojo-ant/src/main/java/org/jsonschema2pojo/ant/Jsonschema2PojoTask.java b/jsonschema2pojo-ant/src/main/java/org/jsonschema2pojo/ant/Jsonschema2PojoTask.java
@@ -46,7 +46,6 @@
 import org.jsonschema2pojo.GenerationConfig;
 import org.jsonschema2pojo.InclusionLevel;
 import org.jsonschema2pojo.Jsonschema2Pojo;
-import org.jsonschema2pojo.Language;
 import org.jsonschema2pojo.NoopAnnotator;
 import org.jsonschema2pojo.RuleLogger;
 import org.jsonschema2pojo.SourceSortOrder;
@@ -192,8 +191,6 @@ public class Jsonschema2PojoTask extends Task implements GenerationConfig {
 
     private SourceSortOrder sourceSortOrder = SourceSortOrder.OS;
 
-    private Language targetLanguage = Language.JAVA;
-
     private Map<String, String> formatTypeMapping = new HashMap<>();
 
     /**
@@ -955,10 +952,6 @@ public void setSourceSortOrder(SourceSortOrder sourceSortOrder) {
         this.sourceSortOrder = sourceSortOrder;
     }
 
-    public void setTargetLanguage(Language targetLanguage) {
-        this.targetLanguage = targetLanguage;
-    }
-
     /**
      * Sets the 'useInnerClassBuilders' property of this class
      *
@@ -1305,11 +1298,6 @@ public SourceSortOrder getSourceSortOrder() {
         return sourceSortOrder;
     }
 
-    @Override
-    public Language getTargetLanguage() {
-        return targetLanguage;
-    }
-
     @Override
     public Map<String, String> getFormatTypeMapping() {
         return formatTypeMapping;

diff --git a/jsonschema2pojo-ant/src/site/Jsonschema2PojoTask.html b/jsonschema2pojo-ant/src/site/Jsonschema2PojoTask.html
@@ -433,18 +433,6 @@ <h3>Parameters</h3>
     </td>
     <td align="center" valign="top">No (default <code>JSONSCHEMA</code>)</td>
   </tr>
-  <tr>
-    <td valign="top">targetLanguage</td>
-    <td valign="top">The type of code that will be generated.
-      <p>
-        Supported values:
-      <ul>
-        <li><code>JAVA</code></li>
-        <li><code>SCALA</code></li>
-      </ul>
-    </td>
-    <td align="center" valign="top">No</td>
-  </tr>
   <tr>
     <td valign="top">targetPackage</td>
     <td valign="top">Package name used for generated Java classes (for types where a fully qualified

diff --git a/jsonschema2pojo-cli/src/main/java/org/jsonschema2pojo/cli/Arguments.java b/jsonschema2pojo-cli/src/main/java/org/jsonschema2pojo/cli/Arguments.java
@@ -32,7 +32,6 @@
 import org.jsonschema2pojo.Annotator;
 import org.jsonschema2pojo.GenerationConfig;
 import org.jsonschema2pojo.InclusionLevel;
-import org.jsonschema2pojo.Language;
 import org.jsonschema2pojo.NoopAnnotator;
 import org.jsonschema2pojo.SourceSortOrder;
 import org.jsonschema2pojo.SourceType;
@@ -236,9 +235,6 @@ public class Arguments implements GenerationConfig {
     @Parameter(names = { "-sso", "--source-sort-order" }, description = "The sort order to be applied to the source files.  Available options are: OS, FILES_FIRST or SUBDIRS_FIRST")
     private SourceSortOrder sourceSortOrder = SourceSortOrder.OS;
 
-    @Parameter(names = { "-tl", "--target-language" }, description = "The type of code that will be generated.  Available options are: JAVA or SCALA")
-    private Language targetLanguage = Language.JAVA;
-
     @Parameter(names = { "-ftm", "--format-type-mapping" }, description = "Mapping from format identifier to type: <format>:<fully.qualified.Type>.", variableArity = true)
     private List<String> formatTypeMapping = new ArrayList<>();
 
@@ -597,11 +593,6 @@ public SourceSortOrder getSourceSortOrder() {
         return sourceSortOrder;
     }
 
-    @Override
-    public Language getTargetLanguage() {
-        return targetLanguage;
-    }
-
     @Override
     public Map<String, String> getFormatTypeMapping() {
         return formatTypeMapping

diff --git a/jsonschema2pojo-core/pom.xml b/jsonschema2pojo-core/pom.xml
@@ -13,11 +13,6 @@
     <name>jsonschema2pojo-core</name>
 
     <dependencies>
-        <dependency>
-            <groupId>org.jsonschema2pojo</groupId>
-            <artifactId>jsonschema2pojo-scalagen</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
@@ -26,10 +21,6 @@
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.scala-lang</groupId>
-            <artifactId>scala-library</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.google.code.javaparser</groupId>
             <artifactId>javaparser</artifactId>
@@ -82,6 +73,10 @@
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>

diff --git a/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/DefaultGenerationConfig.java b/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/DefaultGenerationConfig.java
@@ -457,14 +457,6 @@ public SourceSortOrder getSourceSortOrder() {
         return SourceSortOrder.OS;
     }
 
-    /**
-     * @return {@link Language#JAVA}
-     */
-    @Override
-    public Language getTargetLanguage() {
-        return Language.JAVA;
-    }
-
     /**
      * @return {@link Collections#emptyMap}
      */

diff --git a/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/GenerationConfig.java b/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/GenerationConfig.java
@@ -594,19 +594,6 @@ public interface GenerationConfig {
    */
   SourceSortOrder getSourceSortOrder();
 
-  /**
-   * Gets the 'targetLanguage' configuration option.
-   *
-   * @return The type of code that will be generated.
-   *         <p>
-   *         Supported values:
-   *         <ul>
-   *         <li><code>JAVA</code> (Generate .java source files)</li>
-   *         <li><code>SCALA</code> (Generate .scala source files, using scalagen)</li>
-   *         </ul>
-   */
-  Language getTargetLanguage();
-
   /**
    * Gets the 'formatTypeMapping' configuration option.
    *

diff --git a/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/Jsonschema2Pojo.java b/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/Jsonschema2Pojo.java
@@ -81,15 +81,9 @@ public static void generate(GenerationConfig config, RuleLogger logger) throws I
         }
 
         if (config.getTargetDirectory().exists() || config.getTargetDirectory().mkdirs()) {
-            if (config.getTargetLanguage() == Language.SCALA) {
-                CodeWriter sourcesWriter = new ScalaFileCodeWriter(config.getTargetDirectory(), config.getOutputEncoding());
-                CodeWriter resourcesWriter = new FileCodeWriterWithEncoding(config.getTargetDirectory(), config.getOutputEncoding());
-                codeModel.build(sourcesWriter, resourcesWriter);
-            } else {
-                CodeWriter sourcesWriter = new FileCodeWriterWithEncoding(config.getTargetDirectory(), config.getOutputEncoding());
-                CodeWriter resourcesWriter = new FileCodeWriterWithEncoding(config.getTargetDirectory(), config.getOutputEncoding());
-                codeModel.build(sourcesWriter, resourcesWriter);
-            }
+            CodeWriter sourcesWriter = new FileCodeWriterWithEncoding(config.getTargetDirectory(), config.getOutputEncoding());
+            CodeWriter resourcesWriter = new FileCodeWriterWithEncoding(config.getTargetDirectory(), config.getOutputEncoding());
+            codeModel.build(sourcesWriter, resourcesWriter);
         } else {
             throw new GenerationException("Could not create or access target directory " + config.getTargetDirectory().getAbsolutePath());
         }

diff --git a/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/Language.java b/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/Language.java
diff --git a/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/ScalaFileCodeWriter.java b/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/ScalaFileCodeWriter.java
diff --git a/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/ScalaSingleStreamCodeWriter.java b/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/ScalaSingleStreamCodeWriter.java
diff --git a/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/ScalaZipCodeWriter.java b/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/ScalaZipCodeWriter.java
diff --git a/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/DefaultRule.java b/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/DefaultRule.java
@@ -45,7 +45,6 @@
 import com.sun.codemodel.JFieldVar;
 import com.sun.codemodel.JInvocation;
 import com.sun.codemodel.JType;
-import scala.annotation.meta.field;
 
 /**
  * Applies the "default" schema rule.

diff --git a/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/ValidRule.java b/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/ValidRule.java
@@ -21,7 +21,6 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import org.jsonschema2pojo.Schema;
 import com.sun.codemodel.JFieldVar;
-import scala.annotation.meta.field;
 
 public class ValidRule implements Rule<JFieldVar, JFieldVar> {