You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2021/06/05 20:14:39 UTC
[cxf] branch 3.4.x-fixes updated (20f8347 -> 87b27ed)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 20f8347 [maven-release-plugin] prepare for next development iteration
new 025d8bd Fixing NoAriesBlueprintTest for JDK16+ (fails with unknown protocol: http/https)
new c0d4345 CXF-8548: Get rid of Powermock usage (#811)
new 87b27ed Recording .gitmergeinfo Changes
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:
.gitmergeinfo | 2 +
osgi/itests-felix/pom.xml | 9 +-
.../cxf/osgi/itests/NoAriesBlueprintTest.java | 17 +-
parent/pom.xml | 1 -
rt/rs/security/http-signature/pom.xml | 14 --
.../security/httpsignature/SpecExamplesTest.java | 278 ++++++++++++---------
6 files changed, 186 insertions(+), 135 deletions(-)
[cxf] 01/03: Fixing NoAriesBlueprintTest for JDK16+ (fails with
unknown protocol: http/https)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 025d8bdb47aa3127cd975be5eb91fcaa20f39d2c
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Jun 3 20:12:48 2021 -0400
Fixing NoAriesBlueprintTest for JDK16+ (fails with unknown protocol: http/https)
(cherry picked from commit e47b201c3032f64082e9173c0f02d54698388c06)
---
osgi/itests-felix/pom.xml | 9 ++++++---
.../apache/cxf/osgi/itests/NoAriesBlueprintTest.java | 17 +++++++++++++++--
parent/pom.xml | 2 +-
3 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/osgi/itests-felix/pom.xml b/osgi/itests-felix/pom.xml
index e31e248..c850238 100644
--- a/osgi/itests-felix/pom.xml
+++ b/osgi/itests-felix/pom.xml
@@ -108,10 +108,9 @@
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
- <version>2.6.2</version>
+ <version>2.6.7</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
@@ -142,7 +141,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
diff --git a/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java b/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
index e6f0d34..d5a0ce1 100644
--- a/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
+++ b/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
@@ -18,8 +18,14 @@
*/
package org.apache.cxf.osgi.itests;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+
+import javax.crypto.NoSuchPaddingException;
+import javax.net.ssl.SSLContext;
import org.apache.cxf.helpers.JavaUtils;
+import org.apache.http.ssl.SSLContextBuilder;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -30,13 +36,15 @@ import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
import static org.ops4j.pax.exam.CoreOptions.junitBundles;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.systemPackages;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import static org.ops4j.pax.exam.CoreOptions.when;
-
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
public class NoAriesBlueprintTest extends OSGiTestSupport {
@@ -53,13 +61,14 @@ public class NoAriesBlueprintTest extends OSGiTestSupport {
}
@Configuration
- public Option[] config() {
+ public Option[] config() throws NoSuchAlgorithmException, NoSuchPaddingException, KeyManagementException {
String localRepo = System.getProperty("localRepository");
if (localRepo == null) {
localRepo = "";
}
final Option[] basicOptions = new Option[] {
+ junitBundles(),
systemProperty("java.awt.headless").value("true"),
when(!"".equals(localRepo))
.useOptions(systemProperty("org.ops4j.pax.url.mvn.localRepository").value(localRepo)),
@@ -82,6 +91,10 @@ public class NoAriesBlueprintTest extends OSGiTestSupport {
)
};
if (JavaUtils.isJava9Compatible()) {
+ // Pre-create SSL context (on JDK16+, the HTTP/HTTPS URL handlers are not registered for some reason)
+ final SSLContext sslContext = new SSLContextBuilder().setProtocol("TLS").build();
+ assertThat(sslContext, not(nullValue()));
+
return OptionUtils.combine(basicOptions,
mavenBundle("jakarta.annotation", "jakarta.annotation-api").versionAsInProject(),
mavenBundle("com.sun.activation", "jakarta.activation").versionAsInProject(),
diff --git a/parent/pom.xml b/parent/pom.xml
index baa7254..8422043 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -181,7 +181,7 @@
<cxf.persistence-api.version>2.2.3</cxf.persistence-api.version>
<cxf.plexus-archiver.version>4.2.0</cxf.plexus-archiver.version>
<cxf.plexus-utils.version>3.2.0</cxf.plexus-utils.version>
- <cxf.powermock.version>2.0.4</cxf.powermock.version>
+ <cxf.powermock.version>2.0.9</cxf.powermock.version>
<cxf.reactivestreams.version>1.0.3</cxf.reactivestreams.version>
<cxf.reactor.version>3.3.17.RELEASE</cxf.reactor.version>
<cxf.rhino.version>1.7R2</cxf.rhino.version>
[cxf] 02/03: CXF-8548: Get rid of Powermock usage (#811)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit c0d43454ebc8ef766c94404d5d897675ac704a09
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Jun 5 14:36:16 2021 -0400
CXF-8548: Get rid of Powermock usage (#811)
(cherry picked from commit ade1129cd94291f7fbd12cb536bc9367b19bb870)
---
parent/pom.xml | 1 -
rt/rs/security/http-signature/pom.xml | 14 --
.../security/httpsignature/SpecExamplesTest.java | 278 ++++++++++++---------
3 files changed, 163 insertions(+), 130 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 8422043..8c5e381 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -181,7 +181,6 @@
<cxf.persistence-api.version>2.2.3</cxf.persistence-api.version>
<cxf.plexus-archiver.version>4.2.0</cxf.plexus-archiver.version>
<cxf.plexus-utils.version>3.2.0</cxf.plexus-utils.version>
- <cxf.powermock.version>2.0.9</cxf.powermock.version>
<cxf.reactivestreams.version>1.0.3</cxf.reactivestreams.version>
<cxf.reactor.version>3.3.17.RELEASE</cxf.reactor.version>
<cxf.rhino.version>1.7R2</cxf.rhino.version>
diff --git a/rt/rs/security/http-signature/pom.xml b/rt/rs/security/http-signature/pom.xml
index 0674530..527e0b8 100644
--- a/rt/rs/security/http-signature/pom.xml
+++ b/rt/rs/security/http-signature/pom.xml
@@ -70,26 +70,12 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>${cxf.powermock.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito2</artifactId>
- <version>${cxf.powermock.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${cxf.mockito.version}</version>
<scope>test</scope>
</dependency>
-
</dependencies>
</project>
diff --git a/rt/rs/security/http-signature/src/test/java/org/apache/cxf/rs/security/httpsignature/SpecExamplesTest.java b/rt/rs/security/http-signature/src/test/java/org/apache/cxf/rs/security/httpsignature/SpecExamplesTest.java
index 86c99ac..d44c8cd 100644
--- a/rt/rs/security/http-signature/src/test/java/org/apache/cxf/rs/security/httpsignature/SpecExamplesTest.java
+++ b/rt/rs/security/http-signature/src/test/java/org/apache/cxf/rs/security/httpsignature/SpecExamplesTest.java
@@ -39,34 +39,37 @@ import javax.ws.rs.core.MultivaluedHashMap;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.UriInfo;
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
+import org.apache.cxf.phase.Phase;
+import org.apache.cxf.phase.PhaseInterceptor;
import org.apache.cxf.phase.PhaseInterceptorChain;
+import org.apache.cxf.phase.PhaseManager;
import org.apache.cxf.rs.security.httpsignature.filters.CreateSignatureInterceptor;
import org.apache.cxf.rs.security.httpsignature.filters.VerifySignatureFilter;
import org.apache.cxf.rs.security.httpsignature.provider.KeyProvider;
import org.apache.cxf.rs.security.httpsignature.provider.MockAlgorithmProvider;
import org.apache.cxf.rs.security.httpsignature.provider.MockSecurityProvider;
+import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.mockito.Mockito;
import static org.junit.Assert.assertEquals;
-import static org.powermock.api.mockito.PowerMockito.mock;
-import static org.powermock.api.mockito.PowerMockito.mockStatic;
-import static org.powermock.api.mockito.PowerMockito.when;
/**
* Some examples from the Appendix C of the spec.
*/
-@org.powermock.core.classloader.annotations.PrepareForTest(PhaseInterceptorChain.class)
-@RunWith(org.powermock.modules.junit4.PowerMockRunner.class)
public class SpecExamplesTest {
private static KeyProvider keyProvider;
private static PublicKey publicKey;
-
+ private Bus bus;
+
@BeforeClass
public static void setUp() throws IOException, InvalidKeySpecException {
try {
@@ -93,6 +96,11 @@ public class SpecExamplesTest {
e.printStackTrace();
}
}
+
+ @Before
+ public void setUpBus() {
+ bus = BusFactory.getDefaultBus();
+ }
@Test
public void defaultTest() throws IOException {
@@ -136,39 +144,38 @@ public class SpecExamplesTest {
requestStringHeaders.add(header, value.get(0));
});
- mockStatic(PhaseInterceptorChain.class);
- Message message = mock(Message.class);
- when(PhaseInterceptorChain.getCurrentMessage()).thenReturn(message);
-
- ClientRequestContext requestContext = getClientRequestContextMock(uri, method, requestHeaders);
-
- interceptor.filter(requestContext);
-
- String signatureHeader = (String) requestHeaders.get("Signature").get(0);
- requestStringHeaders.add("Signature", signatureHeader);
-
- String expectedHeader = "keyId=\"Test\",algorithm=\"rsa-sha256\","
- + "signature=\"SjWJWbWN7i0wzBvtPl8rbASWz5xQW6mcJmn+ibttBqtifLN7Sazz"
- + "6m79cNfwwb8DMJ5cou1s7uEGKKCs+FLEEaDV5lp7q25WqS+lavg7T8hc0GppauB"
- + "6hbgEKTwblDHYGEtbGmtdHgVCk9SuS13F0hZ8FD0k/5OxEPXe5WozsbM=\"";
-
- assertEquals(signatureHeader.replaceAll("headers=\"date\",", ""), expectedHeader);
-
- // Verify that the request signature can be verified by the filter
- MessageVerifier messageVerifier = new MessageVerifier(keyId -> publicKey);
- messageVerifier.setAddDefaultRequiredHeaders(false);
- messageVerifier.setSecurityProvider(new MockSecurityProvider());
- messageVerifier.setAlgorithmProvider(new MockAlgorithmProvider());
-
- VerifySignatureFilter verifySignatureFilter = new VerifySignatureFilter();
- verifySignatureFilter.setMessageVerifier(messageVerifier);
-
- ContainerRequestContext containerRequestContext =
- getContainerRequestContextMock(uri, method, requestStringHeaders);
-
- verifySignatureFilter.filter(containerRequestContext);
+ final Message message = new MessageImpl();
+ doInPhaseInterceptor(message, () -> {
+ ClientRequestContext requestContext = getClientRequestContextMock(uri, method, requestHeaders);
+ interceptor.filter(requestContext);
+
+ String signatureHeader = (String) requestHeaders.get("Signature").get(0);
+ requestStringHeaders.add("Signature", signatureHeader);
+
+ String expectedHeader = "keyId=\"Test\",algorithm=\"rsa-sha256\","
+ + "signature=\"SjWJWbWN7i0wzBvtPl8rbASWz5xQW6mcJmn+ibttBqtifLN7Sazz"
+ + "6m79cNfwwb8DMJ5cou1s7uEGKKCs+FLEEaDV5lp7q25WqS+lavg7T8hc0GppauB"
+ + "6hbgEKTwblDHYGEtbGmtdHgVCk9SuS13F0hZ8FD0k/5OxEPXe5WozsbM=\"";
+
+ assertEquals(signatureHeader.replaceAll("headers=\"date\",", ""), expectedHeader);
+
+ // Verify that the request signature can be verified by the filter
+ MessageVerifier messageVerifier = new MessageVerifier(keyId -> publicKey);
+ messageVerifier.setAddDefaultRequiredHeaders(false);
+ messageVerifier.setSecurityProvider(new MockSecurityProvider());
+ messageVerifier.setAlgorithmProvider(new MockAlgorithmProvider());
+
+ VerifySignatureFilter verifySignatureFilter = new VerifySignatureFilter();
+ verifySignatureFilter.setMessageVerifier(messageVerifier);
+
+ ContainerRequestContext containerRequestContext =
+ getContainerRequestContextMock(uri, method, requestStringHeaders);
+
+ verifySignatureFilter.filter(containerRequestContext);
+ });
}
+
@Test
public void basicTest() throws IOException {
Map<String, List<String>> headers = createMockHeaders();
@@ -211,38 +218,37 @@ public class SpecExamplesTest {
requestStringHeaders.add(header, value.get(0));
});
- mockStatic(PhaseInterceptorChain.class);
- Message message = mock(Message.class);
- when(PhaseInterceptorChain.getCurrentMessage()).thenReturn(message);
-
- ClientRequestContext requestContext = getClientRequestContextMock(uri, method, requestHeaders);
-
- interceptor.filter(requestContext);
-
- String signatureHeader = (String) requestHeaders.get("Signature").get(0);
- requestStringHeaders.add("Signature", signatureHeader);
-
- String expectedHeader = "keyId=\"Test\",algorithm=\"rsa-sha256\","
- + "headers=\"(request-target) host date\",signature=\"qdx+H7PHHDZgy4"
- + "y/Ahn9Tny9V3GP6YgBPyUXMmoxWtLbHpUnXS2mg2+SbrQDMCJypxBLSPQR2aAjn"
- + "7ndmw2iicw3HMbe8VfEdKFYRqzic+efkb3nndiv/x1xSHDJWeSWkx3ButlYSuBs"
- + "kLu6kd9Fswtemr3lgdDEmn04swr2Os0=\"";
-
- assertEquals(signatureHeader, expectedHeader);
-
- // Verify that the request signature can be verified by the filter
- MessageVerifier messageVerifier = new MessageVerifier(keyId -> publicKey);
- messageVerifier.setAddDefaultRequiredHeaders(false);
- messageVerifier.setSecurityProvider(new MockSecurityProvider());
- messageVerifier.setAlgorithmProvider(new MockAlgorithmProvider());
-
- VerifySignatureFilter verifySignatureFilter = new VerifySignatureFilter();
- verifySignatureFilter.setMessageVerifier(messageVerifier);
-
- ContainerRequestContext containerRequestContext =
- getContainerRequestContextMock(uri, method, requestStringHeaders);
-
- verifySignatureFilter.filter(containerRequestContext);
+ final Message message = new MessageImpl();
+ doInPhaseInterceptor(message, () -> {
+ ClientRequestContext requestContext = getClientRequestContextMock(uri, method, requestHeaders);
+
+ interceptor.filter(requestContext);
+
+ String signatureHeader = (String) requestHeaders.get("Signature").get(0);
+ requestStringHeaders.add("Signature", signatureHeader);
+
+ String expectedHeader = "keyId=\"Test\",algorithm=\"rsa-sha256\","
+ + "headers=\"(request-target) host date\",signature=\"qdx+H7PHHDZgy4"
+ + "y/Ahn9Tny9V3GP6YgBPyUXMmoxWtLbHpUnXS2mg2+SbrQDMCJypxBLSPQR2aAjn"
+ + "7ndmw2iicw3HMbe8VfEdKFYRqzic+efkb3nndiv/x1xSHDJWeSWkx3ButlYSuBs"
+ + "kLu6kd9Fswtemr3lgdDEmn04swr2Os0=\"";
+
+ assertEquals(signatureHeader, expectedHeader);
+
+ // Verify that the request signature can be verified by the filter
+ MessageVerifier messageVerifier = new MessageVerifier(keyId -> publicKey);
+ messageVerifier.setAddDefaultRequiredHeaders(false);
+ messageVerifier.setSecurityProvider(new MockSecurityProvider());
+ messageVerifier.setAlgorithmProvider(new MockAlgorithmProvider());
+
+ VerifySignatureFilter verifySignatureFilter = new VerifySignatureFilter();
+ verifySignatureFilter.setMessageVerifier(messageVerifier);
+
+ ContainerRequestContext containerRequestContext =
+ getContainerRequestContextMock(uri, method, requestStringHeaders);
+
+ verifySignatureFilter.filter(containerRequestContext);
+ });
}
@Test
@@ -289,61 +295,59 @@ public class SpecExamplesTest {
requestStringHeaders.add(header, value.get(0));
});
- ClientRequestContext requestContext = getClientRequestContextMock(uri, method, requestHeaders);
-
- mockStatic(PhaseInterceptorChain.class);
- Message message = mock(Message.class);
- when(PhaseInterceptorChain.getCurrentMessage()).thenReturn(message);
-
- interceptor.filter(requestContext);
-
- String signatureHeader = (String) requestHeaders.get("Signature").get(0);
- requestStringHeaders.add("Signature", signatureHeader);
-
- String expectedHeader = "keyId=\"Test\",algorithm=\"rsa-sha256\","
- + "headers=\"(request-target) host date content-type digest content-length\","
- + "signature=\"vSdrb+dS3EceC9bcwHSo4MlyKS59iFIrhgYkz8+oVLEEzmYZZvRs"
- + "8rgOp+63LEM3v+MFHB32NfpB2bEKBIvB1q52LaEUHFv120V01IL+TAD48XaERZF"
- + "ukWgHoBTLMhYS2Gb51gWxpeIq8knRmPnYePbF5MOkR0Zkly4zKH7s1dE=\"";
-
- assertEquals(signatureHeader, expectedHeader);
-
- // Verify that the request signature can be verified by the filter
- MessageVerifier messageVerifier = new MessageVerifier(keyId -> publicKey);
- messageVerifier.setAddDefaultRequiredHeaders(false);
- messageVerifier.setSecurityProvider(new MockSecurityProvider());
- messageVerifier.setAlgorithmProvider(new MockAlgorithmProvider());
-
- VerifySignatureFilter verifySignatureFilter = new VerifySignatureFilter();
- verifySignatureFilter.setMessageVerifier(messageVerifier);
-
- ContainerRequestContext containerRequestContext =
- getContainerRequestContextMock(uri, method, requestStringHeaders);
- InputStream stream = new ByteArrayInputStream("{\"hello\": \"world\"}".getBytes(StandardCharsets.UTF_8));
- when(containerRequestContext.getEntityStream()).thenReturn(stream);
-
- verifySignatureFilter.filter(containerRequestContext);
+ final Message message = new MessageImpl();
+ doInPhaseInterceptor(message, () -> {
+ ClientRequestContext requestContext = getClientRequestContextMock(uri, method, requestHeaders);
+ interceptor.filter(requestContext);
+
+ String signatureHeader = (String) requestHeaders.get("Signature").get(0);
+ requestStringHeaders.add("Signature", signatureHeader);
+
+ String expectedHeader = "keyId=\"Test\",algorithm=\"rsa-sha256\","
+ + "headers=\"(request-target) host date content-type digest content-length\","
+ + "signature=\"vSdrb+dS3EceC9bcwHSo4MlyKS59iFIrhgYkz8+oVLEEzmYZZvRs"
+ + "8rgOp+63LEM3v+MFHB32NfpB2bEKBIvB1q52LaEUHFv120V01IL+TAD48XaERZF"
+ + "ukWgHoBTLMhYS2Gb51gWxpeIq8knRmPnYePbF5MOkR0Zkly4zKH7s1dE=\"";
+
+ assertEquals(signatureHeader, expectedHeader);
+
+ // Verify that the request signature can be verified by the filter
+ MessageVerifier messageVerifier = new MessageVerifier(keyId -> publicKey);
+ messageVerifier.setAddDefaultRequiredHeaders(false);
+ messageVerifier.setSecurityProvider(new MockSecurityProvider());
+ messageVerifier.setAlgorithmProvider(new MockAlgorithmProvider());
+
+ VerifySignatureFilter verifySignatureFilter = new VerifySignatureFilter();
+ verifySignatureFilter.setMessageVerifier(messageVerifier);
+
+ ContainerRequestContext containerRequestContext =
+ getContainerRequestContextMock(uri, method, requestStringHeaders);
+ InputStream stream = new ByteArrayInputStream("{\"hello\": \"world\"}".getBytes(StandardCharsets.UTF_8));
+ Mockito.when(containerRequestContext.getEntityStream()).thenReturn(stream);
+
+ verifySignatureFilter.filter(containerRequestContext);
+ });
}
private ClientRequestContext getClientRequestContextMock(URI uri, String method,
MultivaluedMap<String, Object> requestHeaders) {
- ClientRequestContext requestContext = mock(ClientRequestContext.class);
- when(requestContext.getEntity()).thenReturn(null);
- when(requestContext.getMethod()).thenReturn(method);
- when(requestContext.getHeaders()).thenReturn(requestHeaders);
- when(requestContext.getUri()).thenReturn(uri);
+ ClientRequestContext requestContext = Mockito.mock(ClientRequestContext.class);
+ Mockito.when(requestContext.getEntity()).thenReturn(null);
+ Mockito.when(requestContext.getMethod()).thenReturn(method);
+ Mockito.when(requestContext.getHeaders()).thenReturn(requestHeaders);
+ Mockito.when(requestContext.getUri()).thenReturn(uri);
return requestContext;
}
private ContainerRequestContext getContainerRequestContextMock(URI uri, String method,
MultivaluedMap<String, String>
requestStringHeaders) {
- ContainerRequestContext containerRequestContext = mock(ContainerRequestContext.class);
- UriInfo uriInfo = mock(UriInfo.class);
- when(uriInfo.getAbsolutePath()).thenReturn(uri);
- when(containerRequestContext.getUriInfo()).thenReturn(uriInfo);
- when(containerRequestContext.getMethod()).thenReturn(method);
- when(containerRequestContext.getHeaders()).thenReturn(requestStringHeaders);
+ ContainerRequestContext containerRequestContext = Mockito.mock(ContainerRequestContext.class);
+ UriInfo uriInfo = Mockito.mock(UriInfo.class);
+ Mockito.when(uriInfo.getAbsolutePath()).thenReturn(uri);
+ Mockito.when(containerRequestContext.getUriInfo()).thenReturn(uriInfo);
+ Mockito.when(containerRequestContext.getMethod()).thenReturn(method);
+ Mockito.when(containerRequestContext.getHeaders()).thenReturn(requestStringHeaders);
return containerRequestContext;
}
@@ -357,4 +361,48 @@ public class SpecExamplesTest {
return headers;
}
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ private void doInPhaseInterceptor(Message message, Runnable r) {
+ final PhaseManager phaseManager = bus.getExtension(PhaseManager.class);
+ final PhaseInterceptorChain chain = new PhaseInterceptorChain(phaseManager.getInPhases());
+
+ chain.add(new PhaseInterceptor<Message>() {
+ @Override
+ public void handleMessage(Message message) throws Fault {
+ r.run();
+ }
+
+ @Override
+ public void handleFault(Message message) {
+ }
+
+ @Override
+ public Set getAfter() {
+ return Collections.emptySet();
+ }
+
+ @Override
+ public Set getBefore() {
+ return Collections.emptySet();
+ }
+
+ @Override
+ public String getId() {
+ return "test-signature-verify";
+ }
+
+ @Override
+ public String getPhase() {
+ return Phase.INVOKE;
+ }
+
+ @Override
+ public Collection getAdditionalInterceptors() {
+ return Collections.emptyList();
+ }
+ });
+
+ message.setInterceptorChain(chain);
+ chain.doIntercept(message);
+ }
}
[cxf] 03/03: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 87b27ed5ff0691ee1d7202a5c8972d828a27f30f
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Jun 5 16:08:40 2021 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index f6f999c..704789b 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -142,6 +142,7 @@ M a3a49c7ee82f83bc683b898594d5c4948578f25a
M a59dff0ba50418ced57ae8ef425f96df78af9f5c
M a894689ac803c234bf38a59f7d845aec4f4d70e0
M ac656dd13ac54b83aeb0c877e01dfb277d38ca96
+M ade1129cd94291f7fbd12cb536bc9367b19bb870
M b8a2f139f8a4f80a90ef49c2a0757395cb303be6
M b909e6dd478272d2c3e094922801a201ef94eeb5
M bb73cfaaebea3c74025c51da7b6478b91122a245
@@ -163,6 +164,7 @@ M d8eb0627ec5e878ef58e16b387a36c4cf3d1457c
M dd9e67bef536068ce3956b9b94e380e780e78ee8
M e0dbc85b5b3383c48fecb97ac11608d7b8c82cc5
M e31815b50c433a91bac93871bec801c34df2ff57
+M e47b201c3032f64082e9173c0f02d54698388c06
M e671095fbb2576e6e5a01d860951c3aa84968c80
M e775237e6dcb16b647d102bcbb3908d3e9fce1de
M eb4bab9983a287bf9dc0574d22077cc783bc88ac