drop support for java 7

carueda · Aug 23, 2024 · 110526b · 110526b
1 parent b3de1b5
commit 110526b
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 - 1.1.0 (unreleased)
     - dropped support for scala 2.12
+    - dropped support for java 7.
 
 - maintenance:
     - dependency updates, more cross-builds, expanded ci; cleanup most compile warnings.

diff --git a/README.md b/README.md
@@ -199,12 +199,10 @@ Options (default):
   --cn <className>                                       (ExampleCfg)
   --dd <destDir>                                         (/tmp if existing or OS dependent temp dir)
   --java                generate java code               (the default)
-  --j7                  generate code for java <= 7      (>= 8)
   --java:getters        generate getters (see #31)       (false)
   --java:records        generate records                 (false)
   --java:optionals      use optionals                    (false)
   --scala               generate scala code              (java)
-  --scala:2.12          generate code for scala 2.12     (2.13)
   --scala:bt            use backticks (see #30)          (false)
   --durations           use java.time.Duration           (false)
   --all-required        assume all properties are required (see #47)

diff --git a/src/main/scala/tscfg/Main.scala b/src/main/scala/tscfg/Main.scala
@@ -36,7 +36,6 @@ object Main {
        |  --cn <className>                                       (${defaultGenOpts.className})
        |  --dd <destDir>                                         ($defaultDestDir)
        |  --java                generate java code               (the default)
-       |  --j7                  generate code for java <= 7      (8)
        |  --java:getters        generate getters (see #31)       (false)
        |  --java:records        generate records                 (false)
        |  --java:optionals      use optionals                    (false)
@@ -59,7 +58,6 @@ object Main {
       className: String = defaultGenOpts.className,
       destDir: String = defaultDestDir,
       assumeAllRequired: Boolean = false,
-      j7: Boolean = false,
       language: String = "java",
       useBackticks: Boolean = false,
       genGetters: Boolean = false,
@@ -126,9 +124,6 @@ object Main {
         case "--all-required" :: rest =>
           traverseList(rest, opts.copy(assumeAllRequired = true))
 
-        case "--j7" :: rest =>
-          traverseList(rest, opts.copy(j7 = true))
-
         case "--scala" :: rest =>
           traverseList(rest, opts.copy(language = "scala"))
 
@@ -203,7 +198,6 @@ object Main {
       opts.packageName,
       opts.className,
       assumeAllRequired = opts.assumeAllRequired,
-      j7 = opts.j7,
       useBackticks = opts.useBackticks,
       genGetters = opts.genGetters,
       genRecords = opts.genRecords,

diff --git a/src/main/scala/tscfg/generators/Generator.scala b/src/main/scala/tscfg/generators/Generator.scala
@@ -11,8 +11,8 @@ abstract class Generator(genOpts: GenOpts) {
 
   def generate(objectType: ObjectType): GenResult
 
-  protected val className: String = genOpts.className
-  protected val hasPath: String = if (genOpts.j7) "hasPath" else "hasPathOrNull"
+  protected val className: String     = genOpts.className
+  protected val hasPath: String       = "hasPathOrNull"
   protected var genResults: GenResult = GenResult()
 
   // allows to insert special marks in generated code to facilitate debugging.
@@ -28,7 +28,6 @@ case class GenOpts(
     packageName: String,
     className: String,
     assumeAllRequired: Boolean = false,
-    j7: Boolean = false,
     useBackticks: Boolean = false,
     genGetters: Boolean = false,
     genRecords: Boolean = false,

diff --git a/src/main/scala/tscfg/generators/java/JavaGen.scala b/src/main/scala/tscfg/generators/java/JavaGen.scala
@@ -638,7 +638,6 @@ object JavaGen {
   def generate(
       filename: String,
       showOut: Boolean = false,
-      j7: Boolean = false,
       assumeAllRequired: Boolean = false,
       genGetters: Boolean = false,
       genRecords: Boolean = false,
@@ -680,7 +679,6 @@ object JavaGen {
     val genOpts = GenOpts(
       "tscfg.example",
       className,
-      j7 = j7,
       genGetters = genGetters,
       genRecords = genRecords,
       useOptionals = useOptionals,

diff --git a/src/main/scala/tscfg/generators/scala/ScalaGen.scala b/src/main/scala/tscfg/generators/scala/ScalaGen.scala
@@ -474,7 +474,6 @@ object ScalaGen {
   // $COVERAGE-OFF$
   def generate(
       filename: String,
-      j7: Boolean = false,
       assumeAllRequired: Boolean = false,
       showOut: Boolean = false,
       useDurations: Boolean = false,
@@ -521,7 +520,6 @@ object ScalaGen {
     val genOpts = GenOpts(
       "tscfg.example",
       className,
-      j7 = j7,
       useBackticks = useBackticks,
       useDurations = useDurations,
     )

diff --git a/src/test/scala/tscfg/generators/java/JavaMainSpec.scala b/src/test/scala/tscfg/generators/java/JavaMainSpec.scala
@@ -540,7 +540,7 @@ class JavaMainSpec extends AnyWordSpec {
 
   "(java) given class name starting with $_" should {
     "generate warning" in {
-      val genOpts = GenOpts("tscfg.example", "Classy", j7 = true)
+      val genOpts = GenOpts("tscfg.example", "Classy")
       val r       = new JavaGen(genOpts).generate(ObjectType())
       assert(r.classNames === Set("Classy"))
       assert(r.fields === Map())
@@ -557,7 +557,7 @@ class JavaMainSpec extends AnyWordSpec {
     )
 
     "generate warnings" in {
-      val genOpts = GenOpts("tscfg.example", "Classy", j7 = true)
+      val genOpts = GenOpts("tscfg.example", "Classy")
       val r       = new JavaGen(genOpts).generate(objectType)
       assert(r.classNames === Set("Classy", "Other"))
       assert(

diff --git a/src/test/scala/tscfg/generators/scala/ScalaMainSpec.scala b/src/test/scala/tscfg/generators/scala/ScalaMainSpec.scala
@@ -492,7 +492,7 @@ class ScalaMainSpec extends AnyWordSpec {
 
   "(scala) given class name starting with $_" should {
     "generate warning" in {
-      val genOpts = GenOpts("tscfg.example", "Classy", j7 = true)
+      val genOpts = GenOpts("tscfg.example", "Classy")
       val r       = new ScalaGen(genOpts).generate(ObjectType())
       assert(r.classNames === Set("Classy"))
       assert(r.fields === Map())
@@ -509,7 +509,7 @@ class ScalaMainSpec extends AnyWordSpec {
     )
 
     "generate warnings" in {
-      val genOpts = GenOpts("tscfg.example", "Classy", j7 = true)
+      val genOpts = GenOpts("tscfg.example", "Classy")
       val r       = new ScalaGen(genOpts).generate(objectType)
 
       assert(r.classNames === Set("Classy", "Other"))