This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.3.x-fixes by this push:
new 1eef49d Updating checkstyle, picking up SNAPSHOT versions of xjc +
build-utils
1eef49d is described below
commit 1eef49d84401ef1e30d0d8ae6fdb77a833745157
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Mon Nov 18 16:50:06 2019 +0000
Updating checkstyle, picking up SNAPSHOT versions of xjc + build-utils
(cherry picked from commit 98d922ddb1d6477e4388a988518fcbed1ea2f2ff)
---
.../java/org/apache/cxf/common/jaxb/JAXBUtils.java | 3 +-
parent/pom.xml | 2 +-
pom.xml | 4 +--
.../org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 3 +-
.../cxf/jaxrs/ext/search/SearchCondition.java | 6 ++--
.../ext/search/tika/TikaContentExtractor.java | 2 +-
.../search/tika/TikaLuceneContentExtractor.java | 3 +-
.../client/proxy/MicroProfileClientProxyImpl.java | 3 +-
.../cxf/rs/security/saml/sso/MetadataWriter.java | 9 +++---
.../org/apache/cxf/wsdl/JAXBExtensionHelper.java | 36 ++++++++++++++--------
10 files changed, 42 insertions(+), 29 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
index c0a14c2..ebaefee 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
@@ -1268,7 +1268,8 @@ public final class JAXBUtils {
mv.visitVarInsn(Opcodes.ALOAD, 1);
mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/util/Arrays",
"asList",
"([Ljava/lang/Object;)Ljava/util/List;", false);
- mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/util/ArrayList",
"<init>", "(Ljava/util/Collection;)V", false);
+ mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/util/ArrayList",
"<init>",
+ "(Ljava/util/Collection;)V", false);
mv.visitVarInsn(Opcodes.ASTORE, 2);
Label l4 = helper.createLabel();
mv.visitLabel(l4);
diff --git a/parent/pom.xml b/parent/pom.xml
index 1e8c0cd..7ed2ee1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -380,7 +380,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
- <version>8.22</version>
+ <version>8.26</version>
</dependency>
</dependencies>
<configuration>
diff --git a/pom.xml b/pom.xml
index 297d02d..5b52d7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,8 +40,8 @@
</issueManagement>
<properties>
<cxf.compiler.fork>false</cxf.compiler.fork>
- <cxf.build-utils.version>3.4.3</cxf.build-utils.version>
- <cxf.xjc-utils.version>3.3.0</cxf.xjc-utils.version>
+ <cxf.build-utils.version>3.4.4-SNAPSHOT</cxf.build-utils.version>
+ <cxf.xjc-utils.version>3.3.1-SNAPSHOT</cxf.xjc-utils.version>
<cxf.jdk.version>1.8</cxf.jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<site.deploy.url>scp://people.apache.org/www/cxf.apache.org/maven-site</site.deploy.url>
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
index 1075639..c6a5209 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
@@ -1420,7 +1420,8 @@ public final class JAXRSUtils {
throws WebApplicationException, IOException {
OutputStream entityStream = message.getContent(OutputStream.class);
- if
(entity.getClass().getName().equals("org.apache.cxf.jaxrs.reactivestreams.server.StreamingAsyncSubscriber$StreamingResponseImpl"))
{
+ if (entity.getClass().getName().equals(
+
"org.apache.cxf.jaxrs.reactivestreams.server.StreamingAsyncSubscriber$StreamingResponseImpl"))
{
//cache the OutputStream when it's reactive response
entityStream = new CacheAndWriteOutputStream(entityStream);
}
diff --git
a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchCondition.java
b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchCondition.java
index 5b6f339..2f2b187 100644
---
a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchCondition.java
+++
b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchCondition.java
@@ -21,18 +21,16 @@ package org.apache.cxf.jaxrs.ext.search;
import java.util.Collection;
import java.util.List;
-//CHECKSTYLE:OFF
/**
* Can be used to build plain or complex/composite search conditions.
* <p>
- * Google Collections <a
href="http://google-collections.googlecode.com/svn/trunk/javadoc/com/google/common/base/Predicate.html";>Predicate</a>
- * might've been used instead, but it is a too generic and its apply method is
not quite needed here
+ * Google Collections Predicate might've been used instead, but it is too
+ * generic and its apply method is not quite needed here
* </p>
*
* @param <T> Type of the object which will be checked by SearchCondition
instance
*
*/
-//CHECKSTYLE:ON
public interface SearchCondition<T> {
/**
diff --git
a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/tika/TikaContentExtractor.java
b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/tika/TikaContentExtractor.java
index fa697ac..128c12d 100644
---
a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/tika/TikaContentExtractor.java
+++
b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/tika/TikaContentExtractor.java
@@ -158,7 +158,7 @@ public class TikaContentExtractor {
* type of content.
* @param in input stream to extract the metadata from
* @param handler custom ContentHandler
- * @param mt JAX-RS MediaType of the stream content
+ * @param mtHint JAX-RS MediaType of the stream content
* @param context custom context
* @return the extracted content and metadata or null if extraction is not
possible
* or was unsuccessful
diff --git
a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/tika/TikaLuceneContentExtractor.java
b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/tika/TikaLuceneContentExtractor.java
index 21af2e9..3965627 100644
---
a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/tika/TikaLuceneContentExtractor.java
+++
b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/tika/TikaLuceneContentExtractor.java
@@ -98,8 +98,7 @@ public class TikaLuceneContentExtractor {
* optional media type validation. If validation is enabled, the
implementation
* will try to detect the media type of the input and validate it against
media types
* supported by the parser.
- * @param parser parser instancethis.contentFieldName
- * @param validateMediaType enabled or disable media type validation
+ * @param parsers parsers instancethis.contentFieldName
* @param documentMetadata documentMetadata
*/
public TikaLuceneContentExtractor(final List<Parser> parsers,
diff --git
a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/proxy/MicroProfileClientProxyImpl.java
b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/proxy/MicroProfileClientProxyImpl.java
index 50c7cf9..98150db 100644
---
a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/proxy/MicroProfileClientProxyImpl.java
+++
b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/proxy/MicroProfileClientProxyImpl.java
@@ -102,7 +102,8 @@ public class MicroProfileClientProxyImpl extends
ClientProxyImpl {
boolean isRoot, boolean inheritHeaders,
ExecutorService executorService,
Configuration configuration,
CDIInterceptorWrapper interceptorWrapper,
Object... varValues) {
- super(new LocalClientState(baseURI, configuration.getProperties()),
loader, cri, isRoot, inheritHeaders, varValues);
+ super(new LocalClientState(baseURI, configuration.getProperties()),
loader, cri,
+ isRoot, inheritHeaders, varValues);
this.interceptorWrapper = interceptorWrapper;
init(executorService, configuration);
}
diff --git
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
index 036ad3e..7ff9222 100644
---
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
+++
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
@@ -221,10 +221,11 @@ public class MetadataWriter {
// Create the SignedInfo.
SignedInfo si =
XML_SIGNATURE_FACTORY.newSignedInfo(
-
XML_SIGNATURE_FACTORY.newCanonicalizationMethod(CanonicalizationMethod.EXCLUSIVE,
-
(C14NMethodParameterSpec)null),
-
XML_SIGNATURE_FACTORY.newSignatureMethod(signatureMethod, null),
-
Collections.singletonList(ref));
+ XML_SIGNATURE_FACTORY.newCanonicalizationMethod(
+ CanonicalizationMethod.EXCLUSIVE,
+ (C14NMethodParameterSpec)null),
+ XML_SIGNATURE_FACTORY.newSignatureMethod(signatureMethod,
null),
+ Collections.singletonList(ref));
// Create the KeyInfo containing the X509Data.
KeyInfoFactory kif = XML_SIGNATURE_FACTORY.getKeyInfoFactory();
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
index a9ab088..c31d336 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
@@ -501,8 +501,10 @@ public class JAXBExtensionHelper implements
ExtensionSerializer, ExtensionDeseri
mv.visitInsn(Opcodes.DUP);
mv.visitLdcInsn("http://schemas.xmlsoap.org/wsdl/";);
mv.visitLdcInsn("required");
- mv.visitMethodInsn(Opcodes.INVOKESPECIAL,
"javax/xml/namespace/QName", "<init>",
"(Ljava/lang/String;Ljava/lang/String;)V", false);
- mv.visitFieldInsn(Opcodes.PUTSTATIC, className + "Extensibility",
"WSDL_REQUIRED", "Ljavax/xml/namespace/QName;");
+ mv.visitMethodInsn(Opcodes.INVOKESPECIAL,
"javax/xml/namespace/QName", "<init>",
+ "(Ljava/lang/String;Ljava/lang/String;)V", false);
+ mv.visitFieldInsn(Opcodes.PUTSTATIC, className + "Extensibility",
"WSDL_REQUIRED",
+ "Ljavax/xml/namespace/QName;");
mv.visitInsn(Opcodes.RETURN);
mv.visitMaxs(4, 0);
mv.visitEnd();
@@ -585,9 +587,12 @@ public class JAXBExtensionHelper implements
ExtensionSerializer, ExtensionDeseri
mv.visitLabel(l0);
mv.visitLineNumber(66, l0);
mv.visitVarInsn(Opcodes.ALOAD, 0);
- mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, className +
"Extensibility", "getOtherAttributes", "()Ljava/util/Map;", false);
- mv.visitFieldInsn(Opcodes.GETSTATIC, className + "Extensibility",
"WSDL_REQUIRED", "Ljavax/xml/namespace/QName;");
- mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/Map",
"get", "(Ljava/lang/Object;)Ljava/lang/Object;", true);
+ mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, className +
"Extensibility", "getOtherAttributes",
+ "()Ljava/util/Map;", false);
+ mv.visitFieldInsn(Opcodes.GETSTATIC, className + "Extensibility",
"WSDL_REQUIRED",
+ "Ljavax/xml/namespace/QName;");
+ mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/Map", "get",
+ "(Ljava/lang/Object;)Ljava/lang/Object;", true);
mv.visitTypeInsn(Opcodes.CHECKCAST, "java/lang/String");
mv.visitVarInsn(Opcodes.ASTORE, 1);
l1 = helper.createLabel();
@@ -602,7 +607,8 @@ public class JAXBExtensionHelper implements
ExtensionSerializer, ExtensionDeseri
mv.visitLabel(l2);
mv.visitFrame(Opcodes.F_APPEND, 1, new Object[]
{"java/lang/String"}, 0, null);
mv.visitVarInsn(Opcodes.ALOAD, 1);
- mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Boolean",
"valueOf", "(Ljava/lang/String;)Ljava/lang/Boolean;", false);
+ mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Boolean",
"valueOf",
+ "(Ljava/lang/String;)Ljava/lang/Boolean;", false);
mv.visitLabel(l3);
mv.visitFrame(Opcodes.F_SAME1, 0, null, 1, new Object[]
{"java/lang/Boolean"});
mv.visitInsn(Opcodes.ARETURN);
@@ -627,9 +633,12 @@ public class JAXBExtensionHelper implements
ExtensionSerializer, ExtensionDeseri
mv.visitLabel(l2);
mv.visitLineNumber(77, l2);
mv.visitVarInsn(Opcodes.ALOAD, 0);
- mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, className +
"Extensibility", "getOtherAttributes", "()Ljava/util/Map;", false);
- mv.visitFieldInsn(Opcodes.GETSTATIC, className + "Extensibility",
"WSDL_REQUIRED", "Ljavax/xml/namespace/QName;");
- mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/Map",
"remove", "(Ljava/lang/Object;)Ljava/lang/Object;", true);
+ mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, className +
"Extensibility", "getOtherAttributes",
+ "()Ljava/util/Map;", false);
+ mv.visitFieldInsn(Opcodes.GETSTATIC, className + "Extensibility",
"WSDL_REQUIRED",
+ "Ljavax/xml/namespace/QName;");
+ mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/Map",
"remove",
+ "(Ljava/lang/Object;)Ljava/lang/Object;", true);
mv.visitInsn(Opcodes.POP);
l3 = helper.createLabel();
mv.visitLabel(l3);
@@ -640,11 +649,14 @@ public class JAXBExtensionHelper implements
ExtensionSerializer, ExtensionDeseri
mv.visitLineNumber(79, l1);
mv.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
mv.visitVarInsn(Opcodes.ALOAD, 0);
- mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, className +
"Extensibility", "getOtherAttributes", "()Ljava/util/Map;", false);
- mv.visitFieldInsn(Opcodes.GETSTATIC, className + "Extensibility",
"WSDL_REQUIRED", "Ljavax/xml/namespace/QName;");
+ mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, className +
"Extensibility", "getOtherAttributes",
+ "()Ljava/util/Map;", false);
+ mv.visitFieldInsn(Opcodes.GETSTATIC, className + "Extensibility",
"WSDL_REQUIRED",
+ "Ljavax/xml/namespace/QName;");
mv.visitVarInsn(Opcodes.ALOAD, 1);
mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/Boolean",
"toString", "()Ljava/lang/String;", false);
- mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/Map",
"put", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;", true);
+ mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/Map", "put",
+ "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;",
true);
mv.visitInsn(Opcodes.POP);
mv.visitLabel(l4);
mv.visitLineNumber(81, l4);
