ph-commons 11.1.5; Updated for Java 21

phax · Mar 28, 2024 · eb6d968 · eb6d968
1 parent 8ee2788
commit eb6d968
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 16 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -44,15 +44,15 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       # Override language selection by uncommenting this and choosing your languages
       # with:
       #   languages: go, javascript, csharp, python, cpp, java
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
diff --git a/README.md b/README.md
@@ -284,6 +284,9 @@ For further information on the Universal Business Language can be found on the f
 
 # News and noteworthy
 
+* v9.0.1 - 2024-03-28
+    * Updated to ph-commons 11.1.5
+    * Ensured Java 21 compatibility
 * v9.0.0 - 2024-03-04
     * Updated to UBL 2.4-CS01
     * Updated to eForms SDK 1.10.1

diff --git a/ph-ubl-dian/src/main/java/com/helger/dianubl/DianUBLMarshaller.java b/ph-ubl-dian/src/main/java/com/helger/dianubl/DianUBLMarshaller.java
@@ -68,7 +68,7 @@ public static ICommonsList <ClassPathResource> getAllXSDs (@Nullable final IComm
       // Inject DIAN stuff in the middle
       ret.addAll (DIAN_XSDS);
       // Add the root element last
-      ret.add (aList.getLast ());
+      ret.add (aList.getLastOrNull ());
       return ret;
     }
 

diff --git a/ph-ubl-dian/src/main/java/com/helger/dianubl/EDianUBLDocumentType.java b/ph-ubl-dian/src/main/java/com/helger/dianubl/EDianUBLDocumentType.java
@@ -63,7 +63,7 @@ private static ICommonsList <ClassPathResource> _injectSTS (@Nonnull final IComm
     ret.add (CUBL21.XSD_COMMON_AGGREGATE_COMPONENTS);
     ret.add (CDianUBL.XSD_DIAN_UBL_STRUCTURE);
     // Add the root element last
-    ret.add (aList.getLast ());
+    ret.add (aList.getLastOrNull ());
     return ret;
   }
 
@@ -76,7 +76,8 @@ private static ICommonsList <ClassPathResource> _injectSTS (@Nonnull final IComm
     m_aXSDs = eOther.getAllXSDResources ();
   }
 
-  EDianUBLDocumentType (@Nonnull final Class <?> aClass, @Nonnull @Nonempty final ICommonsList <ClassPathResource> aXSDPaths)
+  EDianUBLDocumentType (@Nonnull final Class <?> aClass,
+                        @Nonnull @Nonempty final ICommonsList <ClassPathResource> aXSDPaths)
   {
     m_aImplClass = aClass;
     m_aXSDs = aXSDPaths;

diff --git a/...l20/src/test/java/com/helger/ubl20/supplementary/tools/MainCreateUBL20MarshallerCode.java b/...l20/src/test/java/com/helger/ubl20/supplementary/tools/MainCreateUBL20MarshallerCode.java
@@ -28,7 +28,7 @@ public static void main (final String [] args)
 
     for (final EUBL20DocumentType e : EUBL20DocumentType.values ())
       appendMarshaller ("UBL20JAXBMarshaller",
-                        FilenameHelper.getWithoutPath (e.getAllXSDResources ().getLast ().getPath ()),
+                        FilenameHelper.getWithoutPath (e.getAllXSDResources ().getLastOrNull ().getPath ()),
                         e.getImplementationClass (),
                         aSB);
 

diff --git a/ph-ubl21/src/test/java/com/helger/ubl21/EUBL21DocumentTypeTest.java b/ph-ubl21/src/test/java/com/helger/ubl21/EUBL21DocumentTypeTest.java
@@ -46,7 +46,7 @@ public void testAll ()
         assertTrue (e.name (), aRes.exists ());
       assertSame (e, EUBL21DocumentType.valueOf (e.name ()));
       assertTrue (aClasses.add (e.getImplementationClass ()));
-      assertTrue (aFilenames.add (e.getAllXSDResources ().getLast ().getPath ()));
+      assertTrue (aFilenames.add (e.getAllXSDResources ().getLastOrNull ().getPath ()));
     }
   }
 }
diff --git a/...l21/src/test/java/com/helger/ubl21/supplementary/tools/MainCreateUBL21MarshallerCode.java b/...l21/src/test/java/com/helger/ubl21/supplementary/tools/MainCreateUBL21MarshallerCode.java
@@ -28,7 +28,7 @@ public static void main (final String [] args)
 
     for (final EUBL21DocumentType e : EUBL21DocumentType.values ())
       appendMarshaller ("UBL21JAXBMarshaller",
-                        FilenameHelper.getWithoutPath (e.getAllXSDResources ().getLast ().getPath ()),
+                        FilenameHelper.getWithoutPath (e.getAllXSDResources ().getLastOrNull ().getPath ()),
                         e.getImplementationClass (),
                         aSB);
 

