[cxf] branch 3.2.x-fixes updated (6be6c98 -> 7bc7ad9)

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[cxf] branch 3.2.x-fixes updated (6be6c98 -> 7bc7ad9)

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

reta pushed a change to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.


    from 6be6c98  Update to Spring Security 4.2.19.RELEASE
     new 6f9255f  CXF-8337: wsdl2java generates exceptions fields which do not follow naming convention (#699)
     new 7bc7ad9  Recording .gitmergeinfo Changes

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitmergeinfo                                                |  2 ++
 .../apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm |  8 ++++----
 .../org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java    | 12 ++++++++++++
 3 files changed, 18 insertions(+), 4 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[cxf] 01/02: CXF-8337: wsdl2java generates exceptions fields which do not follow naming convention (#699)

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

reta pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 6f9255fd70aa2b858ecdefb297093056539d8610
Author: Andriy Redko <[hidden email]>
AuthorDate: Thu Oct 8 20:55:41 2020 -0400

    CXF-8337: wsdl2java generates exceptions fields which do not follow naming convention (#699)
   
    (cherry picked from commit d7d4e487c2902865659b227cb4778eaecd935968)
    (cherry picked from commit b5694d3ed26a9b9f5fd2572b5f51b7612f757f5c)
   
    # Conflicts:
    # tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
---
 .../apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm |  8 ++++----
 .../org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java    | 12 ++++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm
index d61944f..ebf2b20 100644
--- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm
+++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm
@@ -56,7 +56,7 @@ public class $expClass.Name extends $exceptionSuperclass {
 #if ($markGenerated == "true")
     @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate")
 #end
-    $field.Modifier $field.ClassName $paraName;
+    $field.Modifier $field.ClassName faultInfo;
 
 #if ($markGenerated == "true")
     @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate")
@@ -84,7 +84,7 @@ public class $expClass.Name extends $exceptionSuperclass {
 #end
     public ${expClass.Name}(String message, $field.ClassName $paraName) {
         super(message);
-        this.$paraName = $paraName;
+        this.faultInfo = $paraName;
     }
 
 #if ($markGenerated == "true")
@@ -92,14 +92,14 @@ public class $expClass.Name extends $exceptionSuperclass {
 #end
     public ${expClass.Name}(String message, $field.ClassName $paraName, java.lang.Throwable cause) {
         super(message, cause);
-        this.$paraName = $paraName;
+        this.faultInfo = $paraName;
     }
 
 #if ($markGenerated == "true")
     @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate")
 #end
     public $field.ClassName getFaultInfo() {
-        return this.$paraName;
+        return this.faultInfo;
     }
 #end
 }
diff --git a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
index 1e78b75..b93b880 100644
--- a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
+++ b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
@@ -54,6 +54,9 @@ import org.eclipse.jetty.server.handler.ResourceHandler;
 
 import org.junit.Test;
 
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+
 public class CodeGenBugTest extends AbstractCodeGenTest {
 
     @Test
@@ -1010,6 +1013,15 @@ public class CodeGenBugTest extends AbstractCodeGenTest {
         WebFault webFault = AnnotationUtil.getPrivClassAnnotation(clz, WebFault.class);
         assertEquals("int", webFault.name());
     }
+    
+    @Test
+    public void testCXF8337() throws Exception {
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/cxf964/hello_world_fault.wsdl"));
+        processor.setContext(env);
+        processor.execute();
+        Class<?> clz = classLoader.loadClass("org.apache.intfault.BadRecordLitFault");
+        assertThat(clz.getDeclaredField("faultInfo"), not(nullValue()));
+    }
 
     @Test
     public void testCXF1620() throws Exception {

Reply | Threaded
Open this post in threaded view
|

[cxf] 02/02: Recording .gitmergeinfo Changes

reta
In reply to this post by reta
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 7bc7ad9a73bb020b091ccad7ea14c35dc4ff0c61
Author: reta <[hidden email]>
AuthorDate: Fri Oct 9 07:37:43 2020 -0400

    Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index a3a6c67..c4928d5 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -935,6 +935,7 @@ B f2c6f57bb73ef435b6c4965766551fd452110677
 B f2ff0f6c70c33966219649181e8cef57d2e4c327
 B f366b942b64c427ebfaacc79b0229ddb7a481237
 B f3b00f002a4634a40d043bea856117f60aac4246
+B f512502036638873f17c77887d256c60d78626ec
 B f518006392fbe8f740fce10c03a01995b3cb5f54
 B f5299b7d9fc72b64e154edd57c299df5cea7616e
 B f58f1641b8f524999b6b6dd5546149f3b29d70d4
@@ -1117,6 +1118,7 @@ M ade931373e70e8dbe720c8ba036f5d72152b3f59
 M af6a95f5b7efc141cc55792e10d05d471905cf32
 M b0fbfa217c47bdd1b8013182492d5ce5d3df4968
 M b10905c1a58674e68dfb6c888a730cb7ba7b6e74
+M b5694d3ed26a9b9f5fd2572b5f51b7612f757f5c
 M b9300944381ebe10f7c5fe86d55b25b8292372fd
 M ba4896378eeb0c01152ea09ae0bdd3e123207736
 M beeb13f0c08cdbdfa63e0bf2d4d2177d79778d56