[cxf] branch main updated: Refactor assertFalse(equals()) using assertNotEquals & Refactor assertTrue(equals()) using assertEquals (#1395)
This is an automated email from the ASF dual-hosted git repository.
buhhunyx 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 b337408162 Refactor assertFalse(equals()) using assertNotEquals &
Refactor assertTrue(equals()) using assertEquals (#1395)
b337408162 is described below
commit b3374081627e6ead5c9dba6c6e937d397e0c713c
Author: Taher Ghaleb
AuthorDate: Thu Aug 24 12:17:48 2023 -0400
Refactor assertFalse(equals()) using assertNotEquals & Refactor
assertTrue(equals()) using assertEquals (#1395)
---
core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java | 4 ++--
core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java | 5 +++--
core/src/test/java/org/apache/cxf/version/VersionTest.java | 4 ++--
.../cxf/jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java | 3 ++-
.../org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java | 4 ++--
.../test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java | 4 ++--
rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java | 3 ++-
.../src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java | 5 +++--
.../org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java | 8
.../java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java | 9 +
.../apache/cxf/systest/jaxrs/failover/AbstractFailoverTest.java | 6 +++---
.../src/test/java/org/apache/cxf/systest/jaxws/CXF7990Test.java | 5 +++--
.../java/org/apache/cxf/systest/jaxws/JaxWsClientThreadTest.java | 8
.../apache/cxf/systest/type_test/AbstractTypeTestClient3.java| 6 +++---
.../test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java | 3 ++-
15 files changed, 42 insertions(+), 35 deletions(-)
diff --git a/core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java
b/core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java
index 5afc8e8d47..d9425664f6 100644
--- a/core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java
+++ b/core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java
@@ -22,7 +22,7 @@ package org.apache.cxf.helpers;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNull;
public class NameSpaceTest {
@@ -64,7 +64,7 @@ public class NameSpaceTest {
NSDecl nsDecl2 = new NSDecl("ns2", MY_URL2);
NSDecl nsDecl3 = new NSDecl(MY_OWN_PREFIX, MY_CUSTOM_URL);
-assertFalse(nsDecl2.equals(nsDecl1));
+assertNotEquals(nsDecl1, nsDecl2);
assertEquals(nsDecl3, nsDecl1);
}
diff --git a/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
b/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
index 9ad61f47c7..b6db862cb0 100755
--- a/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
+++ b/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
@@ -38,6 +38,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
@@ -115,7 +116,7 @@ public abstract class CachedStreamTestBase {
assertNotNull(tmpfile);
final String enctext = readFromStream(new FileInputStream(tmpfile));
-assertFalse("text is not encoded", text.equals(enctext));
+assertNotEquals("text is not encoded", enctext, text);
Object fin = getInputStreamObject(cache);
@@ -145,7 +146,7 @@ public abstract class CachedStreamTestBase {
assertNotNull(tmpfile);
final String enctext = readFromStream(new FileInputStream(tmpfile));
-assertFalse("text is not encoded", text.equals(enctext));
+assertNotEquals("text is not encoded", enctext, text);
Object fin = getInputStreamObject(cache);
diff --git a/core/src/test/java/org/apache/cxf/version/VersionTest.java
b/core/src/test/java/org/apache/cxf/version/VersionTest.java
index 1adbf0bcd8..4c5767186b 100644
--- a/core/src/test/java/org/apache/cxf/version/VersionTest.java
+++ b/core/src/test/java/org/apache/cxf/version/VersionTest.java
@@ -21,7 +21,7 @@ package org.apache.cxf.version;
import org.junit.Test;
-import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
public class VersionTest {
@@ -30,7 +30,7 @@ public class VersionTest {
public void testLoadProperties() {
String version = Version.getCurrentVersion();
String token = "${product.version}";
-assertFalse(token.equals(version));
+assertNotEquals(version, token);
[cxf-fediz] branch main updated (e982b4d6 -> 94e59cb5)
This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git from e982b4d6 Merge pull request #73 from amarkevich/escape_cache_key add 94e59cb5 Jetty 9.4.49.v20220914 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[cxf-fediz] branch main updated: Updating Tomcat to 9.0.68
This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git The following commit(s) were added to refs/heads/main by this push: new 5cb9c37d Updating Tomcat to 9.0.68 5cb9c37d is described below commit 5cb9c37d9d5e5a089ee18ae4c119dd0b71d2ed96 Author: Alexey Markevich AuthorDate: Tue Oct 25 11:04:19 2022 +0200 Updating Tomcat to 9.0.68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bc857204..13c09410 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ 2.4.1 5.6.7 2.5.1.RELEASE -9.0.65 +9.0.68 2.0.2 2.4.1
[cxf] branch master updated: update plexus-utils to 3.4.2
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 58ae0ed63c update plexus-utils to 3.4.2 58ae0ed63c is described below commit 58ae0ed63c9361ad5e9591c5cf8bf6f34d1649fd Author: Alexey Markevich AuthorDate: Sat Jul 2 10:24:56 2022 +0300 update plexus-utils to 3.4.2 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index e9850f0b1d..f75d6af269 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -188,7 +188,7 @@ 2.0.26 3.0.0 4.2.0 -3.3.0 +3.4.2 1.0.3 3.4.19 1.7.13
[cxf-fediz] 01/02: update apache parent to 26; use plugin versions from here
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-fediz.git
commit c84b710fbb1507ade0369c98421755a6cc5238ae
Author: Alexey Markevich
AuthorDate: Tue Jun 28 22:52:08 2022 +0300
update apache parent to 26; use plugin versions from here
---
plugins/cxf/pom.xml | 5
plugins/jetty9/pom.xml| 5
plugins/spring/pom.xml| 5
plugins/tomcat/pom.xml| 5
plugins/websphere/pom.xml | 5
pom.xml | 61 +++
6 files changed, 14 insertions(+), 72 deletions(-)
diff --git a/plugins/cxf/pom.xml b/plugins/cxf/pom.xml
index 15256d94..28d28efd 100644
--- a/plugins/cxf/pom.xml
+++ b/plugins/cxf/pom.xml
@@ -83,11 +83,6 @@
single
-
-
-
src/main/assembly/assembly.xml
-
-
diff --git a/plugins/jetty9/pom.xml b/plugins/jetty9/pom.xml
index 360e88dd..2e704bf5 100644
--- a/plugins/jetty9/pom.xml
+++ b/plugins/jetty9/pom.xml
@@ -76,11 +76,6 @@
single
-
-
-
src/main/assembly/assembly.xml
-
-
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 7dba974f..d0b83744 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -84,11 +84,6 @@
single
-
-
-
src/main/assembly/assembly.xml
-
-
diff --git a/plugins/tomcat/pom.xml b/plugins/tomcat/pom.xml
index f5c6fe34..faac7cb1 100644
--- a/plugins/tomcat/pom.xml
+++ b/plugins/tomcat/pom.xml
@@ -64,11 +64,6 @@
single
-
-
-
src/main/assembly/assembly.xml
-
-
diff --git a/plugins/websphere/pom.xml b/plugins/websphere/pom.xml
index b37190cd..66f63ef6 100644
--- a/plugins/websphere/pom.xml
+++ b/plugins/websphere/pom.xml
@@ -142,11 +142,6 @@
single
-
-
-
src/main/assembly/assembly.xml
-
-
diff --git a/pom.xml b/pom.xml
index 5df3dace..aa6de317 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
org.apache
apache
-24
+26
@@ -156,6 +156,7 @@
+
apache.snapshots
@@ -180,7 +181,6 @@
true
-
2011
@@ -309,7 +309,6 @@
org.apache.maven.plugins
maven-release-plugin
-3.0.0-M5
false
clean install
@@ -321,7 +320,6 @@
org.apache.maven.plugins
maven-javadoc-plugin
-3.4.0
true
${jdk.version}
@@ -333,15 +331,9 @@
-
-org.apache.maven.plugins
-maven-source-plugin
-3.2.1
-
org.apache.maven.plugins
maven-compiler-plugin
-3.10.1
${jdk.version}
${jdk.version}
@@ -353,36 +345,12 @@
com.google.errorprone
error_prone_core
-2.3.4
+
+2.10.0
-
-org.apache.maven.plugins
-maven-jar-plugin
-3.2.2
[cxf-fediz] branch master updated (51e4de60 -> ef37a05e)
This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git from 51e4de60 update spring-ldap to 2.4.1 new c84b710f update apache parent to 26; use plugin versions from here new ef37a05e update cxf to 3.5.3 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: plugins/cxf/pom.xml | 5 plugins/jetty9/pom.xml| 5 plugins/spring/pom.xml| 5 plugins/tomcat/pom.xml| 5 plugins/websphere/pom.xml | 5 pom.xml | 65 --- 6 files changed, 16 insertions(+), 74 deletions(-)
[cxf-fediz] 02/02: update cxf to 3.5.3
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-fediz.git commit ef37a05eb6698f8e573c6b7be70a70eed009802c Author: Alexey Markevich AuthorDate: Wed Jun 29 00:52:58 2022 +0300 update cxf to 3.5.3 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index aa6de317..e68fe682 100644 --- a/pom.xml +++ b/pom.xml @@ -43,14 +43,14 @@ 1.2 1.9 1.7 -3.5.2 +3.5.3 3.4.4 4.0.2 3.9.3 1.1.1 2.5.2 2.52.0 -2.13.2 +2.13.3 2.3.5 2.3.3 9.4.48.v20220622
[cxf-fediz] branch master updated: update spring-ldap to 2.4.1
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-fediz.git The following commit(s) were added to refs/heads/master by this push: new 51e4de60 update spring-ldap to 2.4.1 51e4de60 is described below commit 51e4de60d789f57c37c36c843ddd2614033cce1d Author: Alexey Markevich AuthorDate: Tue Jun 28 15:00:50 2022 +0300 update spring-ldap to 2.4.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e4835a1c..5df3dace 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 3.1.0 1.7.36 5.3.21 -2.3.6.RELEASE +2.4.1 5.6.6 2.5.1.RELEASE 9.0.64
[cxf-fediz] branch master updated: additional assembly for jdk9+
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-fediz.git
The following commit(s) were added to refs/heads/master by this push:
new 90e3056f additional assembly for jdk9+
90e3056f is described below
commit 90e3056f2982294fa623d9324567299cac98dc1b
Author: Alexey Markevich
AuthorDate: Wed Jun 22 13:18:05 2022 +0300
additional assembly for jdk9+
---
pom.xml | 7 +++
1 file changed, 7 insertions(+)
diff --git a/pom.xml b/pom.xml
index 38b431ef..d569e94c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -733,6 +733,13 @@
true
+
+org.apache.maven.plugins
+maven-assembly-plugin
+
+
${project.artifactId}-${project.version}-java11
+
+
[cxf-fediz] branch master updated: Update Spring Security to 5.6.6
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-fediz.git The following commit(s) were added to refs/heads/master by this push: new 5542fbf8 Update Spring Security to 5.6.6 5542fbf8 is described below commit 5542fbf851429b0a87e24f1c44d6baee5c8b33c0 Author: Alexey Markevich AuthorDate: Wed Jun 22 10:01:25 2022 +0300 Update Spring Security to 5.6.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 221827a6..38b431ef 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 1.7.36 5.3.18 2.3.6.RELEASE -5.6.5 +5.6.6 2.5.1.RELEASE 9.0.63 2.0.2
[cxf-fediz] branch master updated: update dependencies and plugins
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-fediz.git
The following commit(s) were added to refs/heads/master by this push:
new 41d3bead update dependencies and plugins
41d3bead is described below
commit 41d3bead67ffce978849e00c881bdcf3e704eaea
Author: Alexey Markevich
AuthorDate: Tue Jun 21 01:26:46 2022 +0300
update dependencies and plugins
---
pom.xml | 31 ++-
1 file changed, 10 insertions(+), 21 deletions(-)
diff --git a/pom.xml b/pom.xml
index ebc10bbe..221827a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,13 +50,14 @@
1.1.1
2.5.2
2.52.0
-2.11.4
+2.13.2
+2.3.5
2.3.3
9.4.46.v20220331
4.13.2
2.0.1
2.17.2
-3.2.0
+3.2.2
3.1.0
1.7.36
5.3.18
@@ -320,7 +321,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
-3.0.1
+3.4.0
true
${jdk.version}
@@ -340,7 +341,7 @@
org.apache.maven.plugins
maven-compiler-plugin
-3.8.1
+3.10.1
${jdk.version}
${jdk.version}
@@ -365,7 +366,7 @@
org.apache.maven.plugins
maven-resources-plugin
-3.1.0
+3.2.0
org.apache.maven.plugins
@@ -375,19 +376,7 @@
org.apache.maven.plugins
maven-dependency-plugin
-3.2.0
-
-
-org.apache.maven.plugins
-maven-shade-plugin
-3.2.4
-
-
-org.apache.cxf.build-utils
-cxf-buildtools
-${cxf.build-utils.version}
-
-
+3.3.0
org.apache.maven.plugins
@@ -657,7 +646,7 @@
org.apache.maven.plugins
maven-compiler-plugin
-3.8.1
+3.10.1
${jdk.version}
${jdk.version}
@@ -756,7 +745,7 @@
org.glassfish.jaxb
jaxb-runtime
-${jaxb.version}
+${jaxb.runtime.version}
jakarta.annotation
@@ -766,7 +755,7 @@
jakarta.xml.ws
jakarta.xml.ws-api
-2.3.2
+2.3.3
[cxf-fediz] branch master updated: update cxf xjc-utils to 3.3.2
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-fediz.git The following commit(s) were added to refs/heads/master by this push: new 65c688f9 update cxf xjc-utils to 3.3.2 65c688f9 is described below commit 65c688f949ac43272696ad8e7a212683eb963d46 Author: Alexey Markevich AuthorDate: Mon Jun 13 16:23:59 2022 +0300 update cxf xjc-utils to 3.3.2 --- plugins/core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/core/pom.xml b/plugins/core/pom.xml index f681295c..e782c0db 100644 --- a/plugins/core/pom.xml +++ b/plugins/core/pom.xml @@ -29,7 +29,7 @@ Apache Fediz Plugin Core bundle -3.3.1 +3.3.2
[cxf] branch master updated: [CXF-8697] Fix order-dependent flaky tests (#942)
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 79ee9824ee [CXF-8697] Fix order-dependent flaky tests (#942)
79ee9824ee is described below
commit 79ee9824ee30b1b710d7385efc3cec736b4a5c54
Author: Justin Chen <62852410+jchen8...@users.noreply.github.com>
AuthorDate: Mon May 2 01:57:03 2022 -0500
[CXF-8697] Fix order-dependent flaky tests (#942)
* [CXF-8697] Fix order-dependent flaky tests
* Adjust the fix
---
core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
b/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
index 0fc7d8568d..91cae1f722 100755
--- a/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
+++ b/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
@@ -69,7 +69,7 @@ public abstract class CachedStreamTestBase {
@Test
public void testDeleteTmpFile() throws IOException {
-Object cache = createCache();
+Object cache = createCache(64 * 1024);
//ensure output data size larger then 64k which will generate tmp file
String result = initTestData(65);
File tempFile = getTmpFile(result, cache);
[cxf] branch master updated: update to released karaf 4.4.0
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 3795fbc874 update to released karaf 4.4.0 3795fbc874 is described below commit 3795fbc8740c882d8f276b6e9cbaf0cab107edef Author: Raymond Augé AuthorDate: Sun May 1 12:23:08 2022 -0400 update to released karaf 4.4.0 Signed-off-by: Raymond Augé --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index b2d59afc6d..7425f149e6 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -251,7 +251,7 @@ 2.3.2_1 none 1.1_4 -4.4.0-SNAPSHOT +4.4.0 20100527_1 2.0.8_6 [1.4,2)
[cxf-fediz] branch master updated: Upgrade to Spring Security 5.6.3
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-fediz.git The following commit(s) were added to refs/heads/master by this push: new f96bc56e Upgrade to Spring Security 5.6.3 f96bc56e is described below commit f96bc56e5ee9aa415ff168db6bbe6b026fdd5766 Author: Alexey Markevich AuthorDate: Thu Apr 21 18:15:18 2022 +0300 Upgrade to Spring Security 5.6.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a2fd3df6..51c40743 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 1.7.36 5.3.18 2.3.6.RELEASE -5.6.2 +5.6.3 2.5.1.RELEASE 9.0.62 2.0.2
[cxf] branch master updated: cxf-rt-rs-security-oauth2: enable JCacheCodeDataProviderTest
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 30dd21512d cxf-rt-rs-security-oauth2: enable JCacheCodeDataProviderTest
30dd21512d is described below
commit 30dd21512ddf0af616771b88db8615e1aa5b7ab6
Author: Alexey Markevich
AuthorDate: Tue Apr 12 12:20:18 2022 +0300
cxf-rt-rs-security-oauth2: enable JCacheCodeDataProviderTest
---
.../rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java| 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java
b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java
index c573ea7b69..9921d78830 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java
@@ -26,7 +26,6 @@ import org.apache.cxf.rs.security.oauth2.common.UserSubject;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -40,7 +39,6 @@ public class JCacheCodeDataProviderTest {
provider = new JCacheCodeDataProvider();
}
-@Ignore
@Test
public void testAddGetDeleteCodeGrants() {
Client c = addClient("111", "bob");
@@ -70,7 +68,6 @@ public class JCacheCodeDataProviderTest {
assertEquals(0, grants.size());
}
-@Ignore
@Test
public void testAddGetDeleteCodeGrants2() {
Client c = addClient("111", "bob");
@@ -99,6 +96,7 @@ public class JCacheCodeDataProviderTest {
provider.setClient(c);
return c;
}
+
@After
public void tearDown() throws Exception {
if (provider != null) {
[cxf-fediz] branch master updated: remove unused config
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-fediz.git The following commit(s) were added to refs/heads/master by this push: new 1c220ef8 remove unused config 1c220ef8 is described below commit 1c220ef8cc1e3b655db2a6d121e70be4f3bac760 Author: Alexey Markevich AuthorDate: Tue Apr 12 00:36:42 2022 +0300 remove unused config --- services/oidc/src/main/resources/cxf-oauth2-ehcache.xml | 6 -- 1 file changed, 6 deletions(-) diff --git a/services/oidc/src/main/resources/cxf-oauth2-ehcache.xml b/services/oidc/src/main/resources/cxf-oauth2-ehcache.xml deleted file mode 100644 index 24ea3e43.. --- a/services/oidc/src/main/resources/cxf-oauth2-ehcache.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - -
[cxf-fediz] branch master updated: fix maven-assembly-plugin goal after version update
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-fediz.git The following commit(s) were added to refs/heads/master by this push: new 2925107 fix maven-assembly-plugin goal after version update 2925107 is described below commit 2925107d33563d058f70c9e4b73de8bca494fdf0 Author: Alexey Markevich AuthorDate: Fri Feb 25 00:10:46 2022 +0300 fix maven-assembly-plugin goal after version update --- plugins/cxf/pom.xml | 2 +- plugins/jetty9/pom.xml| 2 +- plugins/spring/pom.xml| 2 +- plugins/tomcat/pom.xml| 2 +- plugins/websphere/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/cxf/pom.xml b/plugins/cxf/pom.xml index 3c848e2..15256d9 100644 --- a/plugins/cxf/pom.xml +++ b/plugins/cxf/pom.xml @@ -81,7 +81,7 @@ zip-file package -attached +single diff --git a/plugins/jetty9/pom.xml b/plugins/jetty9/pom.xml index d416d94..360e88d 100644 --- a/plugins/jetty9/pom.xml +++ b/plugins/jetty9/pom.xml @@ -74,7 +74,7 @@ zip-file package -attached +single diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml index 4239441..7dba974 100644 --- a/plugins/spring/pom.xml +++ b/plugins/spring/pom.xml @@ -82,7 +82,7 @@ zip-file package -attached +single diff --git a/plugins/tomcat/pom.xml b/plugins/tomcat/pom.xml index 07a21ae..f5c6fe3 100644 --- a/plugins/tomcat/pom.xml +++ b/plugins/tomcat/pom.xml @@ -62,7 +62,7 @@ zip-file package -attached +single diff --git a/plugins/websphere/pom.xml b/plugins/websphere/pom.xml index feb529b..b37190c 100644 --- a/plugins/websphere/pom.xml +++ b/plugins/websphere/pom.xml @@ -140,7 +140,7 @@ zip-file package -attached +single
[cxf-fediz] branch master updated: upgrade plugins for Reproducible Builds
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-fediz.git The following commit(s) were added to refs/heads/master by this push: new 0ba80c1 upgrade plugins for Reproducible Builds 0ba80c1 is described below commit 0ba80c17c4d22f2688688a38b51c1e1373775b6a Author: Hervé Boutemy AuthorDate: Thu Feb 24 19:23:02 2022 +0100 upgrade plugins for Reproducible Builds --- pom.xml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 3d1575a..b43cb27 100644 --- a/pom.xml +++ b/pom.xml @@ -303,12 +303,12 @@ org.apache.felix maven-bundle-plugin -4.2.1 +5.1.4 org.apache.maven.plugins maven-release-plugin -2.5.3 +3.0.0-M5 false clean install @@ -360,7 +360,7 @@ org.apache.maven.plugins maven-jar-plugin -3.2.0 +3.2.2 org.apache.maven.plugins @@ -370,7 +370,7 @@ org.apache.maven.plugins maven-assembly-plugin -2.5.5 +3.3.0 org.apache.maven.plugins @@ -380,7 +380,7 @@ org.apache.maven.plugins maven-shade-plugin -2.4.3 +3.2.4 org.apache.cxf.build-utils
[cxf-fediz] branch master updated: Updating CXF to 3.5.0
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-fediz.git The following commit(s) were added to refs/heads/master by this push: new 635d1ba Updating CXF to 3.5.0 635d1ba is described below commit 635d1ba79cd5d0912126dff9f17776a4d1b23793 Author: Alexey Markevich AuthorDate: Wed Jan 26 19:58:36 2022 +0300 Updating CXF to 3.5.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f7feaa1..c586116 100644 --- a/pom.xml +++ b/pom.xml @@ -43,10 +43,10 @@ 1.2 1.9 1.7 -3.4.5 +3.5.0 3.4.4 4.0.2 -3.8.1 +3.9.3 1.1.1 2.5.2 2.52.0
[cxf-xjc-utils] branch 3.x-fixes created (now ffb5cbe)
This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a change to branch 3.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf-xjc-utils.git. at ffb5cbe introduce jaxb-runtime-version This branch includes the following new commits: new ffb5cbe introduce jaxb-runtime-version The 1 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.
[cxf-xjc-utils] 01/01: introduce jaxb-runtime-version
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch 3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf-xjc-utils.git
commit ffb5cbee41b634bd7b416da6bb7bb4a311dd5206
Author: Alexey Markevich
AuthorDate: Mon Jan 3 21:20:53 2022 +0300
introduce jaxb-runtime-version
---
pom.xml | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index d1b00cf..ebb51ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,7 @@
3.4.5-SNAPSHOT
1.8
2.3.3
+2.3.5
${basedir}/target/classes
true
@@ -95,17 +96,17 @@
org.glassfish.jaxb
jaxb-runtime
-${jaxb-version}
+${jaxb-runtime-version}
org.glassfish.jaxb
jaxb-xjc
-${jaxb-version}
+${jaxb-runtime-version}
junit
junit
-4.13.1
+4.13.2
org.apache.maven
@@ -305,7 +306,7 @@
org.apache.maven.plugins
maven-plugin-plugin
-3.6.0
+3.6.2
org.apache.maven.plugins
[cxf] branch master updated: cxf-rt-transports-http: allow to use service list endpoint as lightweight healthcheck endpoint using HTTP HEAD method
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 6f02a58 cxf-rt-transports-http: allow to use service list endpoint as
lightweight healthcheck endpoint using HTTP HEAD method
6f02a58 is described below
commit 6f02a585e82415826dc30c2b598df1ab1b187586
Author: Alexey Markevich
AuthorDate: Wed Dec 1 17:09:26 2021 +0300
cxf-rt-transports-http: allow to use service list endpoint as
lightweight healthcheck endpoint using HTTP HEAD method
---
.../servicelist/ServiceListGeneratorServlet.java | 52 ---
.../transport/servlet/ServletControllerTest.java | 58 ++
2 files changed, 48 insertions(+), 62 deletions(-)
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java
index fd0c94e..f37add2 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import javax.servlet.ServletConfig;
@@ -33,6 +34,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.common.util.StringUtils;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.message.Message;
import org.apache.cxf.service.model.EndpointInfo;
@@ -45,17 +47,12 @@ public class ServiceListGeneratorServlet extends
HttpServlet {
private DestinationRegistry destinationRegistry;
private Bus bus;
private String serviceListStyleSheet;
-private String title;
+private String title = "CXF - Service list";
private boolean showForeignContexts = true;
public ServiceListGeneratorServlet(DestinationRegistry
destinationRegistry, Bus bus) {
this.destinationRegistry = destinationRegistry;
-this.bus = bus;
-if (this.bus == null) {
-this.bus = BusFactory.getDefaultBus(false);
-}
-
-this.title = "CXF - Service list";
+this.bus = bus != null ? bus : BusFactory.getDefaultBus(false);
}
public void setServiceListStyleSheet(String serviceListStyleSheet) {
@@ -66,17 +63,11 @@ public class ServiceListGeneratorServlet extends
HttpServlet {
this.title = title;
}
-
-@SuppressWarnings("unchecked")
@Override
public void service(HttpServletRequest request,
HttpServletResponse response) throws ServletException,
IOException {
-Object obj = request.getAttribute(ServletController.AUTH_SERVICE_LIST);
-boolean isAuthServiceList = false;
-if (obj != null) {
-isAuthServiceList = Boolean.valueOf(obj.toString());
-}
-if (isAuthServiceList) {
+final Object isAuthServiceList =
request.getAttribute(ServletController.AUTH_SERVICE_LIST);
+if (isAuthServiceList != null &&
Boolean.valueOf(isAuthServiceList.toString())) {
String authServiceListRealm =
(String)request.getAttribute(ServletController.AUTH_SERVICE_LIST_REALM);
ServiceListJAASAuthenticator authenticator = new
ServiceListJAASAuthenticator();
authenticator.setRealm(authServiceListRealm);
@@ -86,24 +77,18 @@ public class ServiceListGeneratorServlet extends
HttpServlet {
request.removeAttribute(ServletController.AUTH_SERVICE_LIST);
request.removeAttribute(ServletController.AUTH_SERVICE_LIST_REALM);
}
-AbstractDestination[] destinations =
destinationRegistry.getSortedDestinations();
if (request.getParameter("stylesheet") != null) {
renderStyleSheet(request, response);
return;
}
-List privateEndpoints;
+
+if ("HEAD".equals(request.getMethod())) {
+return;
+}
if (bus == null) {
bus = BusFactory.getDefaultBus(false);
}
-if (bus != null) {
-privateEndpoints =
(List)bus.getProperty("org.apache.cxf.private.endpoints");
-} else {
-privateEndpoints = new ArrayList<>();
-}
-
-AbstractDestination[] soapEndpoints = getSOAPEndpoints(destinations,
privateEndpoints);
-AbstractDestination[] restEndpoints = getRestEndpoints(destinations,
privateEndpoints);
-ServiceListWr
[cxf-fediz] branch master updated: revert intermediate test changes
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-fediz.git
The following commit(s) were added to refs/heads/master by this push:
new fd989f4 revert intermediate test changes
fd989f4 is described below
commit fd989f4e622fa44aca520a2ca13a4007b2764d2f
Author: Alexey Markevich
AuthorDate: Thu Nov 25 22:59:22 2021 +0300
revert intermediate test changes
---
.../cxf/fediz/systests/oidc/AbstractOIDCTest.java | 69 +-
1 file changed, 2 insertions(+), 67 deletions(-)
diff --git
a/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/AbstractOIDCTest.java
b/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/AbstractOIDCTest.java
index d890dca..70e23f9 100644
---
a/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/AbstractOIDCTest.java
+++
b/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/AbstractOIDCTest.java
@@ -45,7 +45,6 @@ import javax.servlet.ServletResponse;
import javax.ws.rs.core.Response.Status;
import javax.ws.rs.core.UriBuilder;
-import com.gargoylesoftware.htmlunit.CookieManager;
import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
import com.gargoylesoftware.htmlunit.HttpMethod;
import com.gargoylesoftware.htmlunit.Page;
@@ -92,8 +91,8 @@ import static org.junit.Assert.fail;
*/
abstract class AbstractOIDCTest {
-private static final Integer IDP_HTTPS_PORT =
Integer.getInteger("idp.https.port", 12345);
-private static final Integer RP_HTTPS_PORT =
Integer.getInteger("rp.https.port", 23456);
+private static final Integer IDP_HTTPS_PORT =
Integer.getInteger("idp.https.port");
+private static final Integer RP_HTTPS_PORT =
Integer.getInteger("rp.https.port");
private static final String CALLBACK_CONTEXT = "/callback";
private static final String REDIRECT_URL = "https://localhost:; +
RP_HTTPS_PORT + CALLBACK_CONTEXT;
@@ -473,69 +472,6 @@ abstract class AbstractOIDCTest {
}
@org.junit.Test
-public void testOIDCLoginDifferentClients() throws Exception {
-final UriBuilder authorizationUrlConfidential =
oidcEndpointBuilder("/idp/authorize")
-.queryParam("client_id", confidentialClientId)
-.queryParam("response_type", "code")
-.queryParam("scope", "openid");
-
-CookieManager cookieManager = new CookieManager();
-WebClient webClient = setupWebClientIDP("alice", "ecila");
-webClient.setCookieManager(cookieManager);
-
-
-// Login to the OIDC authorization endpoint + get the authorization
code
-//String authorizationCode =
webClient.getPage(authorizationUrlConfidential.build().toURL()).getWebResponse().getContentAsString();
-String authorizationCode = login(authorizationUrlConfidential,
webClient).getWebResponse().getContentAsString();
-System.out.println("authorizationCode " + authorizationCode);
-
-// Now use the code to get an IdToken
-final Map jsonConfidential =
-getTokenJson(authorizationCode, confidentialClientId,
confidentialClientSecret);
-System.out.println(jsonConfidential);
-
-// Check the IdToken
-validateIdToken(getIdToken(jsonConfidential), confidentialClientId);
-
-final UriBuilder authorizationUrlPublic =
oidcEndpointBuilder("/idp/authorize")
-.queryParam("client_id", publicClientId)
-.queryParam("response_type", "code")
-.queryParam("scope", "openid")
-.queryParam("redirect_uri", REDIRECT_URL);
-
-// Login to the OIDC authorization endpoint + get the authorization
code
-authorizationCode =
webClient.getPage(authorizationUrlPublic.build().toURL()).getWebResponse().getContentAsString();
-System.out.println("authorizationCode " + authorizationCode);
-
-// Now use the code to get an IdToken
-final Map jsonPublic =
-getTokenJson(authorizationCode, publicClientId, null);
-System.out.println(jsonPublic);
-
-// Check the IdToken
-validateIdToken(getIdToken(jsonPublic), publicClientId);
-}
-
-@org.junit.Test
-public void testImplicitFlow() throws Exception {
-final UriBuilder authorizationUrl =
oidcEndpointBuilder("/idp/authorize")
-.queryParam("client_id", publicClientId)
-.queryParam("response_type", "id_token")
-.queryParam("scope", "openid")
-.queryParam("redirect_uri", REDIRECT_URL)
-.queryParam("nonce", "1234565635");
-
-CookieMa
[cxf-fediz] branch master updated (992ec0e -> 630f0b3)
This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git. from 992ec0e Updating Tomcat and Spring new 11d9964 fediz-systests-samlsso: minor new 630f0b3 update spring security to 5.6.0 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: .../webapp/WEB-INF/applicationContext-security.xml | 2 +- .../webapp/WEB-INF/applicationContext-security.xml | 2 +- .../src/main/webapp/WEB-INF/applicationContext.xml | 4 +- .../src/main/webapp/WEB-INF/applicationContext.xml | 4 +- pom.xml| 2 +- .../src/test/resources/entities-realma.xml | 4 +- .../idp-core/src/test/resources/idp-config.xml | 6 +- .../src/test/resources/persistenceContext.xml | 4 +- .../idp-core/src/test/resources/testContext.xml| 6 +- services/idp/src/main/resources/cxf-tls.xml| 2 +- .../idp/src/main/resources/entities-realma.xml | 4 +- .../idp/src/main/resources/entities-realmb.xml | 4 +- .../idp/src/main/resources/persistenceContext.xml | 4 +- services/idp/src/main/resources/restContext.xml| 4 +- .../src/main/webapp/WEB-INF/applicationContext.xml | 4 +- .../webapp/WEB-INF/config/idp-core-servlet.xml | 6 +- .../WEB-INF/config/security-clientcert-config.xml | 4 +- .../webapp/WEB-INF/config/security-krb-config.xml | 2 +- .../webapp/WEB-INF/config/security-rs-config.xml | 2 +- .../webapp/WEB-INF/config/security-up-config.xml | 2 +- .../src/main/webapp/WEB-INF/idp-config-realma.xml | 6 +- .../src/main/webapp/WEB-INF/idp-config-realmb.xml | 6 +- .../idp/src/main/webapp/WEB-INF/idp-servlet.xml| 4 +- .../src/main/webapp/WEB-INF/security-config.xml| 4 +- services/idp/src/test/resources/rest-client.xml| 2 +- .../src/main/webapp/WEB-INF/applicationContext.xml | 4 +- .../oidc/src/main/webapp/WEB-INF/data-manager.xml | 4 +- .../src/main/webapp/WEB-INF/applicationContext.xml | 2 +- .../sts/src/main/webapp/WEB-INF/cxf-transport.xml | 2 +- .../sts/src/main/webapp/WEB-INF/data/passwords.xml | 4 +- .../sts/src/main/webapp/WEB-INF/data/realms.xml| 4 +- .../src/main/webapp/WEB-INF/data/userClaims.xml| 4 +- .../sts/src/main/webapp/WEB-INF/endpoints/file.xml | 4 +- .../src/main/webapp/WEB-INF/endpoints/kerberos.xml | 4 +- .../sts/src/main/webapp/WEB-INF/endpoints/ldap.xml | 4 +- services/sts/src/main/webapp/WEB-INF/fediz-sts.xml | 4 +- .../org/apache/cxf/fediz/sts/realms/sts-client.xml | 4 +- systests/custom/src/test/resources/file.xml| 4 +- .../src/test/resources/realma/idp-servlet.xml | 4 +- .../test/resources/realma/security-up-config.xml | 6 +- systests/custom/src/test/resources/userClaims.xml | 4 +- .../src/test/resources/realma/entities-realma.xml | 4 +- .../cxf/src/test/resources/realma/fediz-sts.xml| 4 +- .../src/main/webapp/WEB-INF/applicationContext.xml | 4 +- .../src/main/webapp/WEB-INF/cxf-service.xml| 4 +- .../src/main/webapp/WEB-INF/applicationContext.xml | 4 +- .../src/main/webapp/WEB-INF/cxf-service.xml| 2 +- .../src/main/webapp/WEB-INF/cxf-service.xml| 2 +- .../samlsso/src/test/resources/cxf-service.xml | 4 +- .../src/test/resources/realma/entities-realma.xml | 4 +- .../src/test/resources/realmb/entities-realmb.xml | 4 +- .../src/test/resources/realmb/idp-servlet.xml | 4 +- .../src/test/resources/realmb/security-config.xml | 4 +- .../samlsso/src/test/resources/rp/cxf-service.xml | 2 +- .../src/test/resources/realma/entities-realma.xml | 4 +- .../src/test/resources/realmb/entities-realmb.xml | 4 +- .../src/test/resources/realmb/idp-servlet.xml | 4 +- .../src/test/resources/realmb/security-config.xml | 4 +- .../src/test/resources/sts/realms.xml | 4 +- .../src/test/resources/realma/entities-realma.xml | 4 +- .../src/test/resources/realmb/entities-realmb.xml | 4 +- .../src/test/resources/realmb/idp-servlet.xml | 4 +- .../src/test/resources/realmb/security-config.xml | 4 +- .../src/test/resources/realma/entities-realma.xml | 4 +- .../src/test/resources/realma/entities-realma.xml | 4 +- .../jetty9/src/test/resources/realma/fediz-sts.xml | 4 +- .../src/test/resources/sts/cxf-transport.xml | 4 +- .../kerberos/src/test/resources/sts/kerberos.xml | 4 +- .../src/test/resources/sts/userClaimsKerberos.xml | 4 +- .../ldap/src/test/resources/sts/cxf-transport.xml | 4 +- systests/ldap/src/test/resources/sts/ldap.xml | 4 +- .../cxf/fediz/systests/oidc/AbstractOIDCTest.java | 69 +- .../src/test/resources/oidc/applicationContext.xml | 4 +
[cxf-fediz] 01/02: fediz-systests-samlsso: minor
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-fediz.git
commit 11d9964b26138ca482594ea8a71b2001f9cc9782
Author: Alexey Markevich
AuthorDate: Thu Nov 25 17:58:36 2021 +0300
fediz-systests-samlsso: minor
---
.../fediz/systests/samlsso/TomcatPluginTest.java | 65 ++
1 file changed, 29 insertions(+), 36 deletions(-)
diff --git
a/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/TomcatPluginTest.java
b/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/TomcatPluginTest.java
index 8045e50..43264e5 100644
---
a/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/TomcatPluginTest.java
+++
b/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/TomcatPluginTest.java
@@ -20,13 +20,13 @@
package org.apache.cxf.fediz.systests.samlsso;
import java.io.ByteArrayInputStream;
-import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.file.Files;
-
-import javax.servlet.ServletException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Objects;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -57,6 +57,7 @@ import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+
/**
* Some tests for SAML SSO with the Tomcat plugin, invoking on the Fediz IdP
configured for SAML SSO.
*/
@@ -70,26 +71,16 @@ public class TomcatPluginTest extends AbstractTests {
@BeforeClass
public static void init() throws Exception {
-Assert.assertNotNull("Property 'idp.https.port' null", IDP_HTTPS_PORT);
-Assert.assertNotNull("Property 'rp.https.port' null", RP_HTTPS_PORT);
-
-idpServer = startServer(true, IDP_HTTPS_PORT);
-rpServer = startServer(false, RP_HTTPS_PORT);
+idpServer = startServer(true, Objects.requireNonNull(IDP_HTTPS_PORT,
"Property 'idp.https.port' null"));
+rpServer = startServer(false, Objects.requireNonNull(RP_HTTPS_PORT,
"Property 'rp.https.port' null"));
}
-private static Tomcat startServer(boolean idp, String port)
-throws ServletException, LifecycleException, IOException {
-Tomcat server = new Tomcat();
+private static Tomcat startServer(boolean idp, String port) throws
LifecycleException, IOException {
+final Tomcat server = new Tomcat();
server.setPort(0);
-String currentDir = new File(".").getCanonicalPath();
-String baseDir = currentDir + File.separator + "target";
-server.setBaseDir(baseDir);
+final Path targetDir = Paths.get("target").toAbsolutePath();
+server.setBaseDir(targetDir.toString());
-if (idp) {
-server.getHost().setAppBase("tomcat/idp/webapps");
-} else {
-server.getHost().setAppBase("tomcat/rp/webapps");
-}
server.getHost().setAutoDeploy(true);
server.getHost().setDeployOnStartup(true);
@@ -110,30 +101,32 @@ public class TomcatPluginTest extends AbstractTests {
server.getService().addConnector(httpsConnector);
if (idp) {
-File stsWebapp = new File(baseDir + File.separator +
server.getHost().getAppBase(), "fediz-idp-sts");
-server.addWebapp("/fediz-idp-sts", stsWebapp.getAbsolutePath());
+server.getHost().setAppBase("tomcat/idp/webapps");
-File idpWebapp = new File(baseDir + File.separator +
server.getHost().getAppBase(), "fediz-idp");
-server.addWebapp("/fediz-idp", idpWebapp.getAbsolutePath());
+Path stsWebapp =
targetDir.resolve(server.getHost().getAppBase()).resolve("fediz-idp-sts");
+server.addWebapp("/fediz-idp-sts", stsWebapp.toString());
+
+Path idpWebapp =
targetDir.resolve(server.getHost().getAppBase()).resolve("fediz-idp");
+server.addWebapp("/fediz-idp", idpWebapp.toString());
} else {
-File rpWebapp = new File(baseDir + File.separator +
server.getHost().getAppBase(), "simpleWebapp");
-Context cxt = server.addWebapp("/fedizhelloworld",
rpWebapp.getAbsolutePath());
+server.getHost().setAppBase("tomcat/rp/webapps");
+
+Path rpWebapp =
targetDir.resolve(server.getHost().getAppBase()).resolve("simpleWebapp");
+Context ctx = server.addWebapp("/fedizhelloworld",
rpWebapp.toString());
// Substitute the IDP port. Necessary if running the test in
eclipse where port filtering doesn't seem
// to work
-File f = new File(currentDi
[cxf-fediz] 02/02: update spring security to 5.6.0
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-fediz.git commit 630f0b34bddea09a97c7bfc2a7d851ea464300d1 Author: Alexey Markevich AuthorDate: Thu Nov 25 18:09:57 2021 +0300 update spring security to 5.6.0 --- .../webapp/WEB-INF/applicationContext-security.xml | 2 +- .../webapp/WEB-INF/applicationContext-security.xml | 2 +- .../src/main/webapp/WEB-INF/applicationContext.xml | 4 +- .../src/main/webapp/WEB-INF/applicationContext.xml | 4 +- pom.xml| 2 +- .../src/test/resources/entities-realma.xml | 4 +- .../idp-core/src/test/resources/idp-config.xml | 6 +- .../src/test/resources/persistenceContext.xml | 4 +- .../idp-core/src/test/resources/testContext.xml| 6 +- services/idp/src/main/resources/cxf-tls.xml| 2 +- .../idp/src/main/resources/entities-realma.xml | 4 +- .../idp/src/main/resources/entities-realmb.xml | 4 +- .../idp/src/main/resources/persistenceContext.xml | 4 +- services/idp/src/main/resources/restContext.xml| 4 +- .../src/main/webapp/WEB-INF/applicationContext.xml | 4 +- .../webapp/WEB-INF/config/idp-core-servlet.xml | 6 +- .../WEB-INF/config/security-clientcert-config.xml | 4 +- .../webapp/WEB-INF/config/security-krb-config.xml | 2 +- .../webapp/WEB-INF/config/security-rs-config.xml | 2 +- .../webapp/WEB-INF/config/security-up-config.xml | 2 +- .../src/main/webapp/WEB-INF/idp-config-realma.xml | 6 +- .../src/main/webapp/WEB-INF/idp-config-realmb.xml | 6 +- .../idp/src/main/webapp/WEB-INF/idp-servlet.xml| 4 +- .../src/main/webapp/WEB-INF/security-config.xml| 4 +- services/idp/src/test/resources/rest-client.xml| 2 +- .../src/main/webapp/WEB-INF/applicationContext.xml | 4 +- .../oidc/src/main/webapp/WEB-INF/data-manager.xml | 4 +- .../src/main/webapp/WEB-INF/applicationContext.xml | 2 +- .../sts/src/main/webapp/WEB-INF/cxf-transport.xml | 2 +- .../sts/src/main/webapp/WEB-INF/data/passwords.xml | 4 +- .../sts/src/main/webapp/WEB-INF/data/realms.xml| 4 +- .../src/main/webapp/WEB-INF/data/userClaims.xml| 4 +- .../sts/src/main/webapp/WEB-INF/endpoints/file.xml | 4 +- .../src/main/webapp/WEB-INF/endpoints/kerberos.xml | 4 +- .../sts/src/main/webapp/WEB-INF/endpoints/ldap.xml | 4 +- services/sts/src/main/webapp/WEB-INF/fediz-sts.xml | 4 +- .../org/apache/cxf/fediz/sts/realms/sts-client.xml | 4 +- systests/custom/src/test/resources/file.xml| 4 +- .../src/test/resources/realma/idp-servlet.xml | 4 +- .../test/resources/realma/security-up-config.xml | 6 +- systests/custom/src/test/resources/userClaims.xml | 4 +- .../src/test/resources/realma/entities-realma.xml | 4 +- .../cxf/src/test/resources/realma/fediz-sts.xml| 4 +- .../src/main/webapp/WEB-INF/applicationContext.xml | 4 +- .../src/main/webapp/WEB-INF/cxf-service.xml| 4 +- .../src/main/webapp/WEB-INF/applicationContext.xml | 4 +- .../src/main/webapp/WEB-INF/cxf-service.xml| 2 +- .../src/main/webapp/WEB-INF/cxf-service.xml| 2 +- .../samlsso/src/test/resources/cxf-service.xml | 4 +- .../src/test/resources/realma/entities-realma.xml | 4 +- .../src/test/resources/realmb/entities-realmb.xml | 4 +- .../src/test/resources/realmb/idp-servlet.xml | 4 +- .../src/test/resources/realmb/security-config.xml | 4 +- .../samlsso/src/test/resources/rp/cxf-service.xml | 2 +- .../src/test/resources/realma/entities-realma.xml | 4 +- .../src/test/resources/realmb/entities-realmb.xml | 4 +- .../src/test/resources/realmb/idp-servlet.xml | 4 +- .../src/test/resources/realmb/security-config.xml | 4 +- .../src/test/resources/sts/realms.xml | 4 +- .../src/test/resources/realma/entities-realma.xml | 4 +- .../src/test/resources/realmb/entities-realmb.xml | 4 +- .../src/test/resources/realmb/idp-servlet.xml | 4 +- .../src/test/resources/realmb/security-config.xml | 4 +- .../src/test/resources/realma/entities-realma.xml | 4 +- .../src/test/resources/realma/entities-realma.xml | 4 +- .../jetty9/src/test/resources/realma/fediz-sts.xml | 4 +- .../src/test/resources/sts/cxf-transport.xml | 4 +- .../kerberos/src/test/resources/sts/kerberos.xml | 4 +- .../src/test/resources/sts/userClaimsKerberos.xml | 4 +- .../ldap/src/test/resources/sts/cxf-transport.xml | 4 +- systests/ldap/src/test/resources/sts/ldap.xml | 4 +- .../cxf/fediz/systests/oidc/AbstractOIDCTest.java | 69 +- .../src/test/resources/oidc/applicationContext.xml | 4 +- .../oidc/src/test/resources/oidc/data-manager.xml | 4 +- .../resources/oidc/spring/applicationContext.xml | 4 +- .../src/test/resources/realma/entities-realma.xml | 4 +- .../src/test/resources/realma/entities-realma.xml | 4 +- .../src/test/resources
[cxf] branch master updated: cleanup unused properties in parent pom
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 bbfd114 cleanup unused properties in parent pom
bbfd114 is described below
commit bbfd114ccc7bdbe9c09f1048a8fac13ece19d61e
Author: Alexey Markevich
AuthorDate: Wed Nov 10 01:07:33 2021 +0300
cleanup unused properties in parent pom
---
parent/pom.xml | 33 -
1 file changed, 33 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index be318f1..0c59c82 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -111,7 +111,6 @@
1.1.1
1.4
1.1.1
-1.2
3.1.4
1.0.14
1.1.4
@@ -970,10 +969,6 @@
${cxf.neethi.version}
-javax.servlet
-servlet-api
-
-
org.apache.ws.commons.axiom
axiom-impl
@@ -994,10 +989,6 @@
wstx-asl
-wsdl4j
-wsdl4j
-
-
org.codehaus.woodstox
woodstox-core-asl
@@ -1227,10 +1218,6 @@
${cxf.spring.version}
-javax.servlet
-servlet-api
-
-
logkit
logkit
@@ -1250,10 +1237,6 @@
${cxf.spring.version}
-javax.servlet
-servlet-api
-
-
logkit
logkit
@@ -1273,10 +1256,6 @@
${cxf.spring.version}
-javax.servlet
-servlet-api
-
-
logkit
logkit
@@ -1296,10 +1275,6 @@
${cxf.spring.version}
-javax.servlet
-servlet-api
-
-
logkit
logkit
@@ -1319,10 +1294,6 @@
${cxf.spring.version}
-javax.servlet
-servlet-api
-
-
logkit
logkit
@@ -1342,10 +1313,6 @@
${cxf.spring.version}
-javax.servlet
-servlet-api
-
-
logkit
logkit
[cxf-fediz] branch master updated: fix CI build url
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-fediz.git The following commit(s) were added to refs/heads/master by this push: new 0833be5 fix CI build url 0833be5 is described below commit 0833be5a034c3b441c0f8483a07cfd5b41f67982 Author: Alexey Markevich AuthorDate: Wed Nov 10 00:51:05 2021 +0300 fix CI build url --- pom.xml | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index e201f75..ad6f718 100644 --- a/pom.xml +++ b/pom.xml @@ -99,8 +99,8 @@ scm:git:https://gitbox.apache.org/repos/asf/cxf-fediz.git scm:git:https://gitbox.apache.org/repos/asf/cxf-fediz.git - HEAD - +HEAD + jira @@ -233,11 +233,10 @@ - -Hudson -https://builds.apache.org/view/A-D/view/CXF/job/CXF-Fediz/ +Jenkins +https://ci-builds.apache.org/job/CXF/job/CXF-Fediz/ mail
[cxf-fediz] branch master updated: back maven-pmd-plugin
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-fediz.git The following commit(s) were added to refs/heads/master by this push: new 0e3aeb7 back maven-pmd-plugin 0e3aeb7 is described below commit 0e3aeb74e798bce67d97f848b69bc62f563ad992 Author: Alexey Markevich AuthorDate: Thu Nov 4 10:25:30 2021 +0300 back maven-pmd-plugin --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c27a41a..e201f75 100644 --- a/pom.xml +++ b/pom.xml @@ -491,7 +491,7 @@ org.apache.maven.plugins maven-pmd-plugin -3.15.0 +3.14.0 org.apache.cxf.build-utils
[cxf-fediz] branch master updated (2d4d0e5 -> 2214002)
This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git. from 2d4d0e5 Fixing buildtools new a8b5f30 update maven-dependency-plugin to 3.2.0 new 2214002 fediz-systests-oidc: fix pmd warning 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: pom.xml| 4 +-- .../cxf/fediz/systests/oidc/AbstractOIDCTest.java | 34 +++--- 2 files changed, 19 insertions(+), 19 deletions(-)
[cxf-fediz] 02/02: fediz-systests-oidc: fix pmd warning
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-fediz.git
commit 22140022cba22bfcae1709d1250ef408e53d3d34
Author: Alexey Markevich
AuthorDate: Thu Nov 4 10:14:48 2021 +0300
fediz-systests-oidc: fix pmd warning
---
.../cxf/fediz/systests/oidc/AbstractOIDCTest.java | 34 +++---
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git
a/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/AbstractOIDCTest.java
b/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/AbstractOIDCTest.java
index 3513cdd..70e23f9 100644
---
a/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/AbstractOIDCTest.java
+++
b/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/AbstractOIDCTest.java
@@ -264,8 +264,8 @@ abstract class AbstractOIDCTest {
private static String getClientIdByName(String clientName, HtmlPage
registeredClientsPage) {
final HtmlTable table =
registeredClientsPage.getHtmlElementById("registered_clients");
for (final HtmlTableRow row : table.getRows()) {
-if (clientName.equals(row.getCell(0).asText())) {
-final String clientId = row.getCell(1).asText();
+if (clientName.equals(row.getCell(0).asNormalizedText())) {
+final String clientId = row.getCell(1).asNormalizedText();
assertNotNull(clientId);
return clientId;
}
@@ -275,8 +275,8 @@ abstract class AbstractOIDCTest {
private static String getClientSecret(final HtmlPage registeredClientPage,
String clientId) throws IOException {
final HtmlTable table =
registeredClientPage.getHtmlElementById("client");
-assertEquals(clientId, table.getCellAt(1, 0).asText());
-return table.getCellAt(1, 2).asText();
+assertEquals(clientId, table.getCellAt(1, 0).asNormalizedText());
+return table.getCellAt(1, 2).asNormalizedText();
}
private static HtmlPage registerConfidentialClient(HtmlPage registerPage,
@@ -319,9 +319,9 @@ abstract class AbstractOIDCTest {
// Get the client identifier
HtmlTable table =
registeredClientsPage.getHtmlElementById("registered_clients");
-String clientId = table.getCellAt(1, 1).asText();
+String clientId = table.getCellAt(1, 1).asNormalizedText();
assertNotNull(clientId);
-String clientId2 = table.getCellAt(2, 1).asText();
+String clientId2 = table.getCellAt(2, 1).asNormalizedText();
assertNotNull(clientId2);
// Now go to the specific client page
@@ -367,18 +367,18 @@ abstract class AbstractOIDCTest {
assertEquals(table.getRows().size(), 3);
// Now check the first client
-String clientId = table.getCellAt(1, 1).asText();
+String clientId = table.getCellAt(1, 1).asNormalizedText();
assertNotNull(clientId);
// Check the Date
-String date = table.getCellAt(1, 2).asText();
+String date = table.getCellAt(1, 2).asNormalizedText();
SimpleDateFormat dateFormat = new SimpleDateFormat("dd MMM ",
Locale.US);
dateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
assertEquals(dateFormat.format(new Date()), date);
// Check the redirect URI
-String redirectURI = table.getCellAt(1, 3).asText().trim(); //
-assertTrue(REDIRECT_URL.equals(redirectURI));
+String redirectURI = table.getCellAt(1,
3).asNormalizedText().trim(); //
+assertEquals(REDIRECT_URL, redirectURI);
}
}
@@ -414,7 +414,7 @@ abstract class AbstractOIDCTest {
assertEquals("2 clients", table.getRows().size(), 3);
boolean updatedClientFound = false;
for (final HtmlTableRow row : table.getRows()) {
-if (newClientName.equals(row.getCell(0).asText())) {
+if (newClientName.equals(row.getCell(0).asNormalizedText())) {
updatedClientFound = true;
break;
}
@@ -539,7 +539,7 @@ abstract class AbstractOIDCTest {
// Now try to register a new client
HtmlPage errorPage = registerConfidentialClient(registerPage,
"asfxyz", "https://127.0.0.1//;,
"https://cxf.apache.org;, "https://localhost:12345;);
-assertTrue(errorPage.asText().contains("Invalid Client
Registration"));
+assertTrue(errorPage.asNormalizedText().contains("Invalid Client
Registration"));
}
}
@@ -552,7 +552,7 @@ abstract class AbstractOIDCTest {
// Now try to register a new client
[cxf-fediz] 01/02: update maven-dependency-plugin to 3.2.0
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-fediz.git commit a8b5f300724084634322ca4d7aeaf4fb6c2c03a5 Author: Alexey Markevich AuthorDate: Thu Nov 4 10:10:55 2021 +0300 update maven-dependency-plugin to 3.2.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7fb4833..c27a41a 100644 --- a/pom.xml +++ b/pom.xml @@ -376,7 +376,7 @@ org.apache.maven.plugins maven-dependency-plugin -3.1.2 +3.2.0 org.apache.maven.plugins @@ -491,7 +491,7 @@ org.apache.maven.plugins maven-pmd-plugin -3.14.0 +3.15.0 org.apache.cxf.build-utils
[cxf] branch master updated: cxf-rt-rs-security-oauth2: fix 'scope' jwt claim format (#871)
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 03110cf cxf-rt-rs-security-oauth2: fix 'scope' jwt claim format (#871)
03110cf is described below
commit 03110cf694be67611ea28e6d6cdefa0dd462e302
Author: Alexey Markevich
AuthorDate: Thu Nov 4 07:05:57 2021 +
cxf-rt-rs-security-oauth2: fix 'scope' jwt claim format (#871)
https://datatracker.ietf.org/doc/html/rfc8693#section-4.2
---
.../cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java| 4 ++--
.../systest/jaxrs/security/oauth2/filters/OAuth2JwtFiltersTest.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
index 4eb4d17..01365eb 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
@@ -139,9 +139,9 @@ public abstract class AbstractOAuthDataProvider implements
OAuthDataProvider, Cl
if (at.getIssuer() != null) {
claims.setIssuer(at.getIssuer());
}
-if (!at.getScopes().isEmpty()) {
+if (!at.getScopes().isEmpty()) { // rfc8693, section 4.2
claims.setClaim(OAuthConstants.SCOPE,
-
OAuthUtils.convertPermissionsToScopeList(at.getScopes()));
+
OAuthUtils.convertListOfScopesToString(OAuthUtils.convertPermissionsToScopeList(at.getScopes(;
}
// OAuth2 resource indicators (resource server audience)
if (!at.getAudiences().isEmpty()) {
diff --git
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/filters/OAuth2JwtFiltersTest.java
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/filters/OAuth2JwtFiltersTest.java
index 2e2d450..c3324c1 100644
---
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/filters/OAuth2JwtFiltersTest.java
+++
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/filters/OAuth2JwtFiltersTest.java
@@ -136,7 +136,7 @@ public class OAuth2JwtFiltersTest extends
AbstractBusClientServerTestBase {
JwtClaims claims = jwtConsumer.getJwtClaims();
assertEquals("consumer-id",
claims.getStringProperty(OAuthConstants.CLIENT_ID));
assertEquals("alice", claims.getStringProperty("username"));
-
assertTrue(claims.getListStringProperty(OAuthConstants.SCOPE).contains(scope));
+
assertTrue(claims.getStringProperty(OAuthConstants.SCOPE).contains(scope));
// Now invoke on the service with the access token
WebClient client = WebClient.create(rsAddress,
OAuth2TestUtils.setupProviders())
.authorization(new ClientAccessToken(BEARER_AUTHORIZATION_SCHEME,
accessToken.getTokenKey()));
[cxf-fediz] branch master updated: Upgrade to Maven War Plugin 3.3.2
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-fediz.git The following commit(s) were added to refs/heads/master by this push: new ccab6cc Upgrade to Maven War Plugin 3.3.2 ccab6cc is described below commit ccab6cc0fb3e15ddb2063694cb730ca58c781217 Author: Alexey Markevich AuthorDate: Fri Sep 24 01:00:03 2021 +0300 Upgrade to Maven War Plugin 3.3.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d4ca5c7..4c3b8f6 100644 --- a/pom.xml +++ b/pom.xml @@ -629,7 +629,7 @@ org.apache.maven.plugins maven-war-plugin -3.3.1 +3.3.2
[cxf-fediz] 02/04: update commons-dbcp2 to 2.9.0
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-fediz.git commit 5e05f00f23b3c05e6125f4e54b3539f4fd7b7ecb Author: Alexey Markevich AuthorDate: Thu Sep 16 09:25:41 2021 +0300 update commons-dbcp2 to 2.9.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 86a50d6..b83fc5f 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 2.0.0.AM26 2.0.3 -2.8.0 +2.9.0 1.2 1.9 1.7
[cxf-fediz] 04/04: Update Spring Framework to 5.3.10
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-fediz.git commit 4b68fe70d854827196187602b699bab99678ede0 Author: Alexey Markevich AuthorDate: Thu Sep 16 09:19:34 2021 +0300 Update Spring Framework to 5.3.10 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2c68bf6..ccd718a 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ 3.2.0 3.1.0 1.7.30 -5.3.9 +5.3.10 2.3.4.RELEASE 5.5.2 2.5.1.RELEASE
[cxf-fediz] branch master updated (c483ef8 -> 4b68fe7)
This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git. from c483ef8 Updating Tomcat to 9.0.53 new c468874 update htmlunit to 2.52.0 new 5e05f00 update commons-dbcp2 to 2.9.0 new f658190 update openjpa to 3.2.0 new 4b68fe7 Update Spring Framework to 5.3.10 The 4 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: pom.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-)
[cxf-fediz] 01/04: update htmlunit to 2.52.0
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-fediz.git commit c4688748818e43448443f42651708f264c9b290a Author: Alexey Markevich AuthorDate: Thu Sep 16 09:22:57 2021 +0300 update htmlunit to 2.52.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1fa2c03..86a50d6 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ 3.8.1 1.1.1 2.5.2 -2.47.1 +2.52.0 2.11.4 2.3.3 9.4.43.v20210629
[cxf-fediz] 03/04: update openjpa to 3.2.0
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-fediz.git commit f658190fbe44301fc69210578eb3c33eaed5ae63 Author: Alexey Markevich AuthorDate: Thu Sep 16 09:26:40 2021 +0300 update openjpa to 3.2.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b83fc5f..2c68bf6 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 4.13.2 2.0.1 1.2.17 -3.1.2 +3.2.0 3.1.0 1.7.30 5.3.9
[cxf] branch master updated (3c91d4a -> 178db0d)
This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git. from 3c91d4a Updating Tomcat to 9.0.50 add 178db0d update jexl to 3.2.1 (#824) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[cxf] branch master updated: Update Karaf to 4.3.2
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 63dcd46 Update Karaf to 4.3.2
63dcd46 is described below
commit 63dcd46765370f242d2c1a2db1689c6c0128a24d
Author: Alexey Markevich
AuthorDate: Tue May 18 23:13:20 2021 +0300
Update Karaf to 4.3.2
---
osgi/karaf/features/src/main/resources/org.apache.karaf.features.xml | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/osgi/karaf/features/src/main/resources/org.apache.karaf.features.xml
b/osgi/karaf/features/src/main/resources/org.apache.karaf.features.xml
index ebf40d5..cadaebb 100644
--- a/osgi/karaf/features/src/main/resources/org.apache.karaf.features.xml
+++ b/osgi/karaf/features/src/main/resources/org.apache.karaf.features.xml
@@ -20,7 +20,7 @@
http://karaf.apache.org/xmlns/features-processing/v1.0.0;
xmlns:f="http://karaf.apache.org/xmlns/features/v1.6.0;>
-
+
mvn:org.apache.cxf/cxf-servlet-compatible/${project.version}
diff --git a/parent/pom.xml b/parent/pom.xml
index bd6f2c5..772ee20 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -244,7 +244,7 @@
2.3.2_1
none
1.1_4
-4.3.1
+4.3.2
20100527_1
2.0.8_6
[1.4,2)
[cxf-fediz] branch master updated (49b227e -> d8a7aef)
This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git. from 49b227e Updating Tomcat to 9.0.46 new b75faa8 Update Spring LDAP to 2.3.4.RELEASE new d8a7aef Upgrade to Glassfish Jaxb 2.3.3 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: pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[cxf-fediz] 01/02: Update Spring LDAP to 2.3.4.RELEASE
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-fediz.git commit b75faa80b2911811134800e35b66aa95e66c0be1 Author: Alexey Markevich AuthorDate: Mon May 17 10:08:58 2021 +0300 Update Spring LDAP to 2.3.4.RELEASE --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a99b7a0..266db93 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ 3.1.0 1.7.30 4.3.30.RELEASE -2.3.3.RELEASE +2.3.4.RELEASE 4.2.20.RELEASE 2.5.1.RELEASE 9.0.46
[cxf-fediz] 02/02: Upgrade to Glassfish Jaxb 2.3.3
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-fediz.git commit d8a7aef366086ccfbf35d1e59c2509c4824e8b65 Author: Alexey Markevich AuthorDate: Mon May 17 10:10:39 2021 +0300 Upgrade to Glassfish Jaxb 2.3.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 266db93..1ba034a 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ 2.5.2 2.47.1 2.11.4 -2.3.2 +2.3.3 9.4.40.v20210413 4.13.2 2.0.1
[cxf] branch master updated: Upgrade to Jakarta Mail 1.6.7
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 1cb2a5f Upgrade to Jakarta Mail 1.6.7
1cb2a5f is described below
commit 1cb2a5fe44e390cf2106b07d8b6a8b5fffcda3e7
Author: Alexey Markevich
AuthorDate: Fri Apr 23 01:26:47 2021 +0300
Upgrade to Jakarta Mail 1.6.7
---
core/pom.xml | 4 ++--
distribution/src/main/release/samples/mtom/pom.xml | 4 ++--
parent/pom.xml | 8
rt/bindings/soap/pom.xml | 4 ++--
rt/frontend/jaxrs/pom.xml | 4 ++--
rt/frontend/jaxws/pom.xml | 4 ++--
systests/container-integration/grizzly/pom.xml | 4 ++--
systests/jaxws/pom.xml | 4 ++--
systests/transport-jms/pom.xml | 4 ++--
systests/uncategorized/pom.xml | 4 ++--
testutils/pom.xml | 4 ++--
11 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 89b8e3e..dd2882c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -167,8 +167,8 @@
xmlschema-core
-org.apache.geronimo.javamail
-geronimo-javamail_1.4_mail
+com.sun.mail
+jakarta.mail
test
diff --git a/distribution/src/main/release/samples/mtom/pom.xml
b/distribution/src/main/release/samples/mtom/pom.xml
index d6d4bb2..664595e 100644
--- a/distribution/src/main/release/samples/mtom/pom.xml
+++ b/distribution/src/main/release/samples/mtom/pom.xml
@@ -129,8 +129,8 @@
3.5.0-SNAPSHOT
-org.apache.geronimo.javamail
-geronimo-javamail_1.4_mail
+com.sun.mail
+jakarta.mail
diff --git a/parent/pom.xml b/parent/pom.xml
index 94904d5..8c4b2e0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -239,7 +239,7 @@
1.2.18_1
1.2.4
3.0.7
-1.6.5
+1.6.7
1.9.3_1
2.3.2_1
none
@@ -1620,9 +1620,9 @@
${cxf.servlet-api.version}
-org.apache.geronimo.javamail
-geronimo-javamail_1.4_mail
-1.8.4
+com.sun.mail
+jakarta.mail
+${cxf.jakarta.mail.version}
org.apache.geronimo.specs
diff --git a/rt/bindings/soap/pom.xml b/rt/bindings/soap/pom.xml
index 356cec6..cf4ae92 100644
--- a/rt/bindings/soap/pom.xml
+++ b/rt/bindings/soap/pom.xml
@@ -93,8 +93,8 @@
test
-org.apache.geronimo.javamail
-geronimo-javamail_1.4_mail
+com.sun.mail
+jakarta.mail
test
diff --git a/rt/frontend/jaxrs/pom.xml b/rt/frontend/jaxrs/pom.xml
index 7783020..d84333d 100644
--- a/rt/frontend/jaxrs/pom.xml
+++ b/rt/frontend/jaxrs/pom.xml
@@ -171,8 +171,8 @@
test
-org.apache.geronimo.javamail
-geronimo-javamail_1.4_mail
+com.sun.mail
+jakarta.mail
test
diff --git a/rt/frontend/jaxws/pom.xml b/rt/frontend/jaxws/pom.xml
index df8855a..e33ea18 100644
--- a/rt/frontend/jaxws/pom.xml
+++ b/rt/frontend/jaxws/pom.xml
@@ -188,8 +188,8 @@
true
-org.apache.geronimo.javamail
-geronimo-javamail_1.4_mail
+com.sun.mail
+jakarta.mail
test
diff --git a/systests/container-integration/grizzly/pom.xml
b/systests/container-integration/grizzly/pom.xml
index 39d2279..6361f36 100644
--- a/systests/container-integration/grizzly/pom.xml
+++ b/systests/container-integration/grizzly/pom.xml
@@ -76,8 +76,8 @@
test
-org.apache.geronimo.javamail
-geronimo-javamail_1.4_mail
+com.sun.mail
+jakarta.mail
test
diff --git a/systests/jaxws/pom.xml b/systests/jaxws/pom.xml
index 5eed267..de97669 100644
--- a/systests/jaxws/pom.xml
+++ b/systests/jaxws/pom.xml
@@ -87,8 +87,8 @@
-org.apache.geronimo.javamail
-geronimo-javamail_1.4_mail
+com.sun.mail
+jakarta.mail
org.apache.cxf
diff --git a/systests/transport-jms/pom.xml b/systests/transport-jms/pom.xml
index 7231aee..a0b1806 100644
--- a/systests/transport-jms/pom.xml
+++ b/systests/transport-jms/pom.xml
@@ -215,8 +215,8 @@
${cxf.spring.version}
-org.apache.geronimo.javamail
[cxf] 03/03: Upgrade to SAAJ Impl 1.5.3
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 commit b8a2f139f8a4f80a90ef49c2a0757395cb303be6 Author: Alexey Markevich AuthorDate: Thu Apr 22 23:33:31 2021 +0300 Upgrade to SAAJ Impl 1.5.3 --- distribution/src/main/release/samples/pom.xml | 2 +- parent/pom.xml| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml index 296d8c4..1936866 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -280,7 +280,7 @@ com.sun.xml.messaging.saaj saaj-impl -1.5.2 +1.5.3 runtime diff --git a/parent/pom.xml b/parent/pom.xml index 6a47a15..94904d5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -187,7 +187,7 @@ 1.3.8 2.2.21 3.0.12 -1.5.2 +1.5.3 jakarta.servlet-api jakarta.servlet 4.0.4
[cxf] 01/03: fix PMD rule: UnusedAssignment
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
commit 9940b6f38d5380fc150cf6409c99197a595c840a
Author: Alexey Markevich
AuthorDate: Thu Apr 22 23:31:40 2021 +0300
fix PMD rule: UnusedAssignment
---
.../java/org/apache/cxf/karaf/commands/ListEndpointsCommand.java | 7 +++
.../main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java | 3 +--
.../src/main/java/org/apache/cxf/wsn/AbstractSubscription.java | 4 +---
.../src/main/java/org/apache/cxf/wsn/jms/JmsCreatePullPoint.java | 2 +-
.../src/main/java/org/apache/cxf/wsn/jms/JmsPullPoint.java | 2 +-
.../org/apache/cxf/xkms/crypto/provider/XkmsCryptoProvider.java| 5 ++---
.../org/apache/cxf/xkms/x509/repo/file/FileCertificateRepo.java| 5 ++---
.../org/apache/cxf/xkms/x509/repo/ldap/LdapCertificateRepo.java| 3 +--
8 files changed, 12 insertions(+), 19 deletions(-)
diff --git
a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListEndpointsCommand.java
b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListEndpointsCommand.java
index 5f8d78e..cd7e16c 100644
---
a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListEndpointsCommand.java
+++
b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListEndpointsCommand.java
@@ -112,10 +112,9 @@ public class ListEndpointsCommand extends CXFController
implements Action {
private String toFullAddress(String address) throws IOException,
InvalidSyntaxException {
ConfigurationAdmin configAdmin = getConfigAdmin();
if (address.startsWith("/") && configAdmin != null) {
-String httpPort = null;
-String cxfContext = null;
-httpPort = extractConfigProperty(configAdmin, "org.ops4j.pax.web",
"org.osgi.service.http.port");
-cxfContext = extractConfigProperty(configAdmin,
"org.apache.cxf.osgi", "org.apache.cxf.servlet.context");
+String httpPort = extractConfigProperty(configAdmin,
"org.ops4j.pax.web", "org.osgi.service.http.port");
+String cxfContext =
+extractConfigProperty(configAdmin, "org.apache.cxf.osgi",
"org.apache.cxf.servlet.context");
if (StringUtils.isEmpty(cxfContext)) {
cxfContext = getCXFOSGiServletContext();
}
diff --git
a/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java
b/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java
index 4cfb292..da5b8ff 100644
---
a/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java
+++
b/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java
@@ -214,8 +214,7 @@ public class WSDiscoveryClient implements Closeable {
if (StringUtils.isEmpty(uri.getHost())) {
adHoc = true;
} else {
-InetSocketAddress isa = null;
-isa = new InetSocketAddress(uri.getHost(), uri.getPort());
+InetSocketAddress isa = new InetSocketAddress(uri.getHost(),
uri.getPort());
if (isa.getAddress().isMulticastAddress()) {
adHoc = true;
}
diff --git
a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractSubscription.java
b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractSubscription.java
index f8af823..2984f03 100644
---
a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractSubscription.java
+++
b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractSubscription.java
@@ -375,10 +375,8 @@ public abstract class AbstractSubscription extends
AbstractEndpoint implements P
// Check policy
if (subscribeRequest.getSubscriptionPolicy() != null) {
for (Object p : subscribeRequest.getSubscriptionPolicy().getAny())
{
-JAXBElement e = null;
if (p instanceof JAXBElement) {
-e = (JAXBElement) p;
-p = e.getValue();
+p = ((JAXBElement) p).getValue();
}
if (p instanceof UseRaw) {
useRaw = true;
diff --git
a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsCreatePullPoint.java
b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsCreatePullPoint.java
index a915d12..e6af9a0 100644
---
a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsCreatePullPoint.java
+++
b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsCreatePullPoint.java
@@ -58,7 +58,7 @@ public class JmsCreatePullPoint extends
AbstractCreatePullPoint {
[cxf] 02/03: Upgrade to Glassfish JAXB 2.3.4
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
commit e671095fbb2576e6e5a01d860951c3aa84968c80
Author: Alexey Markevich
AuthorDate: Thu Apr 22 23:32:53 2021 +0300
Upgrade to Glassfish JAXB 2.3.4
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 3b05d5f..6a47a15 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -138,7 +138,7 @@
3.25.0-GA
1.3.5
2.1.6
-
${cxf.jaxb.version}
+2.3.4
2.3.3
${cxf.jaxb.runtime.version}
3.3.0.Final
[cxf] branch master updated (dc2b6cc -> b8a2f13)
This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git. from dc2b6cc cxf-services-sts-core: fix PMD rule: UnusedAssignment new 9940b6f fix PMD rule: UnusedAssignment new e671095 Upgrade to Glassfish JAXB 2.3.4 new b8a2f13 Upgrade to SAAJ Impl 1.5.3 The 3 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: distribution/src/main/release/samples/pom.xml | 2 +- .../java/org/apache/cxf/karaf/commands/ListEndpointsCommand.java | 7 +++ parent/pom.xml | 4 ++-- .../main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java | 3 +-- .../src/main/java/org/apache/cxf/wsn/AbstractSubscription.java | 4 +--- .../src/main/java/org/apache/cxf/wsn/jms/JmsCreatePullPoint.java | 2 +- .../src/main/java/org/apache/cxf/wsn/jms/JmsPullPoint.java | 2 +- .../org/apache/cxf/xkms/crypto/provider/XkmsCryptoProvider.java| 5 ++--- .../org/apache/cxf/xkms/x509/repo/file/FileCertificateRepo.java| 5 ++--- .../org/apache/cxf/xkms/x509/repo/ldap/LdapCertificateRepo.java| 3 +-- 10 files changed, 15 insertions(+), 22 deletions(-)
[cxf] branch master updated: cxf-services-sts-core: fix PMD rule: UnusedAssignment
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 dc2b6cc cxf-services-sts-core: fix PMD rule: UnusedAssignment
dc2b6cc is described below
commit dc2b6cc5cc1164f6bb45049bec2373032411f54a
Author: Alexey Markevich
AuthorDate: Wed Apr 21 03:40:48 2021 +0300
cxf-services-sts-core: fix PMD rule: UnusedAssignment
---
.../cxf/sts/cache/AbstractIdentityCache.java | 2 +-
.../apache/cxf/sts/cache/HazelCastTokenStore.java | 2 +-
.../org/apache/cxf/sts/claims/ClaimsManager.java | 4 +-
.../apache/cxf/sts/claims/LdapClaimsHandler.java | 2 +-
.../cxf/sts/claims/LdapGroupClaimsHandler.java | 4 +-
.../java/org/apache/cxf/sts/claims/LdapUtils.java | 8 ++--
.../apache/cxf/sts/event/map/MapEventLogger.java | 52 +++---
.../cxf/sts/operation/TokenIssueOperation.java | 6 +--
.../cxf/sts/operation/TokenRenewOperation.java | 6 +--
.../cxf/sts/operation/TokenValidateOperation.java | 6 +--
.../org/apache/cxf/sts/request/RequestParser.java | 2 +-
.../sts/token/provider/DefaultSubjectProvider.java | 4 +-
.../cxf/sts/token/provider/SAMLTokenProvider.java | 6 +--
.../sts/token/provider/SymmetricKeyHandler.java| 2 +-
.../provider/jwt/DefaultJWTClaimsProvider.java | 4 +-
.../sts/token/provider/jwt/JWTTokenProvider.java | 5 +--
.../cxf/sts/token/renewer/SAMLTokenRenewer.java| 6 +--
.../sts/token/validator/SAMLTokenValidator.java| 6 +--
.../token/validator/UsernameTokenValidator.java| 2 +-
.../sts/token/validator/X509TokenValidator.java| 2 +-
.../token/validator/jwt/DefaultJWTRoleParser.java | 2 +-
.../cxf/sts/common/CustomUserClaimsHandler.java| 4 +-
.../apache/cxf/sts/service/StaticServiceTest.java | 4 +-
.../sts/token/provider/SAMLProviderRealmTest.java | 1 -
.../token/validator/X509TokenValidatorTest.java| 3 +-
25 files changed, 69 insertions(+), 76 deletions(-)
diff --git
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/AbstractIdentityCache.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/AbstractIdentityCache.java
index ffc6bcf..011457a 100644
---
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/AbstractIdentityCache.java
+++
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/AbstractIdentityCache.java
@@ -51,7 +51,7 @@ public abstract class AbstractIdentityCache implements
IdentityCache, IdentityMa
public Principal mapPrincipal(String sourceRealm,
Principal sourcePrincipal, String targetRealm) {
-Principal targetPrincipal = null;
+final Principal targetPrincipal;
Map identities = this.get(sourcePrincipal.getName(),
sourceRealm);
if (identities != null) {
if (LOG.isLoggable(Level.FINE)) {
diff --git
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/HazelCastTokenStore.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/HazelCastTokenStore.java
index de35d3b..68fe914 100644
---
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/HazelCastTokenStore.java
+++
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/HazelCastTokenStore.java
@@ -123,7 +123,7 @@ public class HazelCastTokenStore implements TokenStore {
}
private int getTTL(SecurityToken token) {
-int parsedTTL = 0;
+int parsedTTL;
if (token.getExpires() != null) {
Instant expires = token.getExpires();
Instant now = Instant.now();
diff --git
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
index d6210c7..acddaa5 100644
---
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
+++
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
@@ -163,7 +163,7 @@ public class ClaimsManager {
// Consider refactoring to use a CallbackHandler and keep
ClaimsManager token independent
SamlAssertionWrapper assertion =
(SamlAssertionWrapper)parameters.getAdditionalProperties().get(SamlAssertionWrapper.class.getName());
-List claimList = null;
+final List claimList;
if (assertion.getSamlVersion().equals(SAMLVersion.VERSION_20)) {
claimList = this.parseClaimsInAssertion(assertion.getSaml2());
} else {
@@ -240,7 +240,7 @@ public class ClaimsManager {
// do an identity mapping
if (handlerRealmSupport.getHandlerRealm() != null
&&
!handlerRealmSupport.getHandlerRealm().equalsIgnoreCase(parameters.getRealm()))
{
-Principal targetPrincipal = null;
+final Principal targetPrincipal;
[cxf-fediz] branch master updated: Upgrade to HSQLDB 2.5.2
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-fediz.git The following commit(s) were added to refs/heads/master by this push: new 53a5624 Upgrade to HSQLDB 2.5.2 53a5624 is described below commit 53a56245b1309b0c83a855b39aa98a090273c6d7 Author: Alexey Markevich AuthorDate: Thu Apr 15 20:36:29 2021 +0300 Upgrade to HSQLDB 2.5.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 01b626a..4325f18 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ 4.0.2 3.8.1 1.1.1 -2.5.1 +2.5.2 2.47.1 2.11.4 2.3.2
[cxf] branch master updated: JAXRSServerFactoryBeanDefinitionParser: fix scan condition
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 a06d000 JAXRSServerFactoryBeanDefinitionParser: fix scan condition
a06d000 is described below
commit a06d00066c88077a1cf25766b841bd8f6cabb027
Author: Alexey Markevich
AuthorDate: Wed Apr 7 15:43:52 2021 +0300
JAXRSServerFactoryBeanDefinitionParser: fix scan condition
revert 31d685f1ea2d0af72c0d4a0cbf99bd86e7e55f3a
---
.../JAXRSServerFactoryBeanDefinitionParser.java| 2 +-
.../systest/sts/basic_auth/JaxrsBasicAuthTest.java | 31 +---
.../org/apache/cxf/systest/sts/jaas/JAASTest.java | 42 --
3 files changed, 25 insertions(+), 50 deletions(-)
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
index e2e182e..2115f6d 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
@@ -237,7 +237,7 @@ public class JAXRSServerFactoryBeanDefinitionParser extends
AbstractBeanDefiniti
throw new BeanCreationException("Failed to create bean
from classfile", ex);
}
} else if (serviceAnnotationClass != null
-|| !serviceBeansAvailable && !providerBeansAvailable &&
!resourceProvidersAvailable) {
+&& !serviceBeansAvailable && !providerBeansAvailable &&
!resourceProvidersAvailable) {
discoverContextResources(serviceAnnotationClass);
}
if (bus == null) {
diff --git
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxrsBasicAuthTest.java
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxrsBasicAuthTest.java
index f9b726b..0a19a7e 100644
---
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxrsBasicAuthTest.java
+++
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxrsBasicAuthTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.cxf.systest.sts.basic_auth;
-import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.InternalServerErrorException;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.systest.sts.deployment.STSServer;
@@ -62,23 +62,20 @@ public class JaxrsBasicAuthTest extends
AbstractBusClientServerTestBase {
@org.junit.Test
public void testBasicAuth() throws Exception {
-
-doubleIt("alice", "clarinet", false);
+doubleIt("alice", "clarinet");
}
-@org.junit.Test(expected = RuntimeException.class)
+@org.junit.Test(expected = InternalServerErrorException.class)
public void testBadBasicAuth() throws Exception {
-
-doubleIt("alice", "trombon", true);
+doubleIt("alice", "trombon");
}
-@org.junit.Test(expected = RuntimeException.class)
+@org.junit.Test(expected = InternalServerErrorException.class)
public void testNoBasicAuth() throws Exception {
-
-doubleIt(null, null, true);
+doubleIt(null, null);
}
-private static void doubleIt(String username, String password, boolean
authFailureExpected) {
+private static void doubleIt(String username, String password) {
final String configLocation =
"org/apache/cxf/systest/sts/basic_auth/cxf-client.xml";
final String address = "https://localhost:; + PORT +
"/doubleit/services/doubleit-rs";
final int numToDouble = 25;
@@ -90,17 +87,7 @@ public class JaxrsBasicAuthTest extends
AbstractBusClientServerTestBase {
client = WebClient.create(address, configLocation);
}
client.type("text/plain").accept("text/plain");
-try {
-int resp = client.post(numToDouble, Integer.class);
-if (authFailureExpected) {
-throw new RuntimeException("Exception expected");
-}
-org.junit.Assert.assertEquals(2 * numToDouble, resp);
-} catch (WebApplicationException ex) {
-if (!authFailureExpected) {
-throw new RuntimeException("Unexpected exception");
-}
-org.junit.Assert.assertEquals(500, ex.getResponse().getStatus());
-}
+int resp = client.post(numToDouble, Integer.class);
+org.junit.Assert.assertEquals(2 * numToDouble, resp);
}
}
diff --git
[cxf] branch master updated: cxf-core: back flip() to ReaderInputStream
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 a88e9d4 cxf-core: back flip() to ReaderInputStream
a88e9d4 is described below
commit a88e9d437b3a4e8630b33fa7d9e15a1a3bcd96c9
Author: Alexey Markevich
AuthorDate: Fri Apr 2 17:07:16 2021 +0300
cxf-core: back flip() to ReaderInputStream
---
.../main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java | 4 ++--
core/src/main/java/org/apache/cxf/io/ReaderInputStream.java | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git
a/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java
b/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java
index 034c8e2..0f3a579 100644
--- a/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java
+++ b/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java
@@ -60,8 +60,8 @@ import org.apache.ws.commons.schema.utils.XmlSchemaObjectBase;
*/
public class SchemaCollection {
-private XmlSchemaCollection xmlSchemaCollection;
-private Map>
xmlTypesCheckedForCrossImportsPerSchema
+private final XmlSchemaCollection xmlSchemaCollection;
+private final Map>
xmlTypesCheckedForCrossImportsPerSchema
= new HashMap<>();
public SchemaCollection() {
diff --git a/core/src/main/java/org/apache/cxf/io/ReaderInputStream.java
b/core/src/main/java/org/apache/cxf/io/ReaderInputStream.java
index 5bfed10..e95ed88 100644
--- a/core/src/main/java/org/apache/cxf/io/ReaderInputStream.java
+++ b/core/src/main/java/org/apache/cxf/io/ReaderInputStream.java
@@ -119,7 +119,9 @@ public class ReaderInputStream extends InputStream {
this.reader = reader;
this.encoder = encoder;
this.encoderIn = CharBuffer.allocate(bufferSize);
+encoderIn.flip();
this.encoderOut = ByteBuffer.allocate(128);
+encoderOut.flip();
}
/**
[cxf] branch master updated: very minor SonarLint (#762)
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 2c89d63 very minor SonarLint (#762) 2c89d63 is described below commit 2c89d63ad40544c7b346d252398f010ba3b50a66 Author: Alan AuthorDate: Fri Apr 2 09:07:35 2021 +0200 very minor SonarLint (#762) --- .../java/org/apache/cxf/annotations/Policy.java| 2 +- .../apache/cxf/annotations/WSDLDocumentation.java | 2 +- .../cxf/attachment/AttachmentDataSource.java | 2 +- .../cxf/attachment/AttachmentDeserializer.java | 15 ++-- .../cxf/attachment/AttachmentSerializer.java | 2 +- .../org/apache/cxf/attachment/AttachmentUtil.java | 18 ++-- .../apache/cxf/attachment/Base64DecoderStream.java | 6 +- .../apache/cxf/attachment/ContentDisposition.java | 8 +- .../cxf/attachment/LazyAttachmentCollection.java | 5 ++ .../cxf/attachment/MimeBodyPartInputStream.java| 2 + .../java/org/apache/cxf/bus/CXFBusFactory.java | 4 +- .../bus/blueprint/BundleDelegatingClassLoader.java | 4 + .../cxf/bus/blueprint/BusDefinitionParser.java | 4 + .../org/apache/cxf/bus/extension/Extension.java| 15 ++-- .../ServiceContractResolverRegistryImpl.java | 6 +- .../java/org/apache/cxf/bus/osgi/CXFActivator.java | 3 + .../cxf/bus/osgi/CXFExtensionBundleListener.java | 8 +- .../org/apache/cxf/bus/osgi/OSGIBusListener.java | 9 +- .../cxf/bus/resource/ResourceManagerImpl.java | 2 + .../apache/cxf/bus/spring/BusDefinitionParser.java | 12 +++ .../apache/cxf/bus/spring/BusEntityResolver.java | 8 +- .../cxf/bus/spring/BusExtensionPostProcessor.java | 2 + .../cxf/bus/spring/Jsr250BeanPostProcessor.java| 4 + .../apache/cxf/bus/spring/NamespaceHandler.java| 1 + .../java/org/apache/cxf/bus/spring/SpringBus.java | 2 + .../java/org/apache/cxf/common/i18n/Exception.java | 1 + .../apache/cxf/common/i18n/UncheckedException.java | 1 + .../cxf/common/injection/ResourceInjector.java | 5 +- .../common/logging/AbstractDelegatingLogger.java | 39 + .../org/apache/cxf/common/logging/LogUtils.java| 5 +- .../cxf/common/spi/ClassGeneratorClassLoader.java | 4 +- .../cxf/common/spi/NamespaceClassGenerator.java| 99 +++--- .../org/apache/cxf/common/util/ASMHelperImpl.java | 5 +- .../org/apache/cxf/common/util/CachedClass.java| 8 +- .../org/apache/cxf/common/util/ClassHelper.java| 3 +- .../apache/cxf/common/util/CollectionUtils.java| 6 +- .../common/util/ModCountCopyOnWriteArrayList.java | 2 + .../org/apache/cxf/common/util/PackageUtils.java | 1 - .../apache/cxf/common/util/ProxyClassLoader.java | 2 + .../org/apache/cxf/common/util/ProxyHelper.java| 2 +- .../common/util/ReflectionInvokationHandler.java | 2 + .../org/apache/cxf/common/util/SortedArraySet.java | 3 +- .../cxf/common/util/SpringClasspathScanner.java| 14 +-- .../org/apache/cxf/common/util/StreamPrinter.java | 1 + .../cxf/common/xmlschema/SchemaCollection.java | 60 ++--- .../configuration/jsse/TLSClientParameters.java| 1 + .../cxf/configuration/spring/ConfigurerImpl.java | 3 + .../cxf/databinding/source/SourceDataBinding.java | 1 + .../cxf/databinding/stax/StaxDataBinding.java | 2 + .../cxf/endpoint/AbstractConduitSelector.java | 2 +- .../org/apache/cxf/endpoint/ClientCallback.java| 2 +- .../java/org/apache/cxf/endpoint/ClientImpl.java | 6 +- .../org/apache/cxf/feature/FastInfosetFeature.java | 2 +- .../org/apache/cxf/feature/WrappedFeature.java | 4 + .../main/java/org/apache/cxf/headers/Header.java | 2 +- .../main/java/org/apache/cxf/helpers/DOMUtils.java | 6 +- .../interceptor/AbstractLoggingInterceptor.java| 1 + .../cxf/interceptor/AttachmentInInterceptor.java | 1 + .../cxf/interceptor/ClientOutFaultObserver.java| 1 + .../interceptor/InFaultChainInitiatorObserver.java | 1 + .../apache/cxf/interceptor/InterceptorChain.java | 2 +- .../org/apache/cxf/interceptor/LoggingMessage.java | 3 + .../interceptor/OneWayProcessorInterceptor.java| 2 + .../OutFaultChainInitiatorObserver.java| 1 + .../security/DefaultSecurityContext.java | 2 +- .../interceptor/security/JAASLoginInterceptor.java | 4 + .../cxf/internal/CXFAPINamespaceHandler.java | 3 + .../main/java/org/apache/cxf/io/CachedWriter.java | 10 +++ .../java/org/apache/cxf/io/ReaderInputStream.java | 11 +-- .../apache/cxf/io/WriteOnCloseOutputStream.java| 1 + .../java/org/apache/cxf/message/MessageUtils.java | 1 + .../java/org/apache/cxf/phase/PhaseChainCache.java | 5 +- .../apache/cxf/phase/PhaseInterceptorChain.java| 6 +- .../cxf/service/factory/FactoryBeanListener.java | 2 +- .../apache/cxf/service/invoker/FactoryInvoker.java | 1 + .../service/model
[cxf-fediz] branch master updated: update checkstyle & pmd plugins
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-fediz.git
The following commit(s) were added to refs/heads/master by this push:
new 06fdda5 update checkstyle & pmd plugins
06fdda5 is described below
commit 06fdda5c2905fafe2662cebb3de937206769542e
Author: Alexey Markevich
AuthorDate: Thu Apr 1 23:43:08 2021 +0300
update checkstyle & pmd plugins
---
.../cxf/fediz/example/FederationServlet.java | 16 +-
.../cxf/fediz/example/FederationServlet.java | 16 +-
.../cxf/fediz/example/FederationServlet.java | 12 +-
.../apache/cxf/fediz/core/config/FedizContext.java | 13 +-
.../cxf/fediz/core/handler/LogoutHandler.java | 2 +-
.../cxf/fediz/core/handler/SigninHandler.java | 2 +-
.../cxf/fediz/core/metadata/MetadataWriter.java| 30 +---
.../core/processor/FederationProcessorImpl.java| 5 +-
.../fediz/core/processor/SAMLProcessorImpl.java| 32 ++--
.../cxf/fediz/core/saml/SAMLTokenValidator.java| 26 ++-
.../samlsso/SAMLProtocolResponseValidator.java | 2 +-
.../org/apache/cxf/fediz/core/util/CertsUtils.java | 8 +-
.../apache/cxf/fediz/core/util/SignatureUtils.java | 2 +-
.../apache/cxf/fediz/core/util/StringUtils.java| 199 +
.../cxf/fediz/core/config/CallbackHandlerTest.java | 2 +-
.../fediz/core/config/FedizConfigurationTest.java | 2 +-
.../core/config/FedizConfigurationWriterTest.java | 2 +-
.../core/federation/FederationResponseTest.java| 2 +-
.../cxf/plugin/FedizRedirectBindingFilter.java | 4 +-
.../cxf/fediz/jetty9/FederationAuthenticator.java | 2 +-
.../cxf/fediz/jetty9/FederationLoginService.java | 2 +-
.../web/FederationAuthenticationEntryPoint.java| 2 +-
.../spring/web/FederationSignOutCleanupFilter.java | 2 +-
pom.xml| 6 +-
.../service/idp/STSKrbAuthenticationProvider.java | 6 +-
.../fediz/service/idp/beans/STSClientAction.java | 2 +-
.../idp/beans/samlsso/AuthnRequestParser.java | 32 ++--
.../beans/samlsso/SamlResponseErrorCreator.java| 2 +-
.../idp/kerberos/KerberosTokenValidator.java | 2 +-
.../idp/metadata/ServiceMetadataWriter.java| 1 -
.../protocols/TrustedIdpSAMLProtocolHandler.java | 19 +-
.../protocols/TrustedIdpWSFedProtocolHandler.java | 4 +-
.../idp/service/jpa/ApplicationDAOJPAImpl.java | 26 +--
.../service/idp/service/jpa/ClaimDAOJPAImpl.java | 16 +-
.../service/idp/service/jpa/DBLoaderImpl.java | 30 ++--
.../idp/service/jpa/EntitlementDAOJPAImpl.java | 16 +-
.../service/idp/service/jpa/IdpDAOJPAImpl.java | 44 ++---
.../service/idp/service/jpa/RoleDAOJPAImpl.java| 28 +--
.../idp/service/jpa/TrustedIdpDAOJPAImpl.java | 11 +-
.../service/idp/beans/STSClientActionTest.java | 25 +--
.../service/oidc/clients/ClientCodeGrants.java | 3 +-
.../fediz/service/oidc/clients/ClientTokens.java | 5 +-
.../fediz/service/oidc/logout/LogoutService.java | 5 +-
.../cxf/fediz/samlsso/example/BasicAuthFilter.java | 2 +-
.../apache/cxf/fediz/samlsso/example/SamlSso.java | 2 +-
.../cxf/fediz/systests/kerberos/KerberosTest.java | 2 +-
.../apache/cxf/fediz/systests/ldap/LDAPTest.java | 29 +--
.../java/org/apache/cxf/fediz/example/Service.java | 10 +-
.../cxf/fediz/example/FederationServlet.java | 13 +-
49 files changed, 209 insertions(+), 517 deletions(-)
diff --git
a/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
b/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
index f181b00..fda5dfe 100644
---
a/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
+++
b/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
@@ -92,19 +92,15 @@ public class FederationServlet extends HttpServlet {
Element el = SecurityTokenThreadLocal.getToken();
if (el != null) {
-out.println("Bootstrap token...");
-String token = null;
+out.println("Bootstrap token...");
try {
-TransformerFactory transFactory =
TransformerFactory.newInstance();
-Transformer transformer = transFactory.newTransformer();
-StringWriter buffer = new StringWriter();
+Transformer transformer =
TransformerFactory.newInstance().newTransformer();
transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION,
"yes");
-transformer.transform(new DOMSource(el),
- new StreamResult(buffer));
-token = buffer.toString();
-out.println("" + StringEscapeUtils.escapeXml11(token));
+
[cxf-fediz] branch master updated: upgrade to CXF 3.4.3 & WSS4J 2.3.1 (#62)
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-fediz.git
The following commit(s) were added to refs/heads/master by this push:
new a728111 upgrade to CXF 3.4.3 & WSS4J 2.3.1 (#62)
a728111 is described below
commit a728111cd4b90a2b71a30a18e605d36e09770685
Author: Alexey Markevich
AuthorDate: Mon Mar 29 22:31:07 2021 +
upgrade to CXF 3.4.3 & WSS4J 2.3.1 (#62)
---
plugins/core/pom.xml | 39 +++---
.../apache/cxf/fediz/core/config/FedizContext.java | 37 +++---
.../core/processor/AbstractFedizProcessor.java | 4 +-
.../core/samlsso/SAMLSSOResponseValidator.java | 7 +-
plugins/core/src/main/resources/fediz-ehcache.xml | 35 --
.../fediz/core/AbstractSAMLCallbackHandler.java| 11 +-
.../fediz/core/config/FedizConfigurationTest.java | 7 +-
.../core/federation/FederationResponseTest.java| 11 +-
plugins/core/src/test/resources/logging.properties | 2 +-
plugins/cxf/pom.xml| 25 ++--
.../cxf/plugin/AbstractServiceProviderFilter.java | 10 +-
.../cxf/plugin/state/EHCacheSPStateManager.java| 131 ++---
plugins/cxf/src/main/resources/fediz-ehcache.xml | 25
.../cxf/fediz/cxf/plugin/Messages.properties | 0
.../plugin/state/EHCacheSPStateManagerTest.java| 78
pom.xml| 11 +-
.../protocols/TrustedIdpSAMLProtocolHandler.java | 4 +-
services/oidc/pom.xml | 17 ---
.../oidc/PrivateKeyPasswordProviderImpl.java | 2 +-
services/sts/src/main/resources/log4j.properties | 4 +-
.../cxf/fediz/systests/cxf/FederationTest.java | 1 -
.../src/main/resources/logging.properties | 2 +-
.../src/main/resources/logging.properties | 2 +-
systests/oidc/pom.xml | 4 +-
24 files changed, 237 insertions(+), 232 deletions(-)
diff --git a/plugins/core/pom.xml b/plugins/core/pom.xml
index f6e77e8..1cd900f 100644
--- a/plugins/core/pom.xml
+++ b/plugins/core/pom.xml
@@ -33,12 +33,6 @@
-junit
-junit
-${junit.version}
-test
-
-
org.apache.wss4j
wss4j-ws-security-dom
${wss4j.version}
@@ -51,16 +45,14 @@
-net.sf.ehcache
-ehcache
-${ehcache.version}
-compile
+javax.cache
+cache-api
+${jcache.version}
-org.slf4j
-slf4j-jdk14
-${slf4j.version}
-test
+org.ehcache
+ehcache
+${ehcache3.version}
org.slf4j
@@ -73,12 +65,31 @@
${servlet.version}
provided
+
+
+junit
+junit
+${junit.version}
+test
+
org.easymock
easymock
${easymock.version}
test
+
+org.slf4j
+slf4j-jdk14
+${slf4j.version}
+test
+
+
+xerces
+xercesImpl
+2.12.1
+test
+
diff --git
a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizContext.java
b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizContext.java
index d23165a..ef38e67 100644
---
a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizContext.java
+++
b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizContext.java
@@ -24,6 +24,8 @@ import java.io.File;
import java.io.IOException;
import java.math.BigInteger;
import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
@@ -44,10 +46,11 @@ import
org.apache.cxf.fediz.core.config.jaxb.TrustManagersType;
import org.apache.cxf.fediz.core.config.jaxb.TrustedIssuerType;
import org.apache.cxf.fediz.core.config.jaxb.TrustedIssuers;
import org.apache.cxf.fediz.core.exception.IllegalConfigurationException;
+import org.apache.cxf.fediz.core.exception.ProcessingException;
import org.apache.cxf.fediz.core.processor.ClaimsProcessor;
import org.apache.cxf.fediz.core.util.CertsUtils;
+import org.apache.wss4j.common.cache.EHCacheReplayCache;
import org.apache.wss4j.common.cache.ReplayCache;
-import org.apache.wss4j.common.cache.ReplayCacheFactory;
import org.apache.wss4j.common.crypto.CertificateStore;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
@@ -239,26 +242,26 @@ public class FedizContext implements C
[cxf-fediz] branch cxf340 updated (5997f3c -> e3fa71a)
This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a change to branch cxf340 in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git. from 5997f3c Update CXF to 3.4.3 add e3fa71a organize ehcache deps No new revisions were added by this update. Summary of changes: plugins/core/pom.xml | 10 ++ plugins/cxf/pom.xml | 5 - pom.xml | 2 +- systests/oidc/pom.xml | 7 +-- 4 files changed, 12 insertions(+), 12 deletions(-)
[cxf] branch master updated: cxf-rt-rs-extension-search: update dependency exclusion for tika
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 ca5d02b cxf-rt-rs-extension-search: update dependency exclusion for tika ca5d02b is described below commit ca5d02bf9581a28971c8b8d021732972dce5377e Author: Alexey Markevich AuthorDate: Mon Mar 29 22:50:37 2021 +0300 cxf-rt-rs-extension-search: update dependency exclusion for tika --- rt/rs/extensions/search/pom.xml | 16 +--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/rt/rs/extensions/search/pom.xml b/rt/rs/extensions/search/pom.xml index d487ed1..40df271 100644 --- a/rt/rs/extensions/search/pom.xml +++ b/rt/rs/extensions/search/pom.xml @@ -84,6 +84,16 @@ org.apache.tika tika-core true + + +javax.xml.bind +jaxb-api + + +javax.activation +activation + + org.apache.tika @@ -92,15 +102,15 @@ org.apache.poi -poi-ooxml +poi-ooxml javax.xml.bind jaxb-api -com.sun.xml.bind -jaxb-core +javax.activation +javax.activation-api javax.annotation
[cxf] branch master updated: ws-rm, ws-transfer, integration: fix PMD rule: UnusedAssignment
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 69bde23 ws-rm, ws-transfer, integration: fix PMD rule:
UnusedAssignment
69bde23 is described below
commit 69bde238c2118718272bf6fc672e565d16d7a6d4
Author: Alexey Markevich
AuthorDate: Fri Mar 26 13:30:10 2021 +0300
ws-rm, ws-transfer, integration: fix PMD rule: UnusedAssignment
---
.../jca/core/classloader/PlugInClassLoader.java| 2 +-
.../cxf/jca/core/resourceadapter/ResourceBean.java | 4 +-
.../java/org/apache/cxf/jca/cxf/JCABusFactory.java | 3 +-
.../apache/cxf/jca/cxf/ManagedConnectionImpl.java | 4 +-
.../jca/cxf/handlers/CXFInvocationHandlerBase.java | 2 +-
.../cxf/handlers/InvokingInvocationHandler.java| 6 +-
.../handlers/ObjectMethodInvocationHandler.java| 2 +-
.../apache/cxf/jca/inbound/DispatchMDBInvoker.java | 2 +-
.../apache/cxf/jca/inbound/MDBActivationWork.java | 6 +-
.../org/apache/cxf/jca/jarloader/JarLoader.java| 2 +-
.../cxf/jca/outbound/ManagedConnectionImpl.java| 2 +-
.../org/apache/cxf/jca/servant/EJBEndpoint.java| 2 +-
.../org/apache/cxf/jca/servant/EJBInvoker.java | 4 +-
.../AbstractOpenTracingClientProvider.java | 4 +-
.../opentracing/AbstractOpenTracingProvider.java | 4 +-
.../tracing/opentracing/OpenTracingContext.java| 2 +-
.../src/main/java/org/apache/cxf/ws/rm/Proxy.java | 9 ++-
.../apache/cxf/ws/rm/RMCaptureOutInterceptor.java | 8 +--
.../java/org/apache/cxf/ws/rm/RMContextUtils.java | 2 +-
.../main/java/org/apache/cxf/ws/rm/RMEndpoint.java | 77 ++
.../main/java/org/apache/cxf/ws/rm/RMManager.java | 4 +-
.../main/java/org/apache/cxf/ws/rm/RMUtils.java| 20 +++---
.../java/org/apache/cxf/ws/rm/SourceSequence.java | 2 +-
.../apache/cxf/ws/rm/soap/RMSoapInInterceptor.java | 4 +-
.../apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java | 6 +-
.../cxf/ws/rm/soap/RetransmissionQueueImpl.java| 13 ++--
.../apache/cxf/ws/rm/soap/SoapFaultFactory.java| 2 +-
.../org/apache/cxf/ws/rm/ManagedRMManagerTest.java | 4 +-
.../org/apache/cxf/ws/rm/SourceSequenceTest.java | 14 ++--
.../ws/rm/persistence/jdbc/RMTxStoreTestBase.java | 40 +--
.../rm/persistence/jdbc/RMTxStoreUpgradeTest.java | 3 +-
.../ws/rm/soap/RetransmissionQueueImplTest.java| 2 +-
.../transfer/dialect/fragment/FragmentDialect.java | 25 ++-
.../ws/transfer/manager/MemoryResourceManager.java | 8 +--
.../transfer/integration/IntegrationBaseTest.java | 28 +---
.../transfer/integration/ResourceFactoryTest.java | 4 +-
.../cxf/ws/transfer/integration/ResourceTest.java | 13 ++--
37 files changed, 116 insertions(+), 223 deletions(-)
diff --git
a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java
b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java
index 67c2e1f..c9ec494 100644
---
a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java
+++
b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java
@@ -43,7 +43,7 @@ public class PlugInClassLoader extends SecureClassLoader {
private static final String JARS_PROPS_FILE = "jars.properties";
private static final String FILTERS_PROPS_FILE = "filters.properties";
private static final String NEFILTERS_PROPS_FILE =
"negativefilters.properties";
-private String[] jarUrls = new String[0];
+private final String[] jarUrls;
private final ProtectionDomain protectionDomain;
private final ClassLoader ploader;
diff --git
a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java
b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java
index 15fc36a..b180023 100644
---
a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java
+++
b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java
@@ -101,9 +101,8 @@ public class ResourceBean implements Serializable {
}
public void validateURLString(String spec, String msg) throws
ResourceAdapterInternalException {
-URL url = null;
try {
-url = createURL(spec, msg);
+URL url = createURL(spec, msg);
url.openStream();
LOG.fine("Validated url=" + url);
} catch (IOException ioe) {
@@ -111,5 +110,4 @@ public class ResourceBean implements Serializable {
}
}
-
}
diff --git
a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
index fa8be7a..6f0ccaf 100644
--- a/integration/jca/src/main/java/org/apa
[cxf] branch master updated: osgi.itests: fix test
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 61550ce osgi.itests: fix test
61550ce is described below
commit 61550ceb83004e01a8683e5c2cd578c528df8ec3
Author: Alexey Markevich
AuthorDate: Sun Mar 28 01:25:57 2021 +0300
osgi.itests: fix test
---
.../src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java | 3 ---
1 file changed, 3 deletions(-)
diff --git
a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
index a1d38f4..0127f37 100644
---
a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
+++
b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
@@ -78,9 +78,6 @@ public class JmsServiceTest extends CXFOSGiTestSupport {
return OptionUtils.combine(
cxfBaseConfig(),
features(cxfUrl, "cxf-jaxws", "cxf-transports-jms"),
-// TODO: remove it when 5.16.1 is released,
https://issues.apache.org/jira/browse/AMQ-8009
-
features(maven().groupId("org.apache.karaf.features").artifactId("spring-legacy").versionAsInProject()
-.type("xml").classifier("features")),
features(maven().groupId("org.apache.activemq").artifactId("activemq-karaf").versionAsInProject()
.type("xml").classifier("features-core"),
"cxf-jackson", "activemq-client"),
[cxf] branch master updated: use jakarta.inject-api
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 5330712 use jakarta.inject-api
5330712 is described below
commit 5330712b1160b904d093d8579652e8000e1ba253
Author: Alexey Markevich
AuthorDate: Sun Mar 28 00:08:42 2021 +0300
use jakarta.inject-api
---
.../src/main/release/samples/jax_rs/sse_spring/pom.xml | 2 +-
integration/cdi/pom.xml | 6 +++---
osgi/itests-felix/pom.xml | 8
osgi/itests/pom.xml | 17 -
parent/pom.xml | 4 ++--
services/xkms/xkms-itests/pom.xml | 8
systests/cdi/cdi-owb/pom.xml| 13 -
7 files changed, 22 insertions(+), 36 deletions(-)
diff --git a/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml
b/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml
index c4fa652..7781c51 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml
@@ -79,7 +79,7 @@
jakarta.inject
jakarta.inject-api
-1.0.1
+1.0.3
diff --git a/integration/cdi/pom.xml b/integration/cdi/pom.xml
index fa9de31..0d6c31c 100644
--- a/integration/cdi/pom.xml
+++ b/integration/cdi/pom.xml
@@ -49,12 +49,12 @@
jakarta.enterprise
jakarta.enterprise.cdi-api
-
+
jakarta.inject
jakarta.inject-api
-1.0.1
-
+${cxf.jakarta.injectapi.version}
+
junit
junit
diff --git a/osgi/itests-felix/pom.xml b/osgi/itests-felix/pom.xml
index b000a3b..89467e0 100644
--- a/osgi/itests-felix/pom.xml
+++ b/osgi/itests-felix/pom.xml
@@ -132,11 +132,11 @@
osgi.cmpn
-org.apache.geronimo.specs
-geronimo-atinject_1.0_spec
-${cxf.geronimo.inject.version}
+jakarta.inject
+jakarta.inject-api
+${cxf.jakarta.injectapi.version}
provided
-
+
junit
junit
diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml
index 18813d3..17d10fc 100644
--- a/osgi/itests/pom.xml
+++ b/osgi/itests/pom.xml
@@ -102,14 +102,6 @@
-
-
-org.apache.karaf.features
-spring-legacy
-${cxf.karaf.version}
-features
-xml
-
org.apache.karaf.features
@@ -133,11 +125,10 @@
org.osgi.core
-org.apache.geronimo.specs
-geronimo-atinject_1.0_spec
-${cxf.geronimo.inject.version}
-provided
-
+jakarta.inject
+jakarta.inject-api
+${cxf.jakarta.injectapi.version}
+
junit
junit
diff --git a/parent/pom.xml b/parent/pom.xml
index 5497e71..15e2228 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -106,7 +106,6 @@
3.9.0
3.0.3
3.0.2
-1.1
1.0.1
1.1.1
1.4
@@ -131,8 +130,9 @@
3.9
1.5.0
1.2.2
-1.4.2
+1.0.3
2.1.0
+1.4.2
2.3.3
0.7.2
3.25.0-GA
diff --git a/services/xkms/xkms-itests/pom.xml
b/services/xkms/xkms-itests/pom.xml
index 8cb1c7c..ee9984b 100644
--- a/services/xkms/xkms-itests/pom.xml
+++ b/services/xkms/xkms-itests/pom.xml
@@ -103,11 +103,11 @@
-org.apache.geronimo.specs
-geronimo-atinject_1.0_spec
-${cxf.geronimo.inject.version}
+jakarta.inject
+jakarta.inject-api
+${cxf.jakarta.injectapi.version}
provided
-
+
jakarta.xml.bind
jakarta.xml.bind-api
diff --git a/systests/cdi/cdi-owb/pom.xml b/systests/cdi/cdi-owb/pom.xml
index 3a69ec8..0ba9f7b 100644
--- a/systests/cdi/cdi-owb/pom.xml
+++ b/systests/cdi/cdi-owb/pom.xml
@@ -62,15 +62,10 @@
1.0
-org.apache.geronimo.specs
-geronimo-validation_1.1_spec
-1.0
-
-
-org.apache.geronimo.specs
-geronimo-atinject_1.0_spec
-${cxf.geronimo.inject.version}
-
+jakarta.inject
+jakarta.inject-api
+${cxf.jakarta.injectapi.version}
+
org.apache.geronimo.specs
geronimo
[cxf] branch master updated: organize servicemix specs
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 47a5b63 organize servicemix specs
47a5b63 is described below
commit 47a5b631ee8fee22c9a3e59226f9d2123d3b
Author: Alexey Markevich
AuthorDate: Fri Mar 26 21:56:32 2021 +0300
organize servicemix specs
---
osgi/itests/pom.xml | 5 ++---
osgi/karaf/features/src/main/resources/features.xml | 2 +-
osgi/repository/pom.xml | 11 ---
3 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml
index 14999c5..18813d3 100644
--- a/osgi/itests/pom.xml
+++ b/osgi/itests/pom.xml
@@ -118,9 +118,8 @@
-org.apache.servicemix.specs
-
org.apache.servicemix.specs.jsr303-api-1.1.0
-${cxf.servicemix.specs.version}
+jakarta.validation
+jakarta.validation-api
provided
diff --git a/osgi/karaf/features/src/main/resources/features.xml
b/osgi/karaf/features/src/main/resources/features.xml
index 048fb4f..5ffc45c 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -24,7 +24,7 @@
mvn:org.apache.geronimo.specs/geronimo-osgi-registry/1.1
mvn:com.sun.activation/jakarta.activation/${cxf.jakarta.activation.version}
mvn:jakarta.annotation/jakarta.annotation-api/${cxf.javax.annotation-api.version}
-mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${cxf.servicemix.specs.version}
+mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.2/${cxf.servicemix.specs.version}
mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.3/${cxf.servicemix.specs.jaxb.version}
mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.3/${cxf.specs.jaxws.api.version}
mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxrs-api-2.1/${cxf.servicemix.jaxrs.specs.version}
diff --git a/osgi/repository/pom.xml b/osgi/repository/pom.xml
index 1371b19..f546c67 100644
--- a/osgi/repository/pom.xml
+++ b/osgi/repository/pom.xml
@@ -247,21 +247,10 @@
org.apache.cxf.xjc-utils
cxf-xjc-runtime
-
-
- javax.xml.ws
- jaxws-api
-
-
org.codehaus.jettison
jettison
-
- org.apache.servicemix.specs
-
org.apache.servicemix.specs.jaxrs-api-2.1
- ${cxf.servicemix.specs.version}
-
[cxf-xjc-utils] branch master updated: Update dependencies and plugins
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-xjc-utils.git
The following commit(s) were added to refs/heads/master by this push:
new 5d87240 Update dependencies and plugins
5d87240 is described below
commit 5d8724057f1298816573ab59f2100356a7d669d0
Author: Alexey Markevich
AuthorDate: Fri Mar 26 06:19:07 2021 +0300
Update dependencies and plugins
---
bug671/pom.xml | 9 -
bug986/pom.xml | 9 -
.../org/apache/cxf/xjc/bug986/Bug986Plugin.java| 2 +-
cxf-xjc-plugin/pom.xml | 12 +--
.../cxf/maven_plugin/AbstractXSDToJavaMojo.java| 6 ++--
.../apache/cxf/maven_plugin/XSDToJavaRunner.java | 2 +-
dv/pom.xml | 5 ---
.../org/apache/cxf/xjc/dv/DefaultValuePlugin.java | 9 +++--
pom.xml| 42 +-
property-listener/pom.xml | 5 ---
.../property_listener/PropertyListenerPlugin.java | 3 +-
runtime/pom.xml| 2 +-
ts/pom.xml | 9 -
wsdlextension-test/pom.xml | 4 ---
.../cxf/xjc/wsdlextension/WSDLExtensionTest.java | 15 ++--
wsdlextension/pom.xml | 9 -
.../cxf/xjc/wsdlextension/WSDLExtension.java | 2 +-
17 files changed, 30 insertions(+), 115 deletions(-)
diff --git a/bug671/pom.xml b/bug671/pom.xml
index a9b..0be202a 100644
--- a/bug671/pom.xml
+++ b/bug671/pom.xml
@@ -30,11 +30,6 @@
3.3.2-SNAPSHOT
-
-
-true
-
-
org.glassfish.jaxb
@@ -46,10 +41,6 @@
jaxb-runtime
provided
-
-org.apache.commons
-commons-lang3
-
diff --git a/bug986/pom.xml b/bug986/pom.xml
index 8879d7c..1dba701 100644
--- a/bug986/pom.xml
+++ b/bug986/pom.xml
@@ -30,11 +30,6 @@
3.3.2-SNAPSHOT
-
-
-true
-
-
org.glassfish.jaxb
@@ -46,10 +41,6 @@
jaxb-runtime
provided
-
-org.apache.commons
-commons-lang3
-
diff --git a/bug986/src/main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java
b/bug986/src/main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java
index fcc2018..fd46cdf 100644
--- a/bug986/src/main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java
+++ b/bug986/src/main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java
@@ -81,7 +81,7 @@ public class Bug986Plugin {
JAnnotationValue st = getAnnotationMember(j, "name");
StringWriter sw = new StringWriter();
st.generate(new JFormatter(sw));
-if (sw.toString().equals("\"anySimpleType\"")) {
+if ("\"anySimpleType\"".equals(sw.toString())) {
if
(field.type().fullName().startsWith("java.util.List")) {
//if it's a list of non-string types, we have
to remove
if
(!field.type().fullName().contains("")) {
diff --git a/cxf-xjc-plugin/pom.xml b/cxf-xjc-plugin/pom.xml
index 9f19931..cb8d2bd 100644
--- a/cxf-xjc-plugin/pom.xml
+++ b/cxf-xjc-plugin/pom.xml
@@ -47,11 +47,6 @@
org.codehaus.plexus
-plexus-utils
-3.0.24
-
-
-org.codehaus.plexus
plexus-archiver
4.2.0
@@ -71,11 +66,6 @@
provided
-org.apache.maven.shared
-maven-artifact-resolver
-1.0
-
-
org.apache.maven.plugin-tools
maven-plugin-annotations
3.2
@@ -101,7 +91,7 @@
org.javassist
javassist
-3.18.2-GA
+3.27.0-GA
diff --git
a/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java
b/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java
index cb69a3e..350fc6f 100644
---
a/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java
+++
b/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java
@@ -496,11 +496,9 @@ public abstract class AbstractXSDToJavaMojo extends
AbstractMojo {
throw new MojoExecutionException(e.getMessage(), e);
}
cmd.createArg().setLine(additionalJvmArgs);
-
-
-File file = null;
+
+final File file;
try {
-/
[cxf] branch master updated: finalize cleanup commons-collections
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 94249fb finalize cleanup commons-collections
94249fb is described below
commit 94249fbccf981e90ba93784aa0fe6b9c9a6388e3
Author: Alexey Markevich
AuthorDate: Wed Mar 24 22:40:40 2021 +0300
finalize cleanup commons-collections
---
osgi/karaf/features/src/main/resources/features.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/osgi/karaf/features/src/main/resources/features.xml
b/osgi/karaf/features/src/main/resources/features.xml
index 71fadde..048fb4f 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -464,7 +464,6 @@
mvn:org.apache.commons/commons-lang3/${cxf.commons-lang3.version}
mvn:org.apache.commons/commons-text/${cxf.commons-text.version}
mvn:org.apache.velocity/velocity-engine-core/${cxf.velocity.version}
-mvn:commons-collections/commons-collections/${cxf.commons-collections.version}
mvn:org.apache.cxf/cxf-tools-common/${project.version}
mvn:org.apache.cxf/cxf-tools-java2ws/${project.version}
mvn:org.apache.cxf/cxf-tools-misctools/${project.version}
[cxf] branch master updated: wsdl-validator-plugin: switch to java annotations
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 fbfb16b wsdl-validator-plugin: switch to java annotations
fbfb16b is described below
commit fbfb16b5344e415437ad73dc709c51c60755f430
Author: Alexey Markevich
AuthorDate: Wed Mar 24 12:29:03 2021 +0300
wsdl-validator-plugin: switch to java annotations
---
maven-plugins/wsdl-validator-plugin/pom.xml| 9 +---
.../apache/cxf/maven_plugin/WSDLValidatorMojo.java | 62 --
parent/pom.xml | 11
testutils/pom.xml | 14 ++---
tools/common/pom.xml | 11
5 files changed, 28 insertions(+), 79 deletions(-)
diff --git a/maven-plugins/wsdl-validator-plugin/pom.xml
b/maven-plugins/wsdl-validator-plugin/pom.xml
index 11d5271..68cc3af 100644
--- a/maven-plugins/wsdl-validator-plugin/pom.xml
+++ b/maven-plugins/wsdl-validator-plugin/pom.xml
@@ -34,18 +34,13 @@
-junit
-junit
-test
-
-
org.apache.maven
maven-plugin-api
provided
-org.apache.maven
-maven-artifact
+org.apache.maven.plugin-tools
+maven-plugin-annotations
provided
diff --git
a/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java
b/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java
index c66f22b..2880f55 100644
---
a/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java
+++
b/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java
@@ -26,68 +26,56 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.tools.common.toolspec.ToolSpec;
import org.apache.cxf.tools.validator.WSDLValidator;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
-/**
- * @goal wsdlvalidator
- * @description CXF WSDL Validation
- * @threadSafe
- */
+@Mojo(name = "wsdlvalidator", threadSafe = true)
public class WSDLValidatorMojo extends AbstractMojo {
-/**
- * @parameter
- */
+
+@Parameter
private Boolean verbose;
-/**
- * @parameter
- */
+@Parameter
private Boolean quiet;
-
-/**
- * @parameter expression="${cxf.wsdlRoot}"
default-value="${basedir}/src/main/resources/wsdl"
- */
+@Parameter(property = "cxf.wsdlRoot", defaultValue =
"${basedir}/src/main/resources/wsdl")
private File wsdlRoot;
-/**
- * @parameter expression="${cxf.testWsdlRoot}"
default-value="${basedir}/src/test/resources/wsdl"
- */
+@Parameter(property = "cxf.testWsdlRoot", defaultValue =
"${basedir}/src/test/resources/wsdl")
private File testWsdlRoot;
/**
* Directory in which the "DONE" markers are saved that
- * @parameter expression="${cxf.markerDirectory}"
- *
default-value="${project.build.directory}/cxf-wsdl-validator-markers"
*/
+@Parameter(property = "cxf.markerDirectory", defaultValue =
"${project.build.directory}/cxf-wsdl-validator-markers")
private File markerDirectory;
+
/**
- * A list of wsdl files to include. Can contain ant-style wildcards and
double wildcards. Defaults to
- * *.wsdl
- *
- * @parameter
+ * A list of wsdl files to include. Can contain ant-style wildcards and
double wildcards. Defaults to *.wsdl
*/
-private String[] includes;
+@Parameter
+private String[] includes = {
+"*.wsdl"
+};
+
/**
* A list of wsdl files to exclude. Can contain ant-style wildcards and
double wildcards.
- *
- * @parameter
*/
+@Parameter
private String[] excludes;
-private String getIncludeExcludeString(String[] arr) {
+private static String getIncludeExcludeString(String[] arr) {
if (arr == null || arr.length == 0) {
return "";
}
return String.join(",", arr);
}
-private List getWsdlFiles(File dir)
-throws MojoExecutionException {
+private List getWsdlFiles(File dir) throws MojoExecutionException {
List exList = new ArrayList<>();
if (excludes != null) {
@@ -99,8 +87,7 @
[cxf] branch master updated: testutils: cleanup
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 b902794 testutils: cleanup
b902794 is described below
commit b902794f187035a6efe39e3632ccc7be0adc8a89
Author: Alexey Markevich
AuthorDate: Wed Mar 24 00:59:15 2021 +0300
testutils: cleanup
---
.../cxf/aegis/standalone/StandaloneReadTest.java | 58 --
.../java/org/apache/cxf/test/AbstractCXFTest.java | 12 -
.../java/org/apache/cxf/test/TestUtilities.java| 40 ---
3 files changed, 21 insertions(+), 89 deletions(-)
diff --git
a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java
b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java
index 99b2918..97b231b 100644
---
a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java
+++
b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java
@@ -19,10 +19,9 @@
package org.apache.cxf.aegis.standalone;
-import java.util.ArrayList;
-import java.util.HashSet;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
-import java.util.Set;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
@@ -31,9 +30,8 @@ import org.apache.cxf.aegis.AegisContext;
import org.apache.cxf.aegis.AegisReader;
import org.apache.cxf.aegis.services.SimpleBean;
import org.apache.cxf.aegis.type.AegisType;
-import org.apache.cxf.test.TestUtilities;
+import org.apache.cxf.staxutils.StaxUtils;
-import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -43,23 +41,17 @@ import static org.junit.Assert.assertTrue;
*
*/
public class StandaloneReadTest {
-private AegisContext context;
-private TestUtilities testUtilities;
+private final AegisContext context = new AegisContext();
private interface ListStringInterface {
List method();
}
-@Before
-public void before() {
-testUtilities = new TestUtilities(getClass());
-}
-
@Test
public void testBasicTypeRead() throws Exception {
-context = new AegisContext();
context.initialize();
-XMLStreamReader streamReader =
testUtilities.getResourceAsXMLStreamReader("stringElement.xml");
+XMLStreamReader streamReader =
+
StaxUtils.createXMLStreamReader(getClass().getResourceAsStream("stringElement.xml"));
AegisReader reader = context.createXMLStreamReader();
Object something = reader.read(streamReader);
assertEquals("ball-of-yarn", something);
@@ -67,15 +59,12 @@ public class StandaloneReadTest {
@Test
public void testCollectionReadNoXsiType() throws Exception {
-context = new AegisContext();
-Set roots = new HashSet<>();
java.lang.reflect.Type listStringType
= ListStringInterface.class.getMethods()[0].getGenericReturnType();
-roots.add(listStringType);
-context.setRootClasses(roots);
+context.setRootClasses(Collections.singleton(listStringType));
context.initialize();
XMLStreamReader streamReader
-= testUtilities.getResourceAsXMLStreamReader("topLevelList.xml");
+=
StaxUtils.createXMLStreamReader(getClass().getResourceAsStream("topLevelList.xml"));
AegisReader reader = context.createXMLStreamReader();
// until I fix type mapping to use java.lang.reflect.Type instead of
// Class, I need to do the following
@@ -83,31 +72,28 @@ public class StandaloneReadTest {
AegisType aegisRegisteredType =
context.getTypeMapping().getType(magicTypeQName);
Object something = reader.read(streamReader, aegisRegisteredType);
-List correctAnswer = new ArrayList<>();
-correctAnswer.add("cat");
-correctAnswer.add("dog");
-correctAnswer.add("hailstorm");
+List correctAnswer = Arrays.asList(
+"cat",
+"dog",
+"hailstorm");
assertEquals(correctAnswer, something);
}
@Test
public void testCollectionReadXsiType() throws Exception {
-context = new AegisContext();
-Set roots = new HashSet<>();
java.lang.reflect.Type listStringType
= ListStringInterface.class.getMethods()[0].getGenericReturnType();
-roots.add(listStringType);
-context.setRootClasses(roots);
+context.setRootClasses(Collections.singleton(listStringType));
context.initialize();
XMLStreamReader streamReader
-=
testUtilities.getResourceAsXMLStreamReader("topLe
[cxf] branch master updated: cxf-rt-ws-security: fix PMD rule: UnusedAssignment
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 75fb6bb cxf-rt-ws-security: fix PMD rule: UnusedAssignment
75fb6bb is described below
commit 75fb6bb56d82f72771a9ee6ecab5d36168303f51
Author: Alexey Markevich
AuthorDate: Tue Mar 23 23:33:23 2021 +0300
cxf-rt-ws-security: fix PMD rule: UnusedAssignment
---
.../org/apache/cxf/js/rhino/ProviderFactory.java | 8 +--
.../saml/interceptor/WSS4JBasicAuthValidator.java | 2 +-
.../cxf/rt/security/saml/utils/SAMLUtils.java | 8 +--
.../saml/xacml2/DefaultXACMLRequestBuilder.java| 4 +-
.../KerberosTokenInterceptorProvider.java | 2 +-
.../security/policy/interceptors/STSInvoker.java | 4 +-
.../sts/provider/SecurityTokenServiceProvider.java | 2 +-
.../cxf/ws/security/trust/AbstractSTSClient.java | 2 +-
.../ws/security/trust/DefaultSTSTokenCacher.java | 2 +-
.../cxf/ws/security/trust/STSLoginModule.java | 2 +-
.../ws/security/trust/STSStaxTokenValidator.java | 11 ++--
.../cxf/ws/security/trust/STSTokenValidator.java | 2 +-
.../org/apache/cxf/ws/security/trust/STSUtils.java | 5 +-
.../delegation/WSSUsernameCallbackHandler.java | 2 +-
.../security/wss4j/AbstractTokenInterceptor.java | 2 +-
...ractUsernameTokenAuthenticatingInterceptor.java | 2 +-
.../wss4j/AbstractWSS4JStaxInterceptor.java| 2 +-
.../ws/security/wss4j/CryptoCoverageChecker.java | 5 +-
.../wss4j/PolicyBasedWSS4JInInterceptor.java | 6 +--
.../wss4j/PolicyBasedWSS4JOutInterceptor.java | 2 +-
.../wss4j/PolicyBasedWSS4JStaxInInterceptor.java | 6 +--
.../wss4j/PolicyBasedWSS4JStaxOutInterceptor.java | 6 +--
.../wss4j/StaxSecurityContextInInterceptor.java| 4 +-
.../cxf/ws/security/wss4j/StaxSerializer.java | 9 ++--
.../security/wss4j/UsernameTokenInterceptor.java | 2 +-
.../cxf/ws/security/wss4j/WSS4JInInterceptor.java | 7 +--
.../cxf/ws/security/wss4j/WSS4JOutInterceptor.java | 7 ++-
.../apache/cxf/ws/security/wss4j/WSS4JUtils.java | 6 +--
.../policyhandlers/AbstractBindingBuilder.java | 10 ++--
.../policyhandlers/AsymmetricBindingHandler.java | 6 +--
.../StaxAsymmetricBindingHandler.java | 4 +-
.../StaxSymmetricBindingHandler.java | 4 +-
.../policyhandlers/SymmetricBindingHandler.java| 18 +++
.../policyhandlers/TransportBindingHandler.java| 2 +-
.../AbstractSupportingTokenPolicyValidator.java| 4 +-
.../security/wss4j/SignatureConfirmationTest.java | 4 +-
.../cxf/ws/security/wss4j/WSS4JFaultCodeTest.java | 8 +--
.../cxf/ws/security/wss4j/WSS4JInOutTest.java | 4 +-
.../cxf/ws/security/wss4j/saml/SamlTokenTest.java | 58 +++---
39 files changed, 114 insertions(+), 130 deletions(-)
diff --git
a/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ProviderFactory.java
b/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ProviderFactory.java
index a1068bf..1f15685 100644
--- a/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ProviderFactory.java
+++ b/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ProviderFactory.java
@@ -75,12 +75,8 @@ public class ProviderFactory {
boolean isE4X = f.getName().endsWith(".jsx");
StringBuilder sb = new StringBuilder();
try (BufferedReader bufrd = new BufferedReader(new FileReader(f))) {
-String line = null;
-for (;;) {
-line = bufrd.readLine();
-if (line == null) {
-break;
-}
+String line;
+while (null != (line = bufrd.readLine())) {
sb.append(line).append('\n');
}
}
diff --git
a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/WSS4JBasicAuthValidator.java
b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/WSS4JBasicAuthValidator.java
index 77f4413..dfefd99 100644
---
a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/WSS4JBasicAuthValidator.java
+++
b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/WSS4JBasicAuthValidator.java
@@ -83,7 +83,7 @@ public abstract class WSS4JBasicAuthValidator {
credential = getValidator().validate(credential, data);
// Create a Principal/SecurityContext
-SecurityContext sc = null;
+final SecurityContext sc;
if (credential != null && credential.getPrincipal() != null) {
sc = createSecurityContext(message, credential);
} else {
diff --git
a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/utils/SAMLUtils.java
b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/utils/SAMLUtils.java
index 692d075..27354cf6 100644
[cxf-fediz] branch cxf340 updated (7c14637 -> 5997f3c)
This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a change to branch cxf340 in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git. from 7c14637 remove Ehcache2 version add 5997f3c Update CXF to 3.4.3 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[cxf] branch master updated: cxf-tools-corba: fix PMD rule: UnusedAssignment
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 06db917 cxf-tools-corba: fix PMD rule: UnusedAssignment
06db917 is described below
commit 06db9172c41e43552897e1ec388ac96e0699c6bf
Author: Alexey Markevich
AuthorDate: Sun Mar 21 02:27:33 2021 +0300
cxf-tools-corba: fix PMD rule: UnusedAssignment
---
.../java/org/apache/cxf/tools/corba/IDLToWSDL.java | 13 +-
.../java/org/apache/cxf/tools/corba/WSDLToIDL.java | 11 +-
.../cxf/tools/corba/common/SchemaFactory.java | 6 +-
.../cxf/tools/corba/common/WSDLCorbaFactory.java | 5 +-
.../cxf/tools/corba/common/idltypes/IdlRoot.java | 8 +-
.../tools/corba/processors/idl/ArrayVisitor.java | 6 +-
.../corba/processors/idl/AttributeVisitor.java | 7 +-
.../corba/processors/idl/DeclaratorVisitor.java| 8 +-
.../corba/processors/idl/DefinitionVisitor.java| 2 +-
.../tools/corba/processors/idl/FixedVisitor.java | 4 +-
.../corba/processors/idl/IDLToWSDLProcessor.java | 13 +-
.../processors/idl/ObjectReferenceVisitor.java | 18 +-
.../corba/processors/idl/OperationVisitor.java | 5 +-
.../corba/processors/idl/ParamDeferredAction.java | 7 +-
.../corba/processors/idl/ParamTypeSpecVisitor.java | 3 +-
.../corba/processors/idl/PortTypeVisitor.java | 2 +-
.../corba/processors/idl/ScopedNameVisitor.java| 16 +-
.../corba/processors/idl/SequenceVisitor.java | 6 +-
.../tools/corba/processors/idl/StringVisitor.java | 4 +-
.../tools/corba/processors/idl/StructVisitor.java | 6 +-
.../cxf/tools/corba/processors/idl/TypesUtils.java | 4 +-
.../tools/corba/processors/idl/TypesVisitor.java | 3 +-
.../tools/corba/processors/idl/UnionVisitor.java | 7 +-
.../tools/corba/processors/idl/WSDLASTVisitor.java | 6 +-
.../tools/corba/processors/wsdl/WSDLParameter.java | 23 +--
.../corba/processors/wsdl/WSDLToCorbaBinding.java | 47 ++---
.../corba/processors/wsdl/WSDLToCorbaHelper.java | 64 +++---
.../processors/wsdl/WSDLToCorbaProcessor.java | 3 +-
.../corba/processors/wsdl/WSDLToIDLAction.java | 36 ++--
.../cxf/tools/corba/processors/wsdl/WSDLTypes.java | 4 +-
.../org/apache/cxf/tools/corba/IDLToWSDLTest.java | 228 -
.../org/apache/cxf/tools/corba/WSDLToIDLTest.java | 171 +---
.../cxf/tools/corba/common/ToolTestBase.java | 67 --
.../idlpreprocessor/IdlPreprocessorReaderTest.java | 15 +-
.../corba/processors/IDLToWSDLGenerationTest.java | 1 -
.../tools/corba/utils/WSDLGenerationTester.java| 34 +--
.../src/test/resources/toolspecs/idl2wsdl.xml | 184 -
.../src/test/resources/toolspecs/wsdl2idl.xml | 112 --
.../cxf/tools/wadlto/jaxb/CustomizationParser.java | 26 +--
.../cxf/tools/wadlto/jaxrs/SourceGenerator.java| 6 +-
40 files changed, 307 insertions(+), 884 deletions(-)
diff --git
a/tools/corba/src/main/java/org/apache/cxf/tools/corba/IDLToWSDL.java
b/tools/corba/src/main/java/org/apache/cxf/tools/corba/IDLToWSDL.java
index debea29..6f3a319 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/IDLToWSDL.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/IDLToWSDL.java
@@ -20,7 +20,7 @@
package org.apache.cxf.tools.corba;
import java.io.File;
-import java.util.HashSet;
+import java.util.Collections;
import java.util.Set;
import org.apache.cxf.common.i18n.Message;
@@ -50,19 +50,14 @@ public class IDLToWSDL extends AbstractCXFToolContainer {
}
private Set getArrayKeys() {
-Set arrayKeys = new HashSet<>();
-arrayKeys.add(ToolCorbaConstants.CFG_INCLUDEDIR);
-return arrayKeys;
+return Collections.singleton(ToolCorbaConstants.CFG_INCLUDEDIR);
}
public void execute(boolean exitOnFinish) {
-IDLToWSDLProcessor idlProcessor = new IDLToWSDLProcessor();
-ProcessorEnvironment env = null;
-
try {
super.execute(exitOnFinish);
if (!hasInfoOption()) {
-env = new ProcessorEnvironment();
+ProcessorEnvironment env = new ProcessorEnvironment();
env.setParameters(getParametersMap(getArrayKeys()));
if (isVerboseOn()) {
env.put(ToolConstants.CFG_VERBOSE, Boolean.TRUE);
@@ -70,6 +65,8 @@ public class IDLToWSDL extends AbstractCXFToolContainer {
env.put(ToolConstants.CFG_CMD_ARG, args);
initialise(env);
validate(env);
+
+IDLToWSDLProcessor idlProcessor = new IDLToWSDLProcessor();
idlProcessor.setEnvironment(env);
idlProcessor.process();
}
diff --git
a/tools/corba/src/main/java/org/apache/cxf/tools/corba/WSDLToIDL.java
b/tools/corba/sr
[cxf] branch master updated (4ad97d5 -> 40ba580)
This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git. from 4ad97d5 cxf-rt-rs-client: fix PMD rule: UnusedAssignment add 40ba580 rt/rs: fix PMD rule: UnusedAssignment No new revisions were added by this update. Summary of changes: .../org/apache/cxf/jaxrs/openapi/SwaggerUi.java| 2 +- .../cxf/jaxrs/openapi/parse/OpenApiParseUtils.java | 2 +- .../org/apache/cxf/jaxrs/swagger/SwaggerUi.java| 2 +- .../openapi/SwaggerToOpenApiConversionUtils.java | 11 .../apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 10 +++ .../cxf/jaxrs/provider/atom/AtomPojoProvider.java | 4 +-- .../cxf/jaxrs/provider/json/JSONProvider.java | 20 ++ .../cxf/jaxrs/provider/json/JSONProviderTest.java | 10 +++ .../ext/search/AbstractSearchConditionParser.java | 8 +++--- .../cxf/jaxrs/ext/search/SearchContextImpl.java| 10 +++ .../ext/search/lucene/LuceneQueryVisitor.java | 4 +-- .../cxf/jaxrs/ext/search/odata/ODataParser.java| 6 ++-- .../search/tika/TikaLuceneContentExtractor.java| 2 +- .../client/proxy/MicroProfileClientProxyImpl.java | 2 +- .../microprofile/client/sse/SseSubscription.java | 2 +- .../cors/CrossOriginResourceSharingFilter.java | 32 +++--- .../httpsignature/TomitribeSignatureCreator.java | 2 +- .../httpsignature/utils/KeyManagementUtils.java| 2 +- .../jose/jaxrs/AbstractJweJsonWriterProvider.java | 2 +- .../jose/jaxrs/AbstractJwsJsonWriterProvider.java | 2 +- .../security/jose/jaxrs/JweWriterInterceptor.java | 8 ++ .../AbstractJwsMultipartSignatureFilter.java | 8 +++--- .../multipart/JwsMultipartSignatureInFilter.java | 20 +++--- .../cxf/rs/security/jose/common/JoseUtils.java | 2 +- .../jwe/AbstractContentEncryptionAlgorithm.java| 2 +- .../security/jose/jwe/AbstractJweEncryption.java | 2 +- .../cxf/rs/security/jose/jwe/JweJsonProducer.java | 2 +- .../apache/cxf/rs/security/jose/jwe/JweUtils.java | 4 +-- .../jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java | 2 +- .../apache/cxf/rs/security/jose/jwk/JwkUtils.java | 4 +-- .../cxf/rs/security/jose/jwt/JoseJwtProducer.java | 2 +- .../rs/security/jose/jwe/JwaSpecTestCasesTest.java | 3 +- .../jose/jwe/JweCompactReaderWriterTest.java | 2 +- .../rs/security/jose/jwe/JweJsonConsumerTest.java | 2 +- .../rs/security/jose/jwe/JweJsonProducerTest.java | 2 +- .../apache/cxf/rs/security/oauth/data/Token.java | 4 +-- .../security/oauth/filters/AbstractAuthFilter.java | 4 +-- .../services/AuthorizationRequestHandler.java | 9 +++--- .../oauth2/client/AbstractAuthSupplier.java| 2 +- .../security/oauth2/client/BearerAuthSupplier.java | 2 +- .../services/AbstractImplicitGrantService.java | 2 +- .../services/DirectAuthorizationService.java | 2 +- .../services/RedirectionBasedGrantService.java | 2 +- .../rs/security/oidc/idp/OidcImplicitService.java | 2 +- .../rs/security/oidc/rp/OidcClaimsValidator.java | 2 +- .../AbstractRequestAssertionConsumerHandler.java | 17 +++- .../security/saml/sso/EHCacheTokenReplayCache.java | 3 +- .../cxf/rs/security/saml/sso/MetadataWriter.java | 17 ++-- .../saml/sso/SAMLProtocolResponseValidator.java| 11 .../security/saml/sso/SamlPostBindingFilter.java | 2 +- .../saml/sso/state/EHCacheSPStateManager.java | 3 +- .../org/apache/cxf/rs/security/saml/SAMLUtils.java | 2 +- .../rs/security/xml/AbstractXmlEncInHandler.java | 4 +-- .../rs/security/xml/AbstractXmlSigInHandler.java | 4 +-- .../cxf/rs/security/xml/XmlEncOutInterceptor.java | 8 +++--- .../cxf/rs/security/xml/XmlSecInInterceptor.java | 8 +++--- .../cxf/rs/security/xml/XmlSecOutInterceptor.java | 4 +-- .../cxf/rs/security/xml/XmlSigOutInterceptor.java | 4 +-- .../jaxrs/sse/client/SseEventSourceImplTest.java | 2 +- 59 files changed, 149 insertions(+), 171 deletions(-)
[cxf] 02/02: cxf-rt-rs-client: fix PMD rule: UnusedAssignment
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
commit 4ad97d59e890524337e2b99215586ed9d475ef61
Author: Alexey Markevich
AuthorDate: Thu Mar 18 22:30:39 2021 +0300
cxf-rt-rs-client: fix PMD rule: UnusedAssignment
---
.../src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactory.java | 2 +-
.../src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java | 2 +-
rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java | 4 ++--
.../org/apache/cxf/jaxrs/client/spec/ClientRequestContextImpl.java| 2 +-
.../jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactory.java
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactory.java
index 4ba3a59..1e487ab 100644
---
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactory.java
+++
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactory.java
@@ -382,7 +382,7 @@ public final class JAXRSClientFactory {
ClientState clientState = WebClient.getClientState(client);
-T proxy = null;
+final T proxy;
if (clientState == null) {
proxy = bean.create(cls);
if (inheritHeaders) {
diff --git
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java
index 53c13fb..477e5d3 100644
---
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java
+++
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java
@@ -152,7 +152,7 @@ public class LocalClientState implements ClientState {
public ClientState newState(URI currentURI, MultivaluedMap
headers,
MultivaluedMap templatesMap, Map
props) {
-ClientState state = null;
+final ClientState state;
if (isSupportedScheme(currentURI)) {
state = new LocalClientState(currentURI, props);
} else {
diff --git
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
index 0f0c36c..34c9078 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
@@ -302,7 +302,7 @@ public class WebClient extends AbstractClient {
*/
public static WebClient fromClient(Client client, boolean inheritHeaders) {
-WebClient webClient = null;
+final WebClient webClient;
ClientState clientState = getClientState(client);
if (clientState == null) {
@@ -927,7 +927,7 @@ public class WebClient extends AbstractClient {
}
MultivaluedMap headers = prepareHeaders(responseClass,
body);
resetResponse();
-Response r = null;
+final Response r;
try {
r = doChainedInvocation(httpMethod, headers, body, requestClass,
inGenericType,
inAnns, responseClass,
outGenericType, null, null);
diff --git
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientRequestContextImpl.java
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientRequestContextImpl.java
index 7519818..cddf5c6 100644
---
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientRequestContextImpl.java
+++
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientRequestContextImpl.java
@@ -132,8 +132,8 @@ public class ClientRequestContextImpl extends
AbstractRequestContextImpl
Object actualEntity = InjectionUtils.getEntity(entity);
m.setContent(List.class, actualEntity == null ? new
MessageContentsList()
: new MessageContentsList(actualEntity));
-Type type = null;
if (entity != null) {
+final Type type;
if (GenericEntity.class.isAssignableFrom(entity.getClass())) {
type = ((GenericEntity)entity).getType();
} else {
diff --git
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java
index 4f93423..6543ddc 100644
---
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java
+++
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java
@@ -135,7 +135,7 @@ public class JAXRSClientFactoryBeanDefinitionParser extends
AbstractFactoryBeanD
}
AutowireCapableBeanFactory beanFactory
[cxf] 01/02: Update spring-boot to 2.4.4
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 commit 7dcda069b57ee9732a2fb089df35c91c040527f0 Author: Alexey Markevich AuthorDate: Thu Mar 18 22:25:12 2021 +0300 Update spring-boot to 2.4.4 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 629ef8e..7fd3bc2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -195,7 +195,7 @@ 1.7.30 1.27 2.3_2 -2.4.3 +2.4.4 2.3.3.RELEASE spring-test 1.2.1
[cxf] branch master updated (5a546d9 -> 4ad97d5)
This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git. from 5a546d9 Update maven-checkstyle-plugin to 3.1.2 new 7dcda06 Update spring-boot to 2.4.4 new 4ad97d5 cxf-rt-rs-client: fix PMD rule: UnusedAssignment 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: parent/pom.xml| 2 +- .../src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactory.java | 2 +- .../src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java | 2 +- rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java | 4 ++-- .../org/apache/cxf/jaxrs/client/spec/ClientRequestContextImpl.java| 2 +- .../jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-)
[cxf] 01/02: cxf-systests-spring-boot: switch to JUnit 5
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
commit 332a02450fe1620daeaa2b65c0716e337d49095a
Author: Alexey Markevich
AuthorDate: Thu Mar 18 17:55:52 2021 +0300
cxf-systests-spring-boot: switch to JUnit 5
---
systests/spring-boot/pom.xml | 44 +
.../spring/boot/SpringJaxrsApplicationTest.java| 44 +++--
.../boot/SpringJaxrsClassesScanningTest.java | 10 ++--
.../boot/SpringJaxrsComponentScanningTest.java | 10 ++--
.../systest/jaxrs/spring/boot/SpringJaxrsTest.java | 44 +++--
.../jaxrs/spring/boot/SpringSseEmitterTest.java| 57 ++
.../systest/jaxws/spring/boot/SpringJaxwsTest.java | 53 ++--
7 files changed, 96 insertions(+), 166 deletions(-)
diff --git a/systests/spring-boot/pom.xml b/systests/spring-boot/pom.xml
index 11b8d95..1df0b4e 100644
--- a/systests/spring-boot/pom.xml
+++ b/systests/spring-boot/pom.xml
@@ -36,21 +36,6 @@
-${basedir}/src/test/java
-
-
-src/test/java
-
-**/*.java
-
-
-
-src/test/resources
-
-**/*
-
-
-
maven-jar-plugin
@@ -74,11 +59,6 @@
-org.slf4j
-jcl-over-slf4j
-test
-
-
org.apache.cxf
cxf-spring-boot-starter-jaxrs
@@ -88,18 +68,6 @@
org.apache.cxf
-cxf-rt-frontend-jaxrs
-
-
-org.apache.cxf
-cxf-rt-frontend-jaxws
-
-
-org.apache.cxf
-cxf-rt-rs-client
-
-
-org.apache.cxf
cxf-rt-features-metrics
@@ -123,11 +91,7 @@
cxf-testutils
test
-
-junit
-junit
-test
-
+
org.springframework.boot
spring-boot-starter-test
@@ -145,11 +109,5 @@
spring-boot-starter-actuator
test
-
-org.junit.vintage
-junit-vintage-engine
-${cxf.junit5.version}
-test
-
diff --git
a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsApplicationTest.java
b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsApplicationTest.java
index fa4d5ec..f5efe25 100644
---
a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsApplicationTest.java
+++
b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsApplicationTest.java
@@ -32,7 +32,7 @@ import javax.ws.rs.core.Response;
import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
-import org.apache.cxf.bus.spring.SpringBus;
+import org.apache.cxf.Bus;
import org.apache.cxf.feature.Feature;
import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
import org.apache.cxf.metrics.MetricsFeature;
@@ -44,34 +44,29 @@ import
org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.boot.test.system.OutputCaptureRule;
import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.util.SocketUtils;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.Tag;
import io.micrometer.core.instrument.search.RequiredSearch;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import static java.util.stream.Collectors.toMap;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.assertj.core.api.Assertions.entry;
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, classes =
SpringJaxrsApplicationTest.TestConfig.class)
@ActiveProfiles("jaxrs")
pu
[cxf] 02/02: Update maven-checkstyle-plugin to 3.1.2
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
commit 5a546d9c0b50298e954e712cc992ed91150b45f9
Author: Alexey Markevich
AuthorDate: Thu Mar 18 17:56:26 2021 +0300
Update maven-checkstyle-plugin to 3.1.2
---
parent/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 8e31426..629ef8e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -376,18 +376,18 @@
org.apache.maven.plugins
maven-checkstyle-plugin
-3.1.1
+3.1.2
org.apache.cxf.build-utils
cxf-buildtools
${cxf.build-utils.version}
-
+
UTF-8
-
[cxf] branch master updated (097e6bf -> 5a546d9)
This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git. from 097e6bf cxf-rt-frontend-jaxrs: fix PMD rule: UnusedAssignment new 332a024 cxf-systests-spring-boot: switch to JUnit 5 new 5a546d9 Update maven-checkstyle-plugin to 3.1.2 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: parent/pom.xml | 6 +-- systests/spring-boot/pom.xml | 44 + .../spring/boot/SpringJaxrsApplicationTest.java| 44 +++-- .../boot/SpringJaxrsClassesScanningTest.java | 10 ++-- .../boot/SpringJaxrsComponentScanningTest.java | 10 ++-- .../systest/jaxrs/spring/boot/SpringJaxrsTest.java | 44 +++-- .../jaxrs/spring/boot/SpringSseEmitterTest.java| 57 ++ .../systest/jaxws/spring/boot/SpringJaxwsTest.java | 53 ++-- 8 files changed, 99 insertions(+), 169 deletions(-) -
[cxf] branch master updated: cxf-rt-frontend-jaxrs: fix PMD rule: UnusedAssignment
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 097e6bf cxf-rt-frontend-jaxrs: fix PMD rule: UnusedAssignment
097e6bf is described below
commit 097e6bf31f3341ec3fc0a08cfd1f6b65a5e97b1e
Author: Alexey Markevich
AuthorDate: Thu Mar 18 03:45:35 2021 +0300
cxf-rt-frontend-jaxrs: fix PMD rule: UnusedAssignment
---
.../java/org/apache/cxf/jaxrs/JAXRSInvoker.java| 4 +--
.../cxf/jaxrs/impl/EntityTagHeaderProvider.java| 2 +-
.../cxf/jaxrs/impl/MediaTypeHeaderProvider.java| 7 ++--
.../org/apache/cxf/jaxrs/impl/RequestImpl.java | 4 +--
.../apache/cxf/jaxrs/impl/ResourceContextImpl.java | 2 +-
.../impl/tl/ThreadLocalInvocationHandler.java | 2 +-
.../cxf/jaxrs/interceptor/JAXRSInInterceptor.java | 4 +--
.../cxf/jaxrs/interceptor/JAXRSOutInterceptor.java | 8 ++---
.../cxf/jaxrs/model/AbstractResourceInfo.java | 2 +-
.../org/apache/cxf/jaxrs/model/URITemplate.java| 6 ++--
.../cxf/jaxrs/provider/AbstractJAXBProvider.java | 2 +-
.../jaxrs/provider/CachingMessageBodyReader.java | 2 +-
.../jaxrs/provider/CachingMessageBodyWriter.java | 2 +-
.../cxf/jaxrs/provider/DataSourceProvider.java | 2 +-
.../cxf/jaxrs/provider/FormEncodingProvider.java | 2 +-
.../cxf/jaxrs/provider/JAXBElementProvider.java| 42 +++---
.../cxf/jaxrs/provider/MultipartProvider.java | 4 +--
.../apache/cxf/jaxrs/provider/ProviderFactory.java | 8 ++---
.../apache/cxf/jaxrs/provider/SourceProvider.java | 2 +-
.../cxf/jaxrs/provider/XSLTJaxbProvider.java | 4 +--
.../jaxrs/security/JAASAuthenticationFilter.java | 2 +-
.../security/KerberosAuthenticationFilter.java | 3 +-
.../jaxrs/servlet/CXFNonSpringJaxrsServlet.java| 5 ++-
.../JAXRSServerFactoryBeanDefinitionParser.java| 2 +-
.../java/org/apache/cxf/jaxrs/utils/HttpUtils.java | 4 +--
.../org/apache/cxf/jaxrs/utils/InjectionUtils.java | 12 +++
.../org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 10 +++---
.../org/apache/cxf/jaxrs/utils/ResourceUtils.java | 2 +-
.../jaxrs/provider/JAXBElementProviderTest.java| 10 +++---
.../cxf/jaxrs/provider/ProviderFactoryTest.java| 2 +-
.../org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 3 +-
31 files changed, 79 insertions(+), 87 deletions(-)
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
index 98252ba..163ff78 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
@@ -239,7 +239,7 @@ public class JAXRSInvoker extends AbstractInvoker {
result = checkSubResultObject(result, subResourcePath);
-Class subResponseType = null;
+final Class subResponseType;
if (result.getClass() == Class.class) {
ResourceContext rc = new ResourceContextImpl(inMessage,
ori);
result = rc.getResource((Class)result);
@@ -325,7 +325,7 @@ public class JAXRSInvoker extends AbstractInvoker {
protected Method getMethodToInvoke(ClassResourceInfo cri,
OperationResourceInfo ori, Object resourceObject) {
Method resourceMethod = cri.getMethodDispatcher().getMethod(ori);
-Method methodToInvoke = null;
+Method methodToInvoke;
if (Proxy.class.isInstance(resourceObject)) {
methodToInvoke =
cri.getMethodDispatcher().getProxyMethod(resourceMethod);
if (methodToInvoke == null) {
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProvider.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProvider.java
index 77fb71e..0deb1c3 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProvider.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProvider.java
@@ -37,7 +37,7 @@ public class EntityTagHeaderProvider implements
HeaderDelegate {
return new EntityTag("*");
}
-String tag = null;
+String tag;
boolean weak = false;
int i = header.indexOf(WEAK_PREFIX);
if (i != -1) {
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
index 7b5b862..a885a33 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
@@ -20,7 +20,6 @@
package org.apache.cxf.jaxrs.impl;
import java.util.Collection
[cxf] 01/02: cxf-tools-java2ws: fix PMD rule: UnusedAssignment
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
commit 4f7e6935d36a1a48fc959de6c32fe84b3df25198
Author: Alexey Markevich
AuthorDate: Wed Mar 17 01:43:15 2021 +0300
cxf-tools-java2ws: fix PMD rule: UnusedAssignment
---
.../sts/x509/X509AsymmetricBindingTest.java| 2 +-
.../systest/sts/x509/cxf-asymmetric-service.xml| 2 +-
.../java2wsdl/generator/WSDLGeneratorFactory.java | 6 +--
.../generator/wsdl11/WSDL11Generator.java | 4 +-
.../wsdl11/annotator/WrapperBeanAnnotator.java | 2 +-
.../annotator/WrapperBeanFieldAnnotator.java | 2 +-
.../internal/DefaultServiceBuilderFactory.java | 2 +-
.../internal/SpringServiceBuilderFactory.java | 2 +-
.../fortest/cxf523/Operation0ResponseType.java | 12 ++---
.../cxf/tools/fortest/exception/OrderItem.java | 2 +-
.../org/apache/cxf/tools/java2ws/AegisTest.java| 61 ++
11 files changed, 33 insertions(+), 64 deletions(-)
diff --git
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java
index 694392c..6eb76f0 100644
---
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java
+++
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java
@@ -49,7 +49,7 @@ public class X509AsymmetricBindingTest extends
AbstractBusClientServerTestBase {
private static final String NAMESPACE =
"http://www.example.org/contract/DoubleIt;;
private static final QName SERVICE_QNAME = new QName(NAMESPACE,
"DoubleItService");
-private static final String PORT = allocatePort(DoubleItPortType.class);
+private static final String PORT = allocatePort(DoubleItServer.class);
@BeforeClass
public static void startServers() throws Exception {
diff --git
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509/cxf-asymmetric-service.xml
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509/cxf-asymmetric-service.xml
index fff9746..95d65a0 100644
---
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509/cxf-asymmetric-service.xml
+++
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509/cxf-asymmetric-service.xml
@@ -45,7 +45,7 @@
-http://www.example.org/contract/DoubleIt;
id="doubleitasymmetricsaml2"
implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl"
endpointName="s:DoubleItAsymmetricSAML2Port" serviceName="s:DoubleItService"
address="http://localhost:${testutil.ports.DoubleItPortType}/doubleit/services/doubleitasymmetricsaml2;
wsdlLocation="org/apache/cxf/systest/sts/x509/DoubleItAsymmetric.wsdl">
+http://www.example.org/contract/DoubleIt;
id="doubleitasymmetricsaml2"
implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl"
endpointName="s:DoubleItAsymmetricSAML2Port" serviceName="s:DoubleItService"
address="http://localhost:${testutil.ports.DoubleItServer}/doubleit/services/doubleitasymmetricsaml2;
wsdlLocation="org/apache/cxf/systest/sts/x509/DoubleItAsymmetric.wsdl">
diff --git
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java
index 9b42782..8e9b81f 100644
---
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java
+++
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java
@@ -36,14 +36,14 @@ public final class WSDLGeneratorFactory {
protected String getGeneratorClassName() {
String pkgName = PackageUtils.getPackageName(getClass());
-return pkgName + "." + wsdlVersion.toString().toLowerCase() + "." +
wsdlVersion + "Generator";
+return pkgName + '.' + wsdlVersion.toString().toLowerCase() + '.' +
wsdlVersion + "Generator";
}
public AbstractGenerator newGenerator() {
-AbstractGenerator generator = null;
+final AbstractGenerator generator;
String clzName = getGeneratorClassName();
try {
-generator = (AbstractGenerator)
Class.forName(clzName).newInstance();
+generator = (AbstractGenerator)
Class.forName(clzName).getDeclaredConstructor().newInstance();
} catch (Exception e) {
throw new ToolException("Can not find the Generator for: " +
clzName, e);
[cxf] branch master updated (5df0272 -> 04876cc)
This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git. from 5df0272 Update to Spring Framework 5.3.5 new 4f7e693 cxf-tools-java2ws: fix PMD rule: UnusedAssignment new 04876cc cxf-core: cleanup ServiceUtils 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: .../org/apache/cxf/common/util/PackageUtils.java | 5 - .../java/org/apache/cxf/helpers/ServiceUtils.java | 124 - .../apache/cxf/common/util/PackageUtilsTest.java | 4 +- .../apache/cxf/aegis/type/AbstractTypeCreator.java | 2 +- .../cxf/aegis/type/java5/Java5TypeCreator.java | 2 +- .../org/apache/cxf/aegis/util/ServiceUtils.java| 78 - .../sts/x509/X509AsymmetricBindingTest.java| 2 +- .../systest/sts/x509/cxf-asymmetric-service.xml| 2 +- .../java2wsdl/generator/WSDLGeneratorFactory.java | 6 +- .../generator/wsdl11/WSDL11Generator.java | 4 +- .../wsdl11/annotator/WrapperBeanAnnotator.java | 2 +- .../annotator/WrapperBeanFieldAnnotator.java | 2 +- .../internal/DefaultServiceBuilderFactory.java | 2 +- .../internal/SpringServiceBuilderFactory.java | 2 +- .../fortest/cxf523/Operation0ResponseType.java | 12 +- .../cxf/tools/fortest/exception/OrderItem.java | 2 +- .../org/apache/cxf/tools/java2ws/AegisTest.java| 61 +++--- 17 files changed, 37 insertions(+), 275 deletions(-) delete mode 100644 rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/ServiceUtils.java
[cxf] 02/02: cxf-core: cleanup ServiceUtils
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
commit 04876cc1556108d78c04653cd22867fb295cfff8
Author: Alexey Markevich
AuthorDate: Wed Mar 17 02:02:51 2021 +0300
cxf-core: cleanup ServiceUtils
---
.../org/apache/cxf/common/util/PackageUtils.java | 5 -
.../java/org/apache/cxf/helpers/ServiceUtils.java | 124 -
.../apache/cxf/common/util/PackageUtilsTest.java | 4 +-
.../apache/cxf/aegis/type/AbstractTypeCreator.java | 2 +-
.../cxf/aegis/type/java5/Java5TypeCreator.java | 2 +-
.../org/apache/cxf/aegis/util/ServiceUtils.java| 78 -
6 files changed, 4 insertions(+), 211 deletions(-)
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 49e19ff..b07874b 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,11 +110,6 @@ public final class PackageUtils {
}
String domain = tokens.remove(0);
-// comma was removed by tokenize
-//idx = domain.indexOf(':');
-//if (idx >= 0) {
-//domain = domain.substring(0, idx);
-//}
List r = tokenize(domain, urnScheme ? ".-" : ".");
Collections.reverse(r);
if ("www".equalsIgnoreCase(r.get(r.size() - 1))) {
diff --git a/core/src/main/java/org/apache/cxf/helpers/ServiceUtils.java
b/core/src/main/java/org/apache/cxf/helpers/ServiceUtils.java
index 4abd6a3..a39ee94 100644
--- a/core/src/main/java/org/apache/cxf/helpers/ServiceUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/ServiceUtils.java
@@ -19,13 +19,8 @@
package org.apache.cxf.helpers;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.util.StringTokenizer;
-import javax.xml.namespace.QName;
-
import org.apache.cxf.annotations.SchemaValidation.SchemaValidationType;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.message.Exchange;
@@ -183,30 +178,6 @@ public final class ServiceUtils {
return name;
}
-public static QName makeQualifiedNameFromClass(Class clazz) {
-String namespace = makeNamespaceFromClassName(clazz.getName(), "http");
-String localPart = makeServiceNameFromClassName(clazz);
-return new QName(namespace, localPart);
-}
-
-public static String getMethodName(Method m) {
-StringBuilder sb = new StringBuilder();
-sb.append(m.getDeclaringClass().getName());
-sb.append('.');
-sb.append(m.getName());
-sb.append('(');
-Class[] params = m.getParameterTypes();
-for (int i = 0; i < params.length; i++) {
-Class param = params[i];
-sb.append(param.getName());
-if (i < params.length - 1) {
-sb.append(", ");
-}
-}
-sb.append(')');
-return sb.toString();
-}
-
/**
* Generates the name of a XML namespace from a given class name and
* protocol. The returned namespace will take the form
@@ -240,99 +211,4 @@ public final class ServiceUtils {
return protocol + "://" + String.join(".", words) + "/";
}
-/**
- * Method makePackageName
- *
- * @param namespace
- */
-public static String makePackageName(String namespace) {
-
-String hostname;
-String path = "";
-
-// get the target namespace of the document
-try {
-URL u = new URL(namespace);
-
-hostname = u.getHost();
-path = u.getPath();
-} catch (MalformedURLException e) {
-if (namespace.indexOf(':') > -1) {
-hostname = namespace.substring(namespace.indexOf(':') + 1);
-
-if (hostname.indexOf('/') > -1) {
-hostname = hostname.substring(0, hostname.indexOf('/'));
-}
-} else {
-hostname = namespace;
-}
-}
-
-// if we didn't file a hostname, bail
-if (hostname == null) {
-return null;
-}
-
-// convert illegal java identifier
-hostname = hostname.replace('-', '_');
-path = path.replace('-', '_');
-
-// chomp off last forward slash in path, if necessary
-if ((path.length() > 0) && (path.charAt(path.length() - 1) == '/')) {
-path = path.substring(0, path.length() - 1);
-}
-
-// tokenize the hostname and reverse it
-StringTokenizer st = new StringTokenizer(hostname, ".:");
-String[] words = new String[st.countTokens()];
-
-for (int i =
[cxf] 02/02: Update karaf to 4.2.11
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
commit 2cc034360947d3fc2e1087192cbaeee3131b5eca
Author: Alexey Markevich
AuthorDate: Tue Mar 16 23:46:43 2021 +0300
Update karaf to 4.2.11
---
osgi/karaf/features/src/main/resources/features.xml | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/osgi/karaf/features/src/main/resources/features.xml
b/osgi/karaf/features/src/main/resources/features.xml
index e811e5e..71fadde 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -18,7 +18,7 @@
-->
http://karaf.apache.org/xmlns/features/v1.3.0;
name="cxf-${project.version}">
-
mvn:org.ops4j.pax.cdi/pax-cdi-features/1.0.0/xml/features
+
mvn:org.ops4j.pax.cdi/pax-cdi-features/1.1.4/xml/features
mvn:org.apache.geronimo.specs/geronimo-osgi-registry/1.1
diff --git a/parent/pom.xml b/parent/pom.xml
index 2943901..a56d115 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -245,7 +245,7 @@
2.3.2_1
none
1.1_4
-4.2.10
+4.2.11
20100527_1
2.0.8_6
[1.4,2)
[cxf] 01/02: Update swagger v3 to 2.1.7
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 commit dd9e67bef536068ce3956b9b94e380e780e78ee8 Author: Alexey Markevich AuthorDate: Tue Mar 16 23:45:56 2021 +0300 Update swagger v3 to 2.1.7 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index e63eb2c..2943901 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -203,7 +203,7 @@ 5.3.4 1.8.3 3.38.0 -2.1.6 +2.1.7 1.6.2 27.0-jre 1.25
[cxf] branch master updated (124fae2 -> 2cc0343)
This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git. from 124fae2 cxf-rt-databinding-aegis: fix PMD rule: UnusedAssignment new dd9e67b Update swagger v3 to 2.1.7 new 2cc0343 Update karaf to 4.2.11 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: osgi/karaf/features/src/main/resources/features.xml | 2 +- parent/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
[cxf] branch master updated (b341f7c -> 124fae2)
This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git. from b341f7c cxf-rt-ws-addr: fix PMD rule: UnusedAssignment add 124fae2 cxf-rt-databinding-aegis: fix PMD rule: UnusedAssignment No new revisions were added by this update. Summary of changes: .../java/org/apache/cxf/aegis/AegisContext.java| 5 +- .../cxf/aegis/databinding/AegisDatabinding.java| 6 +- .../apache/cxf/aegis/type/AbstractTypeCreator.java | 2 +- .../cxf/aegis/type/SimpleParameterizedType.java| 2 +- .../org/apache/cxf/aegis/type/basic/ArrayType.java | 2 +- .../org/apache/cxf/aegis/type/basic/BeanType.java | 3 +- .../cxf/aegis/type/basic/BigDecimalType.java | 2 +- .../type/basic/InterfaceInvocationHandler.java | 4 +- .../apache/cxf/aegis/type/basic/ObjectType.java| 5 +- .../org/apache/cxf/aegis/type/basic/TimeType.java | 2 +- .../apache/cxf/aegis/type/basic/TimestampType.java | 2 +- .../cxf/aegis/type/collection/CollectionType.java | 4 +- .../apache/cxf/aegis/type/collection/MapType.java | 2 +- .../org/apache/cxf/aegis/type/xml/SourceType.java | 2 +- .../org/apache/cxf/aegis/util/NamespaceHelper.java | 111 - .../cxf/aegis/util/date/XsDateTimeFormat.java | 4 +- .../cxf/aegis/type/basic/DateTimezoneTest.java | 2 +- 17 files changed, 21 insertions(+), 139 deletions(-)
[cxf] branch HEAD created (now 124fae2)
This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a change to branch HEAD in repository https://gitbox.apache.org/repos/asf/cxf.git. at 124fae2 cxf-rt-databinding-aegis: fix PMD rule: UnusedAssignment This branch includes the following new commits: new 124fae2 cxf-rt-databinding-aegis: fix PMD rule: UnusedAssignment The 1 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.
[cxf] 01/01: cxf-rt-databinding-aegis: fix PMD rule: UnusedAssignment
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch HEAD
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 124fae280460ca911c6040868271328e6ca8fe98
Author: Alexey Markevich
AuthorDate: Tue Mar 16 03:19:13 2021 +0300
cxf-rt-databinding-aegis: fix PMD rule: UnusedAssignment
---
.../java/org/apache/cxf/aegis/AegisContext.java| 5 +-
.../cxf/aegis/databinding/AegisDatabinding.java| 6 +-
.../apache/cxf/aegis/type/AbstractTypeCreator.java | 2 +-
.../cxf/aegis/type/SimpleParameterizedType.java| 2 +-
.../org/apache/cxf/aegis/type/basic/ArrayType.java | 2 +-
.../org/apache/cxf/aegis/type/basic/BeanType.java | 3 +-
.../cxf/aegis/type/basic/BigDecimalType.java | 2 +-
.../type/basic/InterfaceInvocationHandler.java | 4 +-
.../apache/cxf/aegis/type/basic/ObjectType.java| 5 +-
.../org/apache/cxf/aegis/type/basic/TimeType.java | 2 +-
.../apache/cxf/aegis/type/basic/TimestampType.java | 2 +-
.../cxf/aegis/type/collection/CollectionType.java | 4 +-
.../apache/cxf/aegis/type/collection/MapType.java | 2 +-
.../org/apache/cxf/aegis/type/xml/SourceType.java | 2 +-
.../org/apache/cxf/aegis/util/NamespaceHelper.java | 111 -
.../cxf/aegis/util/date/XsDateTimeFormat.java | 4 +-
.../cxf/aegis/type/basic/DateTimezoneTest.java | 2 +-
17 files changed, 21 insertions(+), 139 deletions(-)
diff --git
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java
index 2d5abdd..eddcbb9 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java
@@ -234,14 +234,11 @@ public class AegisContext {
rootTypeQNames = new HashSet<>();
if (this.rootClassNames != null) {
for (String typeName : rootClassNames) {
-Class c = null;
try {
-c = ClassLoaderUtils.loadClass(typeName, TypeUtil.class);
+rootClasses.add(ClassLoaderUtils.loadClass(typeName,
TypeUtil.class));
} catch (ClassNotFoundException e) {
throw new DatabindingException("Could not find override
type class: " + typeName, e);
}
-
-rootClasses.add(c);
}
}
diff --git
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
index 27a801a..302ba5a 100644
---
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
+++
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
@@ -202,16 +202,14 @@ public class AegisDatabinding extends AbstractDataBinding
{
for (String key : s.keySet()) {
if (key.endsWith(".implementation")) {
String className = key.substring(0, key.length() -
".implementation".length());
-Class clazz = null;
try {
-clazz = ClassLoaderUtils.loadClass(className,
getClass());
+String implClassName = (String)s.get(key);
+implMap.put(ClassLoaderUtils.loadClass(className,
getClass()), implClassName);
} catch (ClassNotFoundException e) {
Message message = new
Message("MAPPED_CLASS_NOT_FOUND", LOG, className, key);
LOG.warning(message.toString());
continue;
}
-String implClassName = (String)s.get(key);
-implMap.put(clazz, implClassName);
}
}
diff --git
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
index ce890cb..8ed3fef 100644
---
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
+++
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
@@ -107,7 +107,7 @@ public abstract class AbstractTypeCreator implements
TypeCreator {
public AegisType createTypeForClass(TypeClassInfo info) {
Class javaClass = TypeUtil.getTypeRelatedClass(info.getType());
-AegisType result = null;
+final AegisType result;
boolean newType = true;
if (info.getType() instanceof TypeVariable) {
//it's the generic type
diff --git
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/SimpleParameterizedType.java
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/Simpl
[cxf] 02/02: cxf-rt-ws-addr: fix PMD rule: UnusedAssignment
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
commit b341f7cd05a5130f53efd56c01d14136655afe35
Author: Alexey Markevich
AuthorDate: Mon Mar 15 20:25:33 2021 +0300
cxf-rt-ws-addr: fix PMD rule: UnusedAssignment
---
.../java/org/apache/cxf/ws/addressing/impl/InternalContextUtils.java | 2 +-
.../main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java | 3 +--
.../addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java | 3 +--
.../src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java | 2 +-
4 files changed, 4 insertions(+), 6 deletions(-)
diff --git
a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/InternalContextUtils.java
b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/InternalContextUtils.java
index 8c46dac..6182ef0 100644
---
a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/InternalContextUtils.java
+++
b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/InternalContextUtils.java
@@ -375,7 +375,7 @@ final class InternalContextUtils {
* @return the Action URI
*/
public static AttributedURIType getAction(Message message) {
-String action = null;
+final String action;
LOG.fine("Determining action");
Exception fault = message.getContent(Exception.class);
diff --git
a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
index d6f8278..a1f442a 100644
---
a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
+++
b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
@@ -1061,8 +1061,7 @@ public class MAPAggregatorImpl extends MAPAggregator {
boolean isProviderContext,
boolean isOutbound) {
-AddressingProperties maps = null;
-maps = ContextUtils.retrieveMAPs(message,
+AddressingProperties maps = ContextUtils.retrieveMAPs(message,
isProviderContext,
isOutbound);
LOG.log(Level.FINE, "MAPs retrieved from message {0}", maps);
diff --git
a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
index eccbaf1..e605609 100644
--- a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
+++ b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
@@ -386,13 +386,12 @@ public class MAPCodec extends AbstractSoapInterceptor {
if (header == null) {
header =
getHeaderFactory().getHeader(msg.getVersion());
}
-JAXBElement jaxbEl = null;
if (o instanceof Element) {
Element e = (Element)o;
Node importedNode =
header.getOwnerDocument().importNode(e, true);
header.appendChild(importedNode);
} else {
-jaxbEl = (JAXBElement) o;
+JAXBElement jaxbEl = (JAXBElement) o;
ctx.createMarshaller().marshal(jaxbEl, header);
}
diff --git
a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
index 760e27d..b30fbf6 100644
---
a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
+++
b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
@@ -612,7 +612,7 @@ public class MAPCodecTest {
}
private boolean isReply(boolean exposedAsNative) {
-boolean isReply = false;
+final boolean isReply;
if (exposedAsNative) {
isReply =
Names.WSA_RELATIONSHIP_REPLY.equals(
[cxf] branch master updated (e8cd90d -> b341f7c)
This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git. from e8cd90d Updating undertow to 2.2.5 new 4f932d8 cxf-services-sts-systests-basic: organize servers new b341f7c cxf-rt-ws-addr: fix PMD rule: UnusedAssignment 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: .../ws/addressing/impl/InternalContextUtils.java | 2 +- .../cxf/ws/addressing/impl/MAPAggregatorImpl.java | 3 +- .../apache/cxf/ws/addressing/soap/MAPCodec.java| 3 +- .../cxf/ws/addressing/soap/MAPCodecTest.java | 2 +- .../systest/sts/basic_auth/JaxrsBasicAuthTest.java | 2 +- .../sts/secure_conv/SCTSAMLTokenProvider.java | 3 +- .../sts/asymmetric/AsymmetricBindingTest.java | 109 --- .../apache/cxf/systest/sts/asymmetric/Server.java | 46 --- .../cxf/systest/sts/asymmetric/StaxServer.java | 46 --- .../apache/cxf/systest/sts/bearer/BearerTest.java | 81 --- .../org/apache/cxf/systest/sts/bearer/Server.java | 46 --- .../apache/cxf/systest/sts/bearer/StaxServer.java | 46 --- .../systest/sts/delegation/SAMLDelegationTest.java | 44 +- .../cxf/systest/sts/delegation/STSServer.java | 19 +-- .../DoubleItServer.java} | 14 +- .../cxf/systest/sts/deployment/STSServer.java | 24 +--- .../systest/sts/deployment/StaxDoubleItServer.java | 11 +- .../cxf/systest/sts/deployment/StaxSTSServer.java | 31 + .../intermediary_transformation/Intermediary.java | 46 --- .../IntermediaryCaching.java | 46 --- .../IntermediaryCachingPortTypeImpl.java | 4 +- .../IntermediaryPortTypeImpl.java | 4 +- .../IntermediaryTransformationCachingTest.java | 39 ++ .../IntermediaryTransformationTest.java| 48 ++- .../sts/intermediary_transformation/Server.java| 46 --- .../IssuerSTSServer.java} | 10 +- .../apache/cxf/systest/sts/issuer/IssuerTest.java | 105 +-- .../apache/cxf/systest/sts/issuer/STSServer.java | 46 --- .../org/apache/cxf/systest/sts/issuer/Server.java | 46 --- .../cxf/systest/sts/issueunit/IssueUnitTest.java | 89 ++-- .../org/apache/cxf/systest/sts/jaas/JAASTest.java | 108 +++ .../org/apache/cxf/systest/sts/jaas/Server.java| 46 --- .../org/apache/cxf/systest/sts/jaas/Server2.java | 46 --- .../systest/sts/sendervouches/Intermediary.java| 46 --- .../sts/sendervouches/SenderVouchesTest.java | 75 +++ .../cxf/systest/sts/sendervouches/Server.java | 46 --- .../sts/sendervouches/StaxIntermediary.java| 46 --- .../cxf/systest/sts/sendervouches/StaxServer.java | 46 --- .../sts/stsclient/AbstractSTSTokenTest.java| 21 +-- .../cxf/systest/sts/stsclient/STSClientTest.java | 42 ++ .../apache/cxf/systest/sts/stsclient/Server.java | 46 --- .../apache/cxf/systest/sts/symmetric/Server.java | 46 --- .../cxf/systest/sts/symmetric/StaxServer.java | 46 --- .../sts/symmetric/SymmetricBindingTest.java| 134 +- .../apache/cxf/systest/sts/template/Server.java| 46 --- .../cxf/systest/sts/template/StaxServer.java | 46 --- .../cxf/systest/sts/template/TemplateTest.java | 97 +++-- .../apache/cxf/systest/sts/transport/Server.java | 46 --- .../cxf/systest/sts/transport/StaxServer.java | 46 --- .../sts/transport/TransportBindingTest.java| 150 + .../cxf/systest/sts/username_actas/Server.java | 46 --- .../cxf/systest/sts/username_actas/Server2.java| 46 --- .../username_actas/UsernameActAsCachingTest.java | 60 ++--- .../sts/username_actas/UsernameActAsTest.java | 55 +++- .../systest/sts/username_onbehalfof/Server.java| 46 --- .../systest/sts/username_onbehalfof/Server2.java | 46 --- .../UsernameOnBehalfOfCachingTest.java | 62 ++--- .../UsernameOnBehalfOfTest.java| 55 +++- .../cxf/systest/sts/x509/AsymmetricServer.java | 50 --- .../org/apache/cxf/systest/sts/x509/Server.java| 50 --- .../apache/cxf/systest/sts/x509/StaxServer.java| 50 --- .../sts/x509/X509AsymmetricBindingTest.java| 35 ++--- .../systest/sts/x509/X509SymmetricBindingTest.java | 110 --- .../cxf/systest/sts/asymmetric/cxf-service.xml | 8 +- .../systest/sts/asymmetric/cxf-stax-service.xml| 8 +- .../apache/cxf/systest/sts/bearer/cxf-service.xml | 6 +- .../cxf/systest
[cxf] branch master updated: cxf-systests-microprofile-tracing: switch to SpanHandler
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 a05c7db cxf-systests-microprofile-tracing: switch to SpanHandler
a05c7db is described below
commit a05c7db2a8c09f38e98ad08c921da55f0d5f511f
Author: Alexey Markevich
AuthorDate: Sat Mar 13 11:34:13 2021 +0300
cxf-systests-microprofile-tracing: switch to SpanHandler
---
.../rest/client/JaxrsHeaderPropagationTest.java| 30 -
.../rest/client/regex/JaxrsPathRegexTest.java | 30 -
.../rest/client/tracing/BookStore.java | 2 +-
.../client/tracing/brave/BraveTracingTest.java | 75 +++---
...{TestSpanReporter.java => TestSpanHandler.java} | 14 ++--
5 files changed, 68 insertions(+), 83 deletions(-)
diff --git
a/systests/microprofile/client/jaxrs/src/test/java/org/apache/cxf/systest/microprofile/rest/client/JaxrsHeaderPropagationTest.java
b/systests/microprofile/client/jaxrs/src/test/java/org/apache/cxf/systest/microprofile/rest/client/JaxrsHeaderPropagationTest.java
index 9a2c60f..02fbc6a 100644
---
a/systests/microprofile/client/jaxrs/src/test/java/org/apache/cxf/systest/microprofile/rest/client/JaxrsHeaderPropagationTest.java
+++
b/systests/microprofile/client/jaxrs/src/test/java/org/apache/cxf/systest/microprofile/rest/client/JaxrsHeaderPropagationTest.java
@@ -27,48 +27,41 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
+import org.apache.cxf.Bus;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
-import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.testutil.common.AbstractClientServerTestBase;
+import org.apache.cxf.testutil.common.AbstractServerTestServerBase;
import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class JaxrsHeaderPropagationTest extends
AbstractBusClientServerTestBase {
+public class JaxrsHeaderPropagationTest extends AbstractClientServerTestBase {
public static final String PORT =
allocatePort(JaxrsHeaderPropagationTest.class);
WebClient client;
-@Ignore
-public static class Server extends AbstractBusTestServerBase {
-protected void run() {
+
+public static class Server extends AbstractServerTestServerBase {
+@Override
+protected org.apache.cxf.endpoint.Server createServer(Bus bus) throws
Exception {
final JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
sf.setResourceClasses(JaxrsResource.class);
sf.setResourceProvider(JaxrsResource.class,
new SingletonResourceProvider(new JaxrsResource()));
sf.setAddress("http://localhost:; + PORT + "/");
sf.setPublishedEndpointUrl("/");
-sf.create();
+return sf.create();
}
-public static void main(String[] args) {
-try {
-Server s = new Server();
-s.start();
-} catch (Exception ex) {
-ex.printStackTrace();
-System.exit(-1);
-} finally {
-System.out.println("done!");
-}
+public static void main(String[] args) throws Exception {
+new Server().start();
}
}
@@ -78,7 +71,6 @@ public class JaxrsHeaderPropagationTest extends
AbstractBusClientServerTestBase
AbstractResourceInfo.clearAllMaps();
//keep out of process due to stack traces testing failures
assertTrue("server did not launch correctly",
launchServer(Server.class, true));
-createStaticBus();
System.out.println("Listening on port " + PORT);
ConfigProviderResolver.setInstance(
diff --git
a/systests/microprofile/client/jaxrs/src/test/java/org/apache/cxf/systest/microprofile/rest/client/regex/JaxrsPathRegexTest.java
b/systests/microprofile/client/jaxrs/src/test/java/org/apache/cxf/systest/microprofile/rest/client/regex/JaxrsPathRegexTest.java
index 660d93a..8f78544 100644
---
a/systests/microprofile/client/jaxrs/src/test/java/org/apache/cxf/systest/microprofile/rest/client/regex/JaxrsPathRegexTest.java
+++
b/systests/microprofile/client/jaxrs/src/test/java/org/apache/cxf/systest/microprofile/rest/client/regex/JaxrsPathRegexTest.java
@@ -20,16 +20,16 @@ pack
[cxf] branch master updated: cxf-rt-frontend-jaxws: fix PMD rule: UnusedAssignment
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 aec252e cxf-rt-frontend-jaxws: fix PMD rule: UnusedAssignment
aec252e is described below
commit aec252eda5197098f9306e62edbf6a46e35cd054
Author: Alexey Markevich
AuthorDate: Fri Mar 12 23:36:55 2021 +0300
cxf-rt-frontend-jaxws: fix PMD rule: UnusedAssignment
---
.../java/org/apache/cxf/jaxws/EndpointImpl.java| 4 +--
.../java/org/apache/cxf/jaxws/ServiceImpl.java | 11 +++
.../cxf/jaxws/context/WrappedMessageContext.java | 4 +--
.../handler/AnnotationHandlerChainBuilder.java | 4 +--
.../cxf/jaxws/handler/HandlerChainInvoker.java | 12 ++-
.../logical/LogicalHandlerOutInterceptor.java | 2 +-
.../jaxws/handler/logical/LogicalMessageImpl.java | 4 +--
.../jaxws/handler/soap/SOAPMessageContextImpl.java | 2 +-
.../interceptors/MessageModeOutInterceptor.java| 2 +-
.../cxf/jaxws/interceptors/SwAInInterceptor.java | 2 +-
.../cxf/jaxws/interceptors/SwAOutInterceptor.java | 2 +-
.../jaxws/interceptors/WebFaultOutInterceptor.java | 4 +--
.../interceptors/WrapperClassInInterceptor.java| 2 +-
.../interceptors/WrapperClassOutInterceptor.java | 2 +-
.../org/apache/cxf/jaxws/spi/ProviderImpl.java | 13 ++--
.../JaxWsWebServicePublisherBeanPostProcessor.java | 4 +--
.../jaxws/support/JaxWsServiceConfiguration.java | 12 +++
.../cxf/jaxws/support/ServiceDelegateAccessor.java | 2 +-
.../java/org/apache/cxf/jaxws/CodeFirstTest.java | 3 +-
.../java/org/apache/cxf/jaxws/JaxWsClientTest.java | 5 ++-
.../jaxws/WrapperNamespaceClassGeneratorTest.java | 10 ++
.../cxf/jaxws/handler/HandlerChainInvokerTest.java | 25 +++
.../handler/soap/SOAPHandlerInterceptorTest.java | 4 +--
.../apache/cxf/jaxws/spring/SpringBeansTest.java | 2 ++
.../ExtSoapHeaderClientServerTest.java | 37 ++
25 files changed, 65 insertions(+), 109 deletions(-)
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
index 307fb53..6ee698c 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
@@ -325,8 +325,6 @@ public class EndpointImpl extends javax.xml.ws.Endpoint
checkPublishPermission();
checkPublishable();
-ServerImpl serv = null;
-
ClassLoaderHolder loader = null;
try {
if (bus != null) {
@@ -335,7 +333,7 @@ public class EndpointImpl extends javax.xml.ws.Endpoint
loader =
ClassLoaderUtils.setThreadContextClassloader(newLoader);
}
}
-serv = getServer(addr);
+ServerImpl serv = getServer(addr);
if (addr != null) {
EndpointInfo endpointInfo =
serv.getEndpoint().getEndpointInfo();
if (endpointInfo.getAddress() == null ||
!endpointInfo.getAddress().contains(addr)) {
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
index 85a0e77..186236a 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
@@ -245,7 +245,7 @@ public class ServiceImpl extends ServiceDelegate {
private JaxWsClientEndpointImpl getJaxwsEndpoint(QName portName,
AbstractServiceFactoryBean sf,
WebServiceFeature...features) {
Service service = sf.getService();
-EndpointInfo ei = null;
+EndpointInfo ei;
if (portName == null) {
ei =
service.getServiceInfos().get(0).getEndpoints().iterator().next();
} else {
@@ -286,7 +286,7 @@ public class ServiceImpl extends ServiceDelegate {
private AbstractServiceFactoryBean createDispatchService(DataBinding db) {
AbstractServiceFactoryBean serviceFactory;
-Service dispatchService = null;
+final Service dispatchService;
if (null != wsdlURL) {
WSDLServiceFactory sf = new WSDLServiceFactory(bus, wsdlURL,
serviceName);
@@ -516,7 +516,6 @@ public class ServiceImpl extends ServiceDelegate {
private EndpointInfo createEndpointInfo(AbstractServiceFactoryBean
serviceFactory,
QName portName,
PortInfoImpl portInfo) throws
BusException {
-EndpointInfo ei = null;
String address = portInfo.getAddress();
String bindingID = BindingID.getBindingID(portInfo.getBindingID());
@@ -530,7 +529,7 @@ public class
[cxf] branch master updated (ed0c7fe -> df1c14e)
This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git. from ed0c7fe Fixing minor typo in comment new eeacfd4 systests: introduce AbstractServerTestServerBase new df1c14e cxf-rt-frontend-simple: fix PMD rule: UnusedAssignment 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: .../cxf/endpoint/dynamic/DynamicClientFactory.java | 12 +-- .../org/apache/cxf/frontend/ClientFactoryBean.java | 4 +- .../cxf/frontend/ClientProxyFactoryBean.java | 3 +- .../java/org/apache/cxf/frontend/WSDLGetUtils.java | 7 +- .../cxf/frontend/spring/ClientServerTest.java | 4 +- .../apache/cxf/systest/jaxrs/AsyncResource.java| 4 +- .../cxf/systest/jaxrs/BookContinuationServer.java | 23 ++--- .../systest/jaxrs/BookCxfContinuationServer.java | 23 ++--- .../systest/jaxrs/BookCxfContinuationStore.java| 14 +-- .../org/apache/cxf/systest/jaxrs/BookServer.java | 111 + .../org/apache/cxf/systest/jaxrs/BookServer20.java | 36 ++- .../cxf/systest/jaxrs/BookServerAsyncClient.java | 36 ++- .../jaxrs/BookServerResourceCreatedOutside.java| 32 ++ .../BookServerResourceCreatedSpringProviders.java | 12 +-- .../apache/cxf/systest/jaxrs/BookServerSub.java| 31 ++ .../cxf/systest/jaxrs/BookServerThrottled.java | 39 ++-- .../systest/jaxrs/JAXRS20ClientServerBookTest.java | 2 +- .../cxf/systest/jaxrs/JAXRSAtomBookTest.java | 8 +- .../jaxrs/JAXRSClientServerQueryParamBookTest.java | 2 +- ...RSClientServerQueryParamCollectionBookTest.java | 2 +- ...ClientServerResourceCreatedOutsideBookTest.java | 33 ++ ...entServerResourceCreatedSpringProviderTest.java | 16 +-- .../jaxrs/JAXRSClientServerSpringBookTest.java | 29 ++ .../jaxrs/JAXRSClientServerStreamingTest.java | 29 ++ .../JAXRSClientServerUserResourceAsteriskTest.java | 39 ++-- .../JAXRSClientServerUserResourceDefaultTest.java | 32 ++ .../jaxrs/JAXRSClientServerUserResourceTest.java | 37 ++- .../apache/cxf/systest/jaxrs/JAXRSFiltersTest.java | 37 +++ .../jaxrs/JAXRSMultipartLocalTransportTest.java| 2 +- .../cxf/systest/jaxrs/JAXRSMultipartTest.java | 4 +- .../apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java | 8 +- .../apache/cxf/systest/jaxrs/MultipartServer.java | 29 ++ .../AbstractSwagger2ServiceDescriptionTest.java| 26 ++--- .../description/Swagger2CustomPropertiesTest.java | 6 +- .../Swagger2FilterServiceDescriptionTest.java | 4 +- ...Swagger2NonAnnotatedServiceDescriptionTest.java | 9 +- .../Swagger2RegularServiceDescriptionTest.java | 4 +- .../Swagger2XForwardedDescriptionTest.java | 1 - .../SwaggerToOpenApiConversionTest.java| 25 ++--- .../description/SwaggerUiConfigurationTest.java| 18 +--- .../AbstractOpenApiServiceDescriptionTest.java | 27 ++--- ...enApiContextBasedConfigApplicationOnlyTest.java | 30 +++--- .../openapi/OpenApiContextBasedConfigTest.java | 31 +++--- .../openapi/OpenApiCustomPropertiesTest.java | 6 +- .../openapi/OpenApiCustomizerSubclassTest.java | 24 + .../description/openapi/OpenApiCustomizerTest.java | 14 +-- .../OpenApiNonAnnotatedServiceDescriptionTest.java | 9 +- .../description/openapi/OpenApiPropertiesTest.java | 6 +- .../OpenApiRegularServiceDescriptionTest.java | 4 +- .../extraction/JAXRSClientServerTikaTest.java | 27 ++--- .../cxf/systest/jaxrs/form/FormBehaviorTest.java | 29 ++ .../cxf/systest/jaxrs/logging/LoggingServer.java | 23 ++--- .../jaxrs/metrics/JAXRSServerMetricsTest.java | 31 ++ .../systest/jaxrs/provider/JAXBProviderTest.java | 29 ++ .../jaxrs/provider/JsrJsonbProviderTest.java | 29 ++ .../jaxrs/provider/JsrJsonpProviderTest.java | 33 +++--- .../jaxrs/reactive/CompletableFutureServer.java| 37 ++- .../jaxrs/reactive/JAXRSCompletionStageTest.java | 2 +- .../jaxrs/reactive/JAXRSRxJava2MaybeTest.java | 2 +- .../jaxrs/reactive/JAXRSRxJava2SingleTest.java | 2 +- .../jaxrs/reactive/JAXRSRxJava3MaybeTest.java | 2 +- .../jaxrs/reactive/JAXRSRxJava3SingleTest.java | 2 +- .../jaxrs/reactive/RxJava2FlowableServer.java | 39 ++-- .../systest/jaxrs/reactive/RxJava2MaybeServer.java | 34 ++- .../jaxrs/reactive/RxJava2ObservableServer.java| 35 ++- .../jaxrs/reactive/RxJava2SingleServer.java| 34 ++- .../jaxrs/reactive/RxJava3FlowableServer.java | 39 ++-- .../systest/jaxrs/reactive/RxJava3MaybeServer.java | 34 ++- .../jaxrs/reactive/RxJava3Observable
[cxf] 02/02: cxf-rt-frontend-simple: fix PMD rule: UnusedAssignment
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
commit df1c14e0f6d2246177c9f01762e19107e79c4393
Author: Alexey Markevich
AuthorDate: Fri Mar 12 17:59:55 2021 +0300
cxf-rt-frontend-simple: fix PMD rule: UnusedAssignment
---
.../apache/cxf/endpoint/dynamic/DynamicClientFactory.java| 12 ++--
.../main/java/org/apache/cxf/frontend/ClientFactoryBean.java | 4 ++--
.../java/org/apache/cxf/frontend/ClientProxyFactoryBean.java | 3 +--
.../src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java | 7 +++
.../org/apache/cxf/frontend/spring/ClientServerTest.java | 4 ++--
5 files changed, 14 insertions(+), 16 deletions(-)
diff --git
a/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
b/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
index 947e84a..2e8b416 100644
---
a/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
+++
b/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
@@ -392,7 +392,7 @@ public class DynamicClientFactory {
LOG.log(Level.SEVERE, new Message("COULD_NOT_COMPILE_SRC", LOG,
wsdlUrl).toString());
}
FileUtils.removeDir(src);
-URL[] urls = null;
+final URL[] urls;
try {
urls = new URL[] {classes.toURI().toURL()};
} catch (MalformedURLException mue) {
@@ -764,11 +764,11 @@ public class DynamicClientFactory {
errors.append('\n');
}
if (arg0.getLineNumber() > 0) {
-errors.append(arg0.getLocalizedMessage() + "\n"
-+ " at line " + arg0.getLineNumber()
-+ " column " + arg0.getColumnNumber()
-+ " of schema " + arg0.getSystemId()
-+ "\n");
+errors.append(arg0.getLocalizedMessage()).append('\n')
+.append(" at line ").append(arg0.getLineNumber())
+.append(" column ").append(arg0.getColumnNumber())
+.append(" of schema ").append(arg0.getSystemId())
+.append('\n');
} else {
errors.append(arg0.getMessage());
errors.append('\n');
diff --git
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
index ae2dacb..4811727 100644
---
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
+++
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
@@ -85,8 +85,8 @@ public class ClientFactoryBean extends
AbstractWSDLBasedEndpointFactory {
} else if (properties != null) {
getServiceFactory().getProperties().putAll(properties);
}
-Client client = null;
-Endpoint ep = null;
+final Client client;
+final Endpoint ep;
try {
ep = createEndpoint();
this.getServiceFactory().sendEvent(FactoryBeanListener.Event.PRE_CLIENT_CREATE,
ep);
diff --git
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
index d7b2977..a09a922 100644
---
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
+++
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
@@ -124,10 +124,9 @@ public class ClientProxyFactoryBean extends
AbstractBasicInterceptorProvider {
*/
public synchronized Object create() {
ClassLoaderHolder orig = null;
-ClassLoader loader = null;
try {
if (getBus() != null) {
-loader = getBus().getExtension(ClassLoader.class);
+ClassLoader loader = getBus().getExtension(ClassLoader.class);
if (loader != null) {
orig =
ClassLoaderUtils.setThreadContextClassloader(loader);
}
diff --git
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
index 07f867d..958b118 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
@@ -243,10 +243,9 @@ public class WSDLGetUtils {
Message message,
String xsdWsdlPar) {
Bus bus = message.getExchange().getBus();
-List elementList = null;
try {
-e
[cxf] branch master updated: cxf-systests-ws-security: fix compilation error
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 3afa246 cxf-systests-ws-security: fix compilation error
3afa246 is described below
commit 3afa24650ef1988c8464b5a48853a6f75ff794f9
Author: Alexey Markevich
AuthorDate: Fri Mar 12 15:07:30 2021 +0300
cxf-systests-ws-security: fix compilation error
---
.../apache/cxf/systest/ws/policy/JavaFirstPolicyServer.java | 12 +---
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServer.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServer.java
index 831a7f1..d6073b2 100644
---
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServer.java
+++
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServer.java
@@ -33,25 +33,15 @@ public class JavaFirstPolicyServer extends
AbstractBusTestServerBase {
public static final String PORT2 =
allocatePort(JavaFirstPolicyServer.class, 2);
public static final String PORT3 =
allocatePort(JavaFirstPolicyServer.class, 3);
-public JavaFirstPolicyServer() {
-
-}
-
protected void run() {
URL busFile =
JavaFirstPolicyServer.class.getResource("javafirstserver.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
Assert.assertNotNull(busLocal);
setBus(busLocal);
-
-try {
-new JavaFirstPolicyServer();
-} catch (Exception e) {
-e.printStackTrace();
-}
}
-public static void main(String[] args) {
+public static void main(String[] args) throws Exception {
new JavaFirstPolicyServer().start();
}
}
[cxf] branch master updated: systests: fix compilation error; back System.exit(0)
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 7cfda87 systests: fix compilation error; back System.exit(0)
7cfda87 is described below
commit 7cfda87f43d41fddb0e2d0e2501cb3918807e88f
Author: Alexey Markevich
AuthorDate: Fri Mar 12 13:54:08 2021 +0300
systests: fix compilation error; back System.exit(0)
---
.../description/SwaggerUiConfigurationTest.java| 35 +++---
.../apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java | 5
.../ws/rm/AbstractClientPersistenceTest.java | 2 +-
.../ws/rm/AbstractServerPersistenceTest.java | 2 +-
.../cxf/systest/ws/rm/WSRM12ServerCycleTest.java | 2 +-
.../common/AbstractBusClientServerTestBase.java| 4 +--
.../testutil/common/AbstractTestServerBase.java| 2 ++
.../testutil/common/EmbeddedJMSBrokerLauncher.java | 4 +--
.../apache/cxf/testutil/common/ServerLauncher.java | 2 +-
9 files changed, 27 insertions(+), 31 deletions(-)
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerUiConfigurationTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerUiConfigurationTest.java
index 9c25f3a..67ece33 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerUiConfigurationTest.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerUiConfigurationTest.java
@@ -31,11 +31,10 @@ import
org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
import org.apache.cxf.jaxrs.swagger.Swagger2Feature;
import org.apache.cxf.jaxrs.swagger.ui.SwaggerUiConfig;
-import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.testutil.common.AbstractClientServerTestBase;
+import org.apache.cxf.testutil.common.AbstractTestServerBase;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.containsString;
@@ -43,11 +42,13 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
-public class SwaggerUiConfigurationTest extends
AbstractBusClientServerTestBase {
+public class SwaggerUiConfigurationTest extends AbstractClientServerTestBase {
private static final String PORT =
allocatePort(SwaggerUiConfigurationTest.class);
-@Ignore
-public static class Server extends AbstractBusTestServerBase {
+public static class Server extends AbstractTestServerBase {
+
+private org.apache.cxf.endpoint.Server server;
+
@Override
protected void run() {
final JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
@@ -60,19 +61,18 @@ public class SwaggerUiConfigurationTest extends
AbstractBusClientServerTestBase
feature.setSwaggerUiConfig(new
SwaggerUiConfig().url("/swagger.json"));
sf.setFeatures(Arrays.asList(feature));
sf.setAddress("http://localhost:; + PORT + "/");
-sf.create();
+server = sf.create();
+}
+
+@Override
+public void tearDown() throws Exception {
+server.stop();
+server.destroy();
+server = null;
}
-public static void main(String[] args) {
-try {
-Server s = new Server();
-s.start();
-} catch (Exception ex) {
-ex.printStackTrace();
-System.exit(-1);
-} finally {
-System.out.println("done!");
-}
+public static void main(String[] args) throws Exception {
+new Server().start();
}
}
@@ -81,7 +81,6 @@ public class SwaggerUiConfigurationTest extends
AbstractBusClientServerTestBase
AbstractResourceInfo.clearAllMaps();
//keep out of process due to stack traces testing failures
assertTrue("server did not launch correctly",
launchServer(Server.class, false));
-createStaticBus();
}
@Test
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java
index 0badeed..12b8d9d 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java
@@ -59,14 +59,10 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
public class JAXRSJmsTest extends AbstractBusClientServerTestBase {
[cxf] branch master updated: systests: fix compilation error; explicit stopAllServers
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 dfbc457 systests: fix compilation error; explicit stopAllServers
dfbc457 is described below
commit dfbc4575f45fb22d4a7417914f87ea585e64d6b1
Author: Alexey Markevich
AuthorDate: Fri Mar 12 12:08:07 2021 +0300
systests: fix compilation error; explicit stopAllServers
---
.../test/java/org/apache/cxf/systest/jaxrs/reactor/ReactorServer.java | 2 +-
.../test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/ReactorServer.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/ReactorServer.java
index 4f7f4b3..d690315 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/ReactorServer.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/ReactorServer.java
@@ -74,7 +74,7 @@ public class ReactorServer extends AbstractBusTestServerBase {
server2 = null;
}
-public static void main(String[] args) {
+public static void main(String[] args) throws Exception {
ReactorServer server = new ReactorServer();
System.out.println("Go to http://localhost:; + PORT +
"/reactor/flux/textJsonImplicitListAsyncStream");
server.start();
diff --git
a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java
b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java
index 2b3ee6b..ecbef8e 100644
---
a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java
+++
b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java
@@ -78,8 +78,9 @@ public class ClientServerSwaTest extends
AbstractBusClientServerTestBase {
createStaticBus();
}
@AfterClass
-public static void clearProperty() {
+public static void clearProperty() throws Exception {
System.clearProperty("EmbeddedBrokerURL");
+stopAllServers();
}
@Test
public void testSwa() throws Exception {
[cxf] branch master updated: cxf-testutils: throw exception on server starup; fix pmd warnings
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 0d47c86 cxf-testutils: throw exception on server starup; fix pmd
warnings
0d47c86 is described below
commit 0d47c86fce89c3709cca97f44904b6b24a5c2021
Author: Alexey Markevich
AuthorDate: Fri Mar 12 10:43:33 2021 +0300
cxf-testutils: throw exception on server starup; fix pmd warnings
---
.../AnonymousComplexTypeImpl.java | 3 +-
.../cxf/greeter_control/AbstractGreeterImpl.java | 14 +++
.../apache/cxf/greeter_control/ControlImpl.java| 3 +-
.../greeter_control/FaultThrowingInterceptor.java | 2 +-
.../testutil/common/AbstractTestServerBase.java| 8 ++--
.../testutil/common/EmbeddedJMSBrokerLauncher.java | 48 +++---
.../apache/cxf/testutil/common/ServerLauncher.java | 21 +++---
7 files changed, 32 insertions(+), 67 deletions(-)
diff --git
a/testutils/src/main/java/org/apache/cxf/anonymous_complex_type/AnonymousComplexTypeImpl.java
b/testutils/src/main/java/org/apache/cxf/anonymous_complex_type/AnonymousComplexTypeImpl.java
index be2fb70..edf2d9f 100644
---
a/testutils/src/main/java/org/apache/cxf/anonymous_complex_type/AnonymousComplexTypeImpl.java
+++
b/testutils/src/main/java/org/apache/cxf/anonymous_complex_type/AnonymousComplexTypeImpl.java
@@ -53,7 +53,6 @@ public class AnonymousComplexTypeImpl implements
AnonymousComplexType {
String name = refSplitName.getSplitName().getName();
SplitNameResponse.Names names = new SplitNameResponse.Names();
int pos = name.indexOf(' ');
-SplitNameResponse response = null;
if (pos > 0) {
names.setFirst(name.substring(0, pos));
names.setSecond(name.substring(pos + 1));
@@ -63,7 +62,7 @@ public class AnonymousComplexTypeImpl implements
AnonymousComplexType {
}
-response = new SplitNameResponse();
+SplitNameResponse response = new SplitNameResponse();
response.setNames(names);
RefSplitNameResponse refResponse = new RefSplitNameResponse();
refResponse.setSplitNameResponse(response);
diff --git
a/testutils/src/main/java/org/apache/cxf/greeter_control/AbstractGreeterImpl.java
b/testutils/src/main/java/org/apache/cxf/greeter_control/AbstractGreeterImpl.java
index 8396846..c93deaa 100644
---
a/testutils/src/main/java/org/apache/cxf/greeter_control/AbstractGreeterImpl.java
+++
b/testutils/src/main/java/org/apache/cxf/greeter_control/AbstractGreeterImpl.java
@@ -20,6 +20,7 @@
package org.apache.cxf.greeter_control;
import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Logger;
import javax.xml.ws.AsyncHandler;
@@ -41,7 +42,7 @@ public class AbstractGreeterImpl implements Greeter {
private long delay;
private String lastOnewayArg;
private boolean throwAlways;
-private boolean useLastOnewayArg;
+private AtomicBoolean useLastOnewayArg = new AtomicBoolean();
private int pingMeCount;
public long getDelay() {
@@ -58,10 +59,8 @@ public class AbstractGreeterImpl implements Greeter {
}
}
-public void useLastOnewayArg(Boolean use) {
-synchronized (this) {
-useLastOnewayArg = use;
-}
+public void useLastOnewayArg(boolean use) {
+useLastOnewayArg.set(use);
}
public void setThrowAlways(boolean t) {
@@ -77,10 +76,7 @@ public class AbstractGreeterImpl implements Greeter {
// ignore
}
}
-String result = null;
-synchronized (this) {
-result = useLastOnewayArg ? lastOnewayArg : arg0.toUpperCase();
-}
+String result = useLastOnewayArg.get() ? lastOnewayArg :
arg0.toUpperCase();
LOG.fine("returning: " + result);
return result;
}
diff --git
a/testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java
b/testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java
index 95ec3b4..f35c8aa 100644
--- a/testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java
+++ b/testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java
@@ -114,7 +114,6 @@ public class ControlImpl implements Control {
public void setFaultLocation(FaultLocation fl) {
List> interceptors =
greeterBus.getInInterceptors();
-FaultThrowingInterceptor fi = null;
for (Interceptor i : interceptors) {
if (i instanceof FaultThrowingInterceptor) {
interceptors.remove(i);
@@ -127,7 +126,7 @@ public class ControlImpl implements Control {
return;
}
-fi = new FaultThrowingInterceptor(fl.getPhase());
+FaultThr
[cxf] branch master updated: rt/features: fix PMD rule: UnusedAssignment
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 fb02ed5 rt/features: fix PMD rule: UnusedAssignment
fb02ed5 is described below
commit fb02ed59d270bbd78fc6b931bbbaacd1dc0c42ec
Author: Alexey Markevich
AuthorDate: Thu Mar 11 22:41:57 2021 +0300
rt/features: fix PMD rule: UnusedAssignment
---
.../cxf/clustering/FailoverTargetSelector.java | 2 +-
.../clustering/LoadDistributorTargetSelector.java | 5 ++--
.../java/org/apache/cxf/ext/logging/WireTapIn.java | 4 ++--
.../ext/logging/event/DefaultLogEventMapper.java | 4 +---
.../metrics/codahale/CodahaleMetricsProvider.java | 27 --
5 files changed, 15 insertions(+), 27 deletions(-)
diff --git
a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
index c2abc28..46ab74f 100644
---
a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
+++
b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
@@ -346,7 +346,7 @@ public class FailoverTargetSelector extends
AbstractConduitSelector {
* @return alternative addresses
*/
protected List updateContextAlternatives(Exchange exchange,
InvocationContext invocation) {
-List alternateAddresses = null;
+final List alternateAddresses;
if (!invocation.hasAlternates()) {
// no previous failover attempt on this invocation
//
diff --git
a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/LoadDistributorTargetSelector.java
b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/LoadDistributorTargetSelector.java
index b1844fc..467e3e7 100644
---
a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/LoadDistributorTargetSelector.java
+++
b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/LoadDistributorTargetSelector.java
@@ -135,7 +135,7 @@ public class LoadDistributorTargetSelector extends
FailoverTargetSelector {
*/
protected Endpoint getFailoverTarget(Exchange exchange,
InvocationContext invocation) {
-List alternateAddresses = null;
+final List alternateAddresses;
if (!invocation.hasAlternates()) {
// no previous failover attempt on this invocation
//
@@ -179,7 +179,6 @@ public class LoadDistributorTargetSelector extends
FailoverTargetSelector {
*/
private Endpoint getDistributionTarget(Exchange exchange,
InvocationContext invocation) {
-List alternateAddresses = null;
if ((addressList == null) || (addressList.isEmpty())) {
try {
addressList = getStrategy().getAlternateAddresses(null);
@@ -188,7 +187,7 @@ public class LoadDistributorTargetSelector extends
FailoverTargetSelector {
+ " cannot handle a null argument to
getAlternateAddresses: " + ex.toString());
}
}
-alternateAddresses = addressList;
+List alternateAddresses = addressList;
if ((alternateAddresses == null) || (alternateAddresses.isEmpty())) {
alternateAddresses = getStrategy().getAlternateAddresses(exchange);
diff --git
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/WireTapIn.java
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/WireTapIn.java
index aefc731..9b08c7d 100644
---
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/WireTapIn.java
+++
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/WireTapIn.java
@@ -35,8 +35,8 @@ import org.apache.cxf.phase.Phase;
public class WireTapIn extends AbstractPhaseInterceptor {
private static final String WIRE_TAP_STARTED = WireTapIn.class.getName() +
".Started";
-private long threshold = -1;
-private int limit = AbstractLoggingInterceptor.DEFAULT_LIMIT;
+private long threshold;
+private int limit;
/**
* Instantiates a new WireTapIn
diff --git
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
index 8a0dec4..43f0120 100644
---
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
+++
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
@@ -235,9 +235,7 @@ public class DefaultLogEventMapper {
private String getOperationName(Message message) {
String operationName = null;
-BindingOperationInfo boi =
[cxf] branch master updated: rt/transports: fix PMD rule: UnusedAssignment
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 c44c39b rt/transports: fix PMD rule: UnusedAssignment
c44c39b is described below
commit c44c39b2faed4eef057a68e38fbe743609cb6a4c
Author: Alexey Markevich
AuthorDate: Thu Mar 11 19:54:07 2021 +0300
rt/transports: fix PMD rule: UnusedAssignment
---
.../http/asyncclient/AsyncHTTPConduit.java | 3 +--
.../asyncclient/AsyncHttpTransportFactory.java | 3 +--
.../netty/client/NettyHttpTransportFactory.java| 6 +-
.../http/netty/server/NettyHttpDestination.java| 2 +-
.../NettyHttpServerEngineFactoryHolder.java| 4 ++--
.../server/spring/NettySpringTypesFactory.java | 14 +++--
.../netty/server/NettyHttpServerEngineTest.java| 9 -
.../spring/UndertowSpringTypesFactory.java | 14 +++--
.../UndertowHTTPServerEngineFactoryTest.java | 7 +++
.../UndertowHTTPServerEngineTest.java | 23 --
.../apache/cxf/transport/udp/UDPDestination.java | 2 +-
.../jetty9/Jetty9WebSocketDestination.java | 5 ++---
12 files changed, 30 insertions(+), 62 deletions(-)
diff --git
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
index fc71e8c..aa98230 100755
---
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
+++
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
@@ -193,7 +193,6 @@ public class AsyncHTTPConduit extends
URLConnectionHTTPConduit {
if (StringUtils.isEmpty(uri.getPath())) {
//hc needs to have the path be "/"
uri = uri.resolve("/");
-addressChanged = true;
}
message.put(USE_ASYNC, Boolean.TRUE);
@@ -900,7 +899,7 @@ public class AsyncHTTPConduit extends
URLConnectionHTTPConduit {
return sslContext;
}
-SSLContext ctx = null;
+final SSLContext ctx;
if (tlsClientParameters.getSslContext() != null) {
ctx = tlsClientParameters.getSslContext();
} else {
diff --git
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHttpTransportFactory.java
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHttpTransportFactory.java
index 69b00b0..f963d62 100644
---
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHttpTransportFactory.java
+++
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHttpTransportFactory.java
@@ -105,7 +105,6 @@ public class AsyncHttpTransportFactory extends
AbstractTransportFactory implemen
public Conduit getConduit(EndpointInfo endpointInfo, EndpointReferenceType
target, Bus bus)
throws IOException {
-HTTPConduit conduit = null;
// need to updated the endpointInfo
endpointInfo.setAddress(getAddress(endpointInfo));
@@ -113,7 +112,7 @@ public class AsyncHttpTransportFactory extends
AbstractTransportFactory implemen
if (fact == null) {
fact = factory;
}
-conduit = fact.createConduit(bus, endpointInfo, target);
+HTTPConduit conduit = fact.createConduit(bus, endpointInfo, target);
// Spring configure the conduit.
String address = conduit.getAddress();
diff --git
a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpTransportFactory.java
b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpTransportFactory.java
index 30115db..cfcc799 100644
---
a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpTransportFactory.java
+++
b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpTransportFactory.java
@@ -92,8 +92,6 @@ public class NettyHttpTransportFactory extends
AbstractTransportFactory implemen
return address;
}
-
-
@Override
public Conduit getConduit(EndpointInfo endpointInfo, Bus bus) throws
IOException {
return getConduit(endpointInfo, endpointInfo.getTarget(), bus);
@@ -103,11 +101,10 @@ public class NettyHttpTransportFactory extends
AbstractTransportFactory implemen
public Conduit getConduit(EndpointInfo endpointInfo, EndpointReferenceType
target, Bus bus)
throws IOException {
-HTTPConduit conduit = null;
// need to updated the endpointInfo
endpointInfo.setAddress(get
[cxf] branch master updated: tools/wsdlto: fix PMD rule: UnusedAssignment
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 3786f43 tools/wsdlto: fix PMD rule: UnusedAssignment
3786f43 is described below
commit 3786f439160432c37504c5b816905bee193587ea
Author: Alexey Markevich
AuthorDate: Thu Mar 11 10:06:48 2021 +0300
tools/wsdlto: fix PMD rule: UnusedAssignment
---
.../misc/processor/AbstractWSDLToProcessor.java| 12 ++
.../tools/misc/processor/WSDLToSoapProcessor.java | 8 ++--
.../tools/misc/processor/XSDToWSDLProcessor.java | 12 ++
.../cxf/tools/wsdlto/AbstractCodeGenTest.java | 2 +-
.../cxf/tools/wsdlto/jaxws/CodeGenBugTest.java | 4 +-
.../apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java | 48 +++---
6 files changed, 37 insertions(+), 49 deletions(-)
diff --git
a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/AbstractWSDLToProcessor.java
b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/AbstractWSDLToProcessor.java
index 5b61636..fa2bd99 100644
---
a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/AbstractWSDLToProcessor.java
+++
b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/AbstractWSDLToProcessor.java
@@ -64,9 +64,8 @@ public class AbstractWSDLToProcessor implements Processor {
protected Writer getOutputWriter(String newNameExt) throws ToolException {
-Writer writer = null;
-String newName = null;
-String outputDir;
+final String newName;
+final String outputDir;
if (env.get(ToolConstants.CFG_OUTPUTFILE) != null) {
newName = (String)env.get(ToolConstants.CFG_OUTPUTFILE);
@@ -87,16 +86,12 @@ public class AbstractWSDLToProcessor implements Processor {
}
if (env.get(ToolConstants.CFG_OUTPUTDIR) != null) {
outputDir = (String)env.get(ToolConstants.CFG_OUTPUTDIR);
-if (!("/".equals(outputDir.substring(outputDir.length() - 1)) ||
"\\".equals(outputDir
-.substring(outputDir.length() - 1 {
-outputDir = outputDir + "/";
-}
} else {
outputDir = "./";
}
FileWriterUtil fw = new FileWriterUtil(outputDir,
env.get(OutputStreamCreator.class));
try {
-writer = fw.getWriter("", newName);
+return fw.getWriter("", newName);
} catch (IOException ioe) {
Message msg = new Message("FAIL_TO_WRITE_FILE",
LOG,
@@ -105,7 +100,6 @@ public class AbstractWSDLToProcessor implements Processor {
+ newName);
throw new ToolException(msg, ioe);
}
-return writer;
}
diff --git
a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java
b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java
index 161ee9b..fd0be57 100644
---
a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java
+++
b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java
@@ -186,7 +186,7 @@ public class WSDLToSoapProcessor extends
AbstractWSDLToProcessor {
SOAPBindingUtil.addSOAPNamespace(wsdlDefinition, isSOAP12());
-SoapBinding soapBinding = null;
+final SoapBinding soapBinding;
try {
soapBinding = SOAPBindingUtil.createSoapBinding(extReg,
isSOAP12());
} catch (WSDLException wse) {
@@ -232,7 +232,7 @@ public class WSDLToSoapProcessor extends
AbstractWSDLToProcessor {
if (extReg == null) {
extReg = wsdlFactory.newPopulatedExtensionRegistry();
}
-SoapOperation soapOperation = null;
+final SoapOperation soapOperation;
try {
soapOperation = SOAPBindingUtil.createSoapOperation(extReg,
isSOAP12());
@@ -269,7 +269,7 @@ public class WSDLToSoapProcessor extends
AbstractWSDLToProcessor {
if (extReg == null) {
extReg = wsdlFactory.newPopulatedExtensionRegistry();
}
-SoapBody soapBody = null;
+final SoapBody soapBody;
try {
soapBody = SOAPBindingUtil.createSoapBody(extReg, parent,
isSOAP12());
} catch (WSDLException wse) {
@@ -298,7 +298,7 @@ public class WSDLToSoapProcessor extends
AbstractWSDLToProcessor {
if (extReg == null) {
extReg = wsdlFactory.newPopulatedExtensionRegistry();
}
-SoapFault soapFault = null;
+final SoapFault soapFault;
try {
soapFault = SOAPBindingUtil.createSoapFault(extReg, isSOAP12());
} catch (WSDLExcepti