diff --git a/ph-ubl22/src/test/java/com/helger/ubl22/EUBL22DocumentTypeTest.java b/ph-ubl22/src/test/java/com/helger/ubl22/EUBL22DocumentTypeTest.java
@@ -46,7 +46,7 @@ public void testAll ()
         assertTrue (e.name (), aRes.exists ());
       assertSame (e, EUBL22DocumentType.valueOf (e.name ()));
       assertTrue (aClasses.add (e.getImplementationClass ()));
-      assertTrue (aFilenames.add (e.getAllXSDResources ().getLast ().getPath ()));
+      assertTrue (aFilenames.add (e.getAllXSDResources ().getLastOrNull ().getPath ()));
     }
   }
 }
diff --git a/...l22/src/test/java/com/helger/ubl22/supplementary/tools/MainCreateUBL22MarshallerCode.java b/...l22/src/test/java/com/helger/ubl22/supplementary/tools/MainCreateUBL22MarshallerCode.java
@@ -28,7 +28,7 @@ public static void main (final String [] args)
 
     for (final EUBL22DocumentType e : EUBL22DocumentType.values ())
       appendMarshaller ("UBL22JAXBMarshaller",
-                        FilenameHelper.getWithoutPath (e.getAllXSDResources ().getLast ().getPath ()),
+                        FilenameHelper.getWithoutPath (e.getAllXSDResources ().getLastOrNull ().getPath ()),
                         e.getImplementationClass (),
                         aSB);
 

diff --git a/ph-ubl23/src/test/java/com/helger/ubl23/EUBL23DocumentTypeTest.java b/ph-ubl23/src/test/java/com/helger/ubl23/EUBL23DocumentTypeTest.java
@@ -46,7 +46,7 @@ public void testAll ()
         assertTrue (e.name (), aRes.exists ());
       assertSame (e, EUBL23DocumentType.valueOf (e.name ()));
       assertTrue (aClasses.add (e.getImplementationClass ()));
-      assertTrue (aFilenames.add (e.getAllXSDResources ().getLast ().getPath ()));
+      assertTrue (aFilenames.add (e.getAllXSDResources ().getLastOrNull ().getPath ()));
     }
   }
 }
diff --git a/...l23/src/test/java/com/helger/ubl23/supplementary/tools/MainCreateUBL23MarshallerCode.java b/...l23/src/test/java/com/helger/ubl23/supplementary/tools/MainCreateUBL23MarshallerCode.java
@@ -28,7 +28,7 @@ public static void main (final String [] args)
 
     for (final EUBL23DocumentType e : EUBL23DocumentType.values ())
       appendMarshaller ("UBL23JAXBMarshaller",
-                        FilenameHelper.getWithoutPath (e.getAllXSDResources ().getLast ().getPath ()),
+                        FilenameHelper.getWithoutPath (e.getAllXSDResources ().getLastOrNull ().getPath ()),
                         e.getImplementationClass (),
                         aSB);
 

diff --git a/...l24/src/test/java/com/helger/ubl24/supplementary/tools/MainCreateUBL24MarshallerCode.java b/...l24/src/test/java/com/helger/ubl24/supplementary/tools/MainCreateUBL24MarshallerCode.java
@@ -28,7 +28,7 @@ public static void main (final String [] args)
 
     for (final EUBL24DocumentType e : EUBL24DocumentType.values ())
       appendMarshaller ("UBL24JAXBMarshaller",
-                        FilenameHelper.getWithoutPath (e.getAllXSDResources ().getLast ().getPath ()),
+                        FilenameHelper.getWithoutPath (e.getAllXSDResources ().getLastOrNull ().getPath ()),
                         e.getImplementationClass (),
                         aSB);
 

diff --git a/ph-ublpe/src/test/java/com/helger/ublpe/UBLPEBuilderFuncTest.java b/ph-ublpe/src/test/java/com/helger/ublpe/UBLPEBuilderFuncTest.java
@@ -44,7 +44,8 @@ public void testReadAndWriteSummaryDocuments ()
   {
     final UBLPEJAXBMarshaller <SummaryDocumentsType> aMarshaller = UBLPEMarshaller.summaryDocuments ();
 
-    final String sFilename = MockUBLPETestDocuments.getUBLPETestDocuments (EUBLPEDocumentType.SUMMARY_DOCUMENTS).getFirst ();
+    final String sFilename = MockUBLPETestDocuments.getUBLPETestDocuments (EUBLPEDocumentType.SUMMARY_DOCUMENTS)
+                                                   .getFirstOrNull ();
     assertNotNull (sFilename);
 
     // Read from resource

diff --git a/pom.xml b/pom.xml
@@ -80,7 +80,7 @@
       <dependency>
         <groupId>com.helger.commons</groupId>
         <artifactId>ph-commons-parent-pom</artifactId>
-        <version>11.1.4</version>
+        <version>11.1.5</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>