Merge pull request #636 from xuwei-k/CaseClassTooLong

deprecate `CaseClassTooLong` exception
eed3si9n · Oct 9, 2023 · 78efad2 · 78efad2
2 parents 8afcaae + 5fb2c47
commit 78efad2
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 9 deletions.
diff --git a/cli/src/main/scala/scalaxb/compiler/Main.scala b/cli/src/main/scala/scalaxb/compiler/Main.scala
@@ -40,8 +40,6 @@ object Main {
     catch {
       case e: ReferenceNotFound =>
         log.error(e.getMessage)
-      case e: CaseClassTooLong =>
-        log.error(e.getMessage)
       case e: Exception =>
         log.error(e.getStackTrace.mkString("", Module.NL, Module.NL))
     }

diff --git a/cli/src/main/scala/scalaxb/compiler/Module.scala b/cli/src/main/scala/scalaxb/compiler/Module.scala
@@ -540,6 +540,7 @@ class ReferenceNotFound(kind: String, namespace: Option[String], name: String) e
   "Error: Referenced " + kind + " " +
     (namespace map { "{" + _ + "}" } getOrElse {"(unqualified) "}) + name + " was not found.")
 
+@deprecated(message = "will be removed")
 class CaseClassTooLong(fqn: String, xmlname: String) extends RuntimeException(
   s"""Error: A case class with > 22 parameters cannot be created for ${fqn}. Consider using --wrap-contents "${xmlname}" option."""
 )
diff --git a/cli/src/main/scala/scalaxb/compiler/SbtApp.scala b/cli/src/main/scala/scalaxb/compiler/SbtApp.scala
@@ -12,9 +12,6 @@ class SbtApp extends xsbti.AppMain {
       case e: ReferenceNotFound =>
         logger.error(e.getMessage)
         Exit(1)
-      case e: CaseClassTooLong =>
-        logger.error(e.getMessage)
-        Exit(1)
       case e: Exception =>
         logger.error(e.getStackTrace.mkString("", Module.NL, Module.NL))
         Exit(1)

diff --git a/cli/src/main/scala/scalaxb/compiler/xsd/GenSource.scala b/cli/src/main/scala/scalaxb/compiler/xsd/GenSource.scala
@@ -22,7 +22,7 @@
 
 package scalaxb.compiler.xsd
 
-import scalaxb.compiler.{Config, Snippet, CaseClassTooLong, Log}
+import scalaxb.compiler.{Config, Snippet, Log}
 import scala.collection.mutable
 import scala.collection.{Map}
 import scala.xml._

diff --git a/mvn-scalaxb/src/main/java/org/scalaxb/maven/ScalaxbMojo.java b/mvn-scalaxb/src/main/java/org/scalaxb/maven/ScalaxbMojo.java
@@ -49,7 +49,6 @@
 
 import scala.Option;
 import scalaxb.compiler.Arguments;
-import scalaxb.compiler.CaseClassTooLong;
 import scalaxb.compiler.Module;
 import scalaxb.compiler.ReferenceNotFound;
 
@@ -159,8 +158,6 @@ private void invokeCompiler(Arguments args)
             context.refresh(getOutputDirectory());
         } catch (ReferenceNotFound ex) {
             throw new MojoFailureException(ex.getMessage(), ex);
-        } catch (CaseClassTooLong ex) {
-            throw new MojoFailureException(ex.getMessage(), ex);
         } catch (Exception ex) {
             throw new MojoExecutionException("Error running scalaxb", ex);
         }