You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2021/05/27 15:05:42 UTC
[cxf] 02/03: CXF-8535 - Checkstyle fix
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 9561be0361b699f68394e6c06babf0e1ea53444c
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu May 27 12:41:33 2021 +0100
CXF-8535 - Checkstyle fix
(cherry picked from commit bbcd8f2eb059848380fbe5af638fe94e3a9a5e1d)
---
.../httpsignature/filters/CreateSignatureInterceptor.java | 2 ++
.../security/httpsignature/filters/VerifySignatureFilter.java | 2 ++
.../rs/security/httpsignature/utils/SignatureHeaderUtils.java | 3 ++-
.../apache/cxf/rs/security/httpsignature/SpecExamplesTest.java | 10 ++++++----
4 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/rt/rs/security/http-signature/src/main/java/org/apache/cxf/rs/security/httpsignature/filters/CreateSignatureInterceptor.java b/rt/rs/security/http-signature/src/main/java/org/apache/cxf/rs/security/httpsignature/filters/CreateSignatureInterceptor.java
index 103cd72..ae5814c 100644
--- a/rt/rs/security/http-signature/src/main/java/org/apache/cxf/rs/security/httpsignature/filters/CreateSignatureInterceptor.java
+++ b/rt/rs/security/http-signature/src/main/java/org/apache/cxf/rs/security/httpsignature/filters/CreateSignatureInterceptor.java
@@ -20,6 +20,7 @@ package org.apache.cxf.rs.security.httpsignature.filters;
import java.io.*;
import java.nio.charset.StandardCharsets;
+
import javax.annotation.Priority;
import javax.ws.rs.Priorities;
import javax.ws.rs.client.ClientRequestContext;
@@ -33,6 +34,7 @@ import javax.ws.rs.core.UriInfo;
import javax.ws.rs.ext.Provider;
import javax.ws.rs.ext.WriterInterceptor;
import javax.ws.rs.ext.WriterInterceptorContext;
+
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.io.CachedOutputStream;
import org.apache.cxf.jaxrs.utils.HttpUtils;
diff --git a/rt/rs/security/http-signature/src/main/java/org/apache/cxf/rs/security/httpsignature/filters/VerifySignatureFilter.java b/rt/rs/security/http-signature/src/main/java/org/apache/cxf/rs/security/httpsignature/filters/VerifySignatureFilter.java
index 444d019..c70c5e4 100644
--- a/rt/rs/security/http-signature/src/main/java/org/apache/cxf/rs/security/httpsignature/filters/VerifySignatureFilter.java
+++ b/rt/rs/security/http-signature/src/main/java/org/apache/cxf/rs/security/httpsignature/filters/VerifySignatureFilter.java
@@ -19,12 +19,14 @@
package org.apache.cxf.rs.security.httpsignature.filters;
import java.io.*;
+
import javax.annotation.Priority;
import javax.ws.rs.BadRequestException;
import javax.ws.rs.Priorities;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerRequestFilter;
import javax.ws.rs.ext.Provider;
+
import org.apache.cxf.rs.security.httpsignature.utils.SignatureHeaderUtils;
/**
diff --git a/rt/rs/security/http-signature/src/main/java/org/apache/cxf/rs/security/httpsignature/utils/SignatureHeaderUtils.java b/rt/rs/security/http-signature/src/main/java/org/apache/cxf/rs/security/httpsignature/utils/SignatureHeaderUtils.java
index 4bcc440..661b81c 100644
--- a/rt/rs/security/http-signature/src/main/java/org/apache/cxf/rs/security/httpsignature/utils/SignatureHeaderUtils.java
+++ b/rt/rs/security/http-signature/src/main/java/org/apache/cxf/rs/security/httpsignature/utils/SignatureHeaderUtils.java
@@ -27,6 +27,7 @@ import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Stream;
+
import org.apache.cxf.rs.security.httpsignature.exception.DigestFailureException;
public final class SignatureHeaderUtils {
@@ -106,7 +107,7 @@ public final class SignatureHeaderUtils {
stringBuilder.append(uri.getPath());
if (uri.getRawQuery() != null) {
- stringBuilder.append("?");
+ stringBuilder.append('?');
stringBuilder.append(uri.getRawQuery());
}
return stringBuilder.toString();
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 fc5a445..86c99ac 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
@@ -32,11 +32,13 @@ import java.security.spec.InvalidKeySpecException;
import java.security.spec.PKCS8EncodedKeySpec;
import java.security.spec.X509EncodedKeySpec;
import java.util.*;
+
import javax.ws.rs.client.ClientRequestContext;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.core.MultivaluedHashMap;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.UriInfo;
+
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.phase.PhaseInterceptorChain;
@@ -45,11 +47,11 @@ 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.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
+
import static org.junit.Assert.assertEquals;
import static org.powermock.api.mockito.PowerMockito.mock;
import static org.powermock.api.mockito.PowerMockito.mockStatic;
@@ -58,8 +60,8 @@ import static org.powermock.api.mockito.PowerMockito.when;
/**
* Some examples from the Appendix C of the spec.
*/
-@PrepareForTest(PhaseInterceptorChain.class)
-@RunWith(PowerMockRunner.class)
+@org.powermock.core.classloader.annotations.PrepareForTest(PhaseInterceptorChain.class)
+@RunWith(org.powermock.modules.junit4.PowerMockRunner.class)
public class SpecExamplesTest {
private static KeyProvider keyProvider;