(cxf) branch main updated: [CXF-8910] Add https to special handling in package name derivation (#1368)

[reta]

This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/main by this push:
     new d58847626b [CXF-8910] Add https to special handling in package name 
derivation (#1368)
d58847626b is described below

commit d58847626b4cc50f9b654704571e330cee52bfb5
Author: Fabian Ohler <mu...@users.noreply.github.com>
AuthorDate: Sun Jan 12 16:10:36 2025 +0100

    [CXF-8910] Add https to special handling in package name derivation (#1368)
    
    Required by
    
https://jakarta.ee/specifications/xml-binding/4.0/jakarta-xml-binding-spec-4.0#mapping-from-a-namespace-uri
---
 core/src/main/java/org/apache/cxf/common/util/PackageUtils.java    | 2 +-
 .../src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java 
b/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java
index 9d014c8579..a63e3ac66c 100644
--- a/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java
@@ -89,7 +89,7 @@ public final class PackageUtils {
         if (idx >= 0) {
             final String scheme = nameSpaceURI.substring(0, idx);
             urnScheme = "urn".equalsIgnoreCase(scheme);
-            if ("http".equalsIgnoreCase(scheme) || urnScheme) {
+            if ("http".equalsIgnoreCase(scheme) || 
"https".equalsIgnoreCase(scheme) || urnScheme) {
                 nameSpaceURI = nameSpaceURI.substring(idx + (urnScheme ? 1 : 
3)); //
             }
         }
diff --git 
a/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java 
b/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
index 3f930ba4f6..0388dac114 100644
--- a/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
@@ -127,6 +127,7 @@ public class PackageUtilsTest {
     @Test
     public void testGetPackageNameByNameSpaceURI() throws Exception {
         assertEquals("com.iona.cxf", 
PackageUtils.getPackageNameByNameSpaceURI("http://www.cxf.iona.com";));
+        assertEquals("com.iona.cxf", 
PackageUtils.getPackageNameByNameSpaceURI("https://www.cxf.iona.com";));
         assertEquals("com.iona._class", 
PackageUtils.getPackageNameByNameSpaceURI("urn:www.class.iona.com"));
         assertEquals("uri.cxf_apache_org.jstest",
                 
PackageUtils.getPackageNameByNameSpaceURI("uri:cxf.apache.org:jstest"));
@@ -134,10 +135,16 @@ public class PackageUtilsTest {
                 
PackageUtils.getPackageNameByNameSpaceURI("com.esendex.ems.soapinterface"));
         assertEquals("ddd.cc.bb.aa._int.fff_v01_00",
                 
PackageUtils.getPackageNameByNameSpaceURI("http://aa.bb.cc.ddd/Int/fff-v01.00";));
+        assertEquals("ddd.cc.bb.aa._int.fff_v01_00",
+                
PackageUtils.getPackageNameByNameSpaceURI("https://aa.bb.cc.ddd/Int/fff-v01.00";));
         assertEquals("org.apache.cxf._case",
                 
PackageUtils.getPackageNameByNameSpaceURI("http://www.case.cxf.apache.org";));
+        assertEquals("org.apache.cxf._case",
+                
PackageUtils.getPackageNameByNameSpaceURI("https://www.case.cxf.apache.org";));
         assertEquals("org.apache.cxf._case",
                 
PackageUtils.getPackageNameByNameSpaceURI("http://www.Case.cxf.apache.org";));
+        assertEquals("org.apache.cxf._case",
+                
PackageUtils.getPackageNameByNameSpaceURI("https://www.Case.cxf.apache.org";));
     }
 
     @Test