[cxf] branch master updated: [cxf-core] back PackageUtils.getPackageNameByNameSpaceURI logic from URIParserUtil

[buhhunyx]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 28dfeaa  [cxf-core] back PackageUtils.getPackageNameByNameSpaceURI 
logic from URIParserUtil
28dfeaa is described below

commit 28dfeaacb1d6c584499c2303e8c4ff3158c1e0bf
Author: amarkevich <amarkev...@talend.com>
AuthorDate: Thu Feb 7 18:42:42 2019 +0300

    [cxf-core] back PackageUtils.getPackageNameByNameSpaceURI logic from
    URIParserUtil
---
 core/src/main/java/org/apache/cxf/common/util/PackageUtils.java     | 3 ++-
 core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java | 2 ++
 2 files changed, 4 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 dd7f8d6..50b08a4 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
@@ -110,7 +110,8 @@ public final class PackageUtils {
             String lastToken = tokens.get(tokens.size() - 1);
             idx = lastToken.lastIndexOf('.');
             if (idx > 0) {
-                lastToken = lastToken.substring(0, idx);
+                //lastToken = lastToken.substring(0, idx);
+                lastToken = lastToken.replace('.', '_');
                 tokens.set(tokens.size() - 1, lastToken);
             }
         }
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 b619da4..24ff807 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
@@ -132,6 +132,8 @@ public class PackageUtilsTest {
                 
PackageUtils.getPackageNameByNameSpaceURI("uri:cxf.apache.org:jstest"));
         assertEquals("soapinterface.ems.esendex.com",
                 
PackageUtils.getPackageNameByNameSpaceURI("com.esendex.ems.soapinterface"));
+        assertEquals("ddd.cc.bb.aa.eee.fff_v01_00",
+                
PackageUtils.getPackageNameByNameSpaceURI("http://aa.bb.cc.ddd/eee/fff_v01.00";));
     }
 
     @Test