Javassist for Classes.sortDeclarativeOrder

jsonx-org · Sep 16, 2023 · c84b46e · c84b46e
1 parent 4091abe
commit c84b46e
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 4 deletions.
diff --git a/binding/src/main/java/org/jsonx/JxEncoder.java b/binding/src/main/java/org/jsonx/JxEncoder.java
@@ -365,7 +365,11 @@ public boolean test(final Method method) {
 
     @Override
     void beforePut(final Method[] methods) {
-      Classes.sortDeclarativeOrder(methods);
+      try {
+        Classes.sortDeclarativeOrder(methods, true);
+      }
+      catch (final ClassNotFoundException e) {
+      }
     }
   };
 

diff --git a/generator/src/main/java/org/jsonx/ObjectModel.java b/generator/src/main/java/org/jsonx/ObjectModel.java
@@ -462,7 +462,12 @@ public boolean test(final Method method) {
 
     @Override
     void beforePut(final Method[] methods) {
-      Classes.sortDeclarativeOrder(methods);
+      try {
+        Classes.sortDeclarativeOrder(methods, true);
+      }
+      catch (final ClassNotFoundException e) {
+        System.err.println("Cannot sort methods in declarative order because Javassist is not present on the system classpath");
+      }
     }
   };
 

diff --git a/jsonx-maven-plugin/src/test/java/org/jsonx/ClassTrial.java b/jsonx-maven-plugin/src/test/java/org/jsonx/ClassTrial.java
@@ -49,7 +49,12 @@ public boolean test(final Method method) {
 
     @Override
     void beforePut(final Method[] methods) {
-      Classes.sortDeclarativeOrder(methods);
+      try {
+        Classes.sortDeclarativeOrder(methods, true);
+      }
+      catch (final ClassNotFoundException e) {
+        throw new RuntimeException(e);
+      }
     }
   };
 

diff --git a/jsonx-maven-plugin/src/test/java/org/jsonx/ObjectTrial.java b/jsonx-maven-plugin/src/test/java/org/jsonx/ObjectTrial.java
@@ -41,7 +41,12 @@ public boolean test(final Method method) {
 
     @Override
     void beforePut(final Method[] methods) {
-      Classes.sortDeclarativeOrder(methods);
+      try {
+        Classes.sortDeclarativeOrder(methods, true);
+      }
+      catch (final ClassNotFoundException e) {
+        throw new RuntimeException(e);
+      }
     }
   };
 

diff --git a/pom.xml b/pom.xml
@@ -101,5 +101,11 @@
       <version>0.7.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.javassist</groupId>
+      <artifactId>javassist</artifactId>
+      <version>3.29.2-GA</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>