[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("topLevelListWithXsiType.xml");
+=
StaxUtils.createXMLStreamReader(getClass().getResourceAsStream("topLevelListWithXsiType.xml"));
[cxf] 01/02: CXF-8428: Fix org.apache.cxf.jaxrs.sse.client.SseEventSourceImplTest.testReconnectAndTwoEventsReceived (#763)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit bbe7545b85513ccf9eb5381b8e23d8f14dda1340
Author: Andriy Redko
AuthorDate: Mon Mar 22 21:34:44 2021 -0400
CXF-8428: Fix
org.apache.cxf.jaxrs.sse.client.SseEventSourceImplTest.testReconnectAndTwoEventsReceived
(#763)
(cherry picked from commit bbfbfcacfa3511826786c397ba4442a8207a237e)
(cherry picked from commit 173e02cbbe5dd5ba825cca5156eceda7f404e5ce)
---
rt/rs/sse/pom.xml | 5 ++
.../jaxrs/sse/client/SseEventSourceImplTest.java | 57 +-
2 files changed, 51 insertions(+), 11 deletions(-)
diff --git a/rt/rs/sse/pom.xml b/rt/rs/sse/pom.xml
index b763f1c..13e62ee 100644
--- a/rt/rs/sse/pom.xml
+++ b/rt/rs/sse/pom.xml
@@ -80,5 +80,10 @@
${project.version}
test
+
+org.awaitility
+awaitility
+test
+
diff --git
a/rt/rs/sse/src/test/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceImplTest.java
b/rt/rs/sse/src/test/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceImplTest.java
index 93c6006..00e44a7 100644
---
a/rt/rs/sse/src/test/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceImplTest.java
+++
b/rt/rs/sse/src/test/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceImplTest.java
@@ -19,6 +19,7 @@
package org.apache.cxf.jaxrs.sse.client;
import java.io.IOException;
+import java.time.Duration;
import java.util.ArrayList;
import java.util.EnumMap;
import java.util.List;
@@ -53,6 +54,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+import static org.awaitility.Awaitility.await;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.nullValue;
@@ -195,7 +197,10 @@ public class SseEventSourceImplTest {
Thread.sleep(150L);
}
-assertThat(events.size(), equalTo(1));
+await()
+.atMost(Duration.ofMillis(500L))
+.untilAsserted(() -> assertThat(events.size(), equalTo(1)));
+
assertThat(events.get(0).getId(), equalTo("1"));
assertThat(events.get(0).getReconnectDelay(), equalTo(1L));
assertThat(events.get(0).getComment(), equalTo("test comment"));
@@ -213,7 +218,10 @@ public class SseEventSourceImplTest {
Thread.sleep(150L);
}
-assertThat(events.size(), equalTo(1));
+await()
+.atMost(Duration.ofMillis(500L))
+.untilAsserted(() -> assertThat(events.size(), equalTo(1)));
+
assertThat(events.get(0).getName(), nullValue());
assertThat(events.get(0).readData(), equalTo("just test data"));
}
@@ -229,7 +237,10 @@ public class SseEventSourceImplTest {
Thread.sleep(150L);
}
-assertThat(events.size(), equalTo(1));
+await()
+.atMost(Duration.ofMillis(500L))
+.untilAsserted(() -> assertThat(events.size(), equalTo(1)));
+
assertThat(events.get(0).getName(), nullValue());
assertThat(events.get(0).readData(), equalTo("just test data\nin
multiple lines"));
}
@@ -245,7 +256,10 @@ public class SseEventSourceImplTest {
Thread.sleep(150L);
}
-assertThat(events.size(), equalTo(1));
+await()
+.atMost(Duration.ofMillis(500L))
+.untilAsserted(() -> assertThat(events.size(), equalTo(1)));
+
assertThat(events.get(0).getName(), equalTo("just name"));
}
@@ -260,7 +274,10 @@ public class SseEventSourceImplTest {
Thread.sleep(150L);
}
-assertThat(events.size(), equalTo(2));
+await()
+.atMost(Duration.ofMillis(500L))
+.untilAsserted(() -> assertThat(events.size(), equalTo(2)));
+
assertThat(events.get(0).getName(), nullValue());
assertThat(events.get(0).readData(), equalTo("just test data"));
assertThat(events.get(1).getId(), equalTo("1"));
@@ -294,7 +311,10 @@ public class SseEventSourceImplTest {
Thread.sleep(150L);
}
-assertThat(events.size(), equalTo(2));
+await()
+.atMost(Duration.ofMillis(500L))
+.untilAsserted(() -> assertThat(events.size(), equalTo(2)));
+
assertThat(events.get(0).getId(), equalTo("1"));
assertThat(events.get(0).getComment(), equalTo("test comment"));
assertThat(events.get(0).readData(), equalTo("test data"));
@@ -314,7 +334,10 @@ public class SseEventSourceImplTest {
Thread.sleep(150L);
}
-assertThat(errors.size(), equalTo(2));
+await()
+.atMost(Duration.ofMillis(500L))
+.untilAsserted(() -> assertThat(errors.size(), equalTo(2)));
+
[cxf] branch 3.3.x-fixes updated (fa32c3e -> d5bb75f)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch 3.3.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git. from fa32c3e Updating Jetty to 9.4.38.v20210224 in the samples new bbe7545 CXF-8428: Fix org.apache.cxf.jaxrs.sse.client.SseEventSourceImplTest.testReconnectAndTwoEventsReceived (#763) new d5bb75f Recording .gitmergeinfo Changes The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitmergeinfo | 3 ++ rt/rs/sse/pom.xml | 5 ++ .../jaxrs/sse/client/SseEventSourceImplTest.java | 57 +- 3 files changed, 54 insertions(+), 11 deletions(-)
[cxf] 02/02: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.3.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit d5bb75fdc9a1f83ee005eea5bd72054828470965 Author: reta AuthorDate: Mon Mar 22 21:46:37 2021 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index e0298a4..5c4329f 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -388,6 +388,7 @@ B a15c1e19669ef1f52d9f470daae8856c52ffc0c8 B a15d0cea0b857178a73cf177898f6c8f4787e8cf B a17f1327b9ad1375f3930d78e88d15556e4af3bd B a1b0abe02b943ff43fed5020643ce3b2ccebb12f +B a1c9edd2cd40c73862bf6bbe1c1df86b78e14648 B a207359e74b2f664dbd78855e7e49e0efe3972b8 B a276fd2cfd6e78326cda060779d9d8568e796313 B a29109410e8427d1fb8edf5fb88c955aaca0b79a @@ -711,6 +712,7 @@ M 4fa9dd5faa934ad7c778a346b311b095764cec3a M 50359bf9aec79b5e3c27ce9e2e9ddf07351b1bf6 M 507719b5f70a2fba0a83b2f260fd588ffe546200 M 528b35178ec31860cf5ad2095d6f3cc3c951d914 +M 535f75e575f151634316fb0bb19c28faee2b257c M 55abc6f8416fd81f26627fa42a37f903f9ef7965 M 56e962c295f48e9f48dbd0884df79e5e48601284 M 589e321622b72ae57fab910d76b3e4fb0c160979 @@ -803,6 +805,7 @@ M a61ca44ab50c1a3fc20fbaafe89b372809e0f49b M a7169e542bb351563cc2296853681f06f35b4bfd M a7e3d0cfb720310bbd17315de3a9ece7fe4e697e M a8fcf81a7a7f06a9c5ffb75cbe372b841f4ba38c +M a9ba4196e8f914b04c1465f909a68122b4ce7fdf M a9eb350f7cc28347ffeb7a8af44ba661531429f1 M aa995675095ca648c1458cb8bf82c357160dfe16 M aabf37788e571426e70250e7a62c7f4502e4d6e9
[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
---
a/rt/security-saml
