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/04/20 02:07:09 UTC
[cxf] branch 3.4.x-fixes updated (54b2e09 -> 3c2a3f4)
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 54b2e09 Update to EasyMockk 4.3
new a0b7be6 Update Checkstyle to 8.41.1 (#773)
new 6d7af7f Fixing checkstyle violations
new 3c2a3f4 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 | 1 +
.../org/apache/cxf/configuration/foo/Address.java | 12 ++---
.../java/org/apache/cxf/configuration/foo/Foo.java | 14 ++---
.../org/apache/cxf/configuration/foo/Point.java | 8 +--
.../boot/autoconfigure/CxfAutoConfiguration.java | 4 +-
.../apache/cxf/osgi/itests/jaxrs/BookStore.java | 18 +++----
parent/pom.xml | 2 +-
.../cxf/jaxws/handler/jakartaee/IconType.java | 7 ++-
.../jaxws/handler/jakartaee/ParamValueType.java | 8 ++-
.../jakartaee/PortComponentHandlerType.java | 14 +++--
.../apache/cxf/jaxws/handler/types/IconType.java | 7 ++-
.../cxf/jaxws/handler/types/ParamValueType.java | 8 ++-
.../handler/types/PortComponentHandlerType.java | 14 +++--
.../apache/cxf/jaxws/ws/PolicyAnnotationTest.java | 3 +-
.../org/apache/cxf/jaxrs/client/WebClient.java | 2 +-
.../cxf/systest/jaxrs/JAXRSAsyncClientTest.java | 4 +-
.../java/org/apache/cxf/systest/jaxrs/XopType.java | 6 ++-
.../systest/jaxrs/cors/AnnotatedCorsServer.java | 21 +++++---
.../cxf/systest/jaxrs/cors/CorsSecuredBase.java | 19 ++++---
.../systest/jaxrs/cors/UnannotatedCorsServer.java | 11 ++--
.../jaxws/DocLitWrappedCodeFirstService.java | 59 ++++++++++------------
.../cxf/systest/ldap/jaxrs/JAXRSLDAPUserTest.java | 37 +++++++-------
.../cxf/systest/ldap/sts/LDAPClaimsTest.java | 17 ++++---
.../systest/ldap/xkms/LDAPCertificateRepoTest.java | 37 +++++++-------
.../cxf/systest/jms/shared/JMSSharedQueueTest.java | 30 +++++------
.../cxf/systest/mtom_schema_validation/Hello.java | 9 ++--
.../mtom_schema_validation/TestProvider.java | 6 +--
.../ws/policy/handler/HelloServiceImpl.java | 12 ++---
28 files changed, 218 insertions(+), 172 deletions(-)
[cxf] 02/03: Fixing checkstyle violations
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 6d7af7fe15e5b8ee31b2ec72a28f6009f87632c0
Author: reta <dr...@gmail.com>
AuthorDate: Mon Apr 19 20:35:05 2021 -0400
Fixing checkstyle violations
(cherry picked from commit 651991cdad0141db7ca5f87c9fe4a768854ded42)
---
.../org/apache/cxf/configuration/foo/Address.java | 12 ++---
.../java/org/apache/cxf/configuration/foo/Foo.java | 14 ++---
.../org/apache/cxf/configuration/foo/Point.java | 8 +--
.../boot/autoconfigure/CxfAutoConfiguration.java | 4 +-
.../apache/cxf/osgi/itests/jaxrs/BookStore.java | 18 +++----
.../cxf/jaxws/handler/jakartaee/IconType.java | 7 ++-
.../jaxws/handler/jakartaee/ParamValueType.java | 8 ++-
.../jakartaee/PortComponentHandlerType.java | 14 +++--
.../apache/cxf/jaxws/handler/types/IconType.java | 7 ++-
.../cxf/jaxws/handler/types/ParamValueType.java | 8 ++-
.../handler/types/PortComponentHandlerType.java | 14 +++--
.../apache/cxf/jaxws/ws/PolicyAnnotationTest.java | 3 +-
.../cxf/systest/jaxrs/JAXRSAsyncClientTest.java | 4 +-
.../java/org/apache/cxf/systest/jaxrs/XopType.java | 6 ++-
.../systest/jaxrs/cors/AnnotatedCorsServer.java | 21 +++++---
.../cxf/systest/jaxrs/cors/CorsSecuredBase.java | 19 ++++---
.../systest/jaxrs/cors/UnannotatedCorsServer.java | 11 ++--
.../jaxws/DocLitWrappedCodeFirstService.java | 59 ++++++++++------------
.../cxf/systest/ldap/jaxrs/JAXRSLDAPUserTest.java | 37 +++++++-------
.../cxf/systest/ldap/sts/LDAPClaimsTest.java | 17 ++++---
.../systest/ldap/xkms/LDAPCertificateRepoTest.java | 37 +++++++-------
.../cxf/systest/jms/shared/JMSSharedQueueTest.java | 30 +++++------
.../cxf/systest/mtom_schema_validation/Hello.java | 9 ++--
.../mtom_schema_validation/TestProvider.java | 6 +--
.../ws/policy/handler/HelloServiceImpl.java | 12 ++---
25 files changed, 215 insertions(+), 170 deletions(-)
diff --git a/core/src/test/java/org/apache/cxf/configuration/foo/Address.java b/core/src/test/java/org/apache/cxf/configuration/foo/Address.java
index 07c9dc0..9bed877 100644
--- a/core/src/test/java/org/apache/cxf/configuration/foo/Address.java
+++ b/core/src/test/java/org/apache/cxf/configuration/foo/Address.java
@@ -50,12 +50,12 @@ import javax.xml.bind.annotation.XmlType;
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "address",
- propOrder = {
- "city",
- "zip",
- "street",
- "nr"
- })
+ propOrder = {
+ "city",
+ "zip",
+ "street",
+ "nr"
+ })
public class Address {
@XmlElement(required = true)
diff --git a/core/src/test/java/org/apache/cxf/configuration/foo/Foo.java b/core/src/test/java/org/apache/cxf/configuration/foo/Foo.java
index 33d93e9..ec68077 100644
--- a/core/src/test/java/org/apache/cxf/configuration/foo/Foo.java
+++ b/core/src/test/java/org/apache/cxf/configuration/foo/Foo.java
@@ -49,13 +49,13 @@ import javax.xml.bind.annotation.XmlType;
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "foo",
- propOrder = {
- "position",
- "address",
- "name",
- "intDefault",
- "intNoDefault"
- })
+ propOrder = {
+ "position",
+ "address",
+ "name",
+ "intDefault",
+ "intNoDefault"
+ })
public class Foo {
protected Point position;
diff --git a/core/src/test/java/org/apache/cxf/configuration/foo/Point.java b/core/src/test/java/org/apache/cxf/configuration/foo/Point.java
index 36b08f0..4edbb1b 100644
--- a/core/src/test/java/org/apache/cxf/configuration/foo/Point.java
+++ b/core/src/test/java/org/apache/cxf/configuration/foo/Point.java
@@ -46,10 +46,10 @@ import javax.xml.bind.annotation.XmlType;
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "point",
- propOrder = {
- "x",
- "y"
- })
+ propOrder = {
+ "x",
+ "y"
+ })
public class Point {
protected int x;
diff --git a/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java b/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java
index 9b5c3df1..92d862e 100644
--- a/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java
+++ b/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java
@@ -49,8 +49,8 @@ import org.springframework.context.annotation.ImportResource;
@ConditionalOnClass({ SpringBus.class, CXFServlet.class })
@EnableConfigurationProperties(CxfProperties.class)
@AutoConfigureAfter(name = {
- "org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration", // Spring Boot 1.x
- "org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryAutoConfiguration" // Spring Boot 2.x
+ "org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration", // Spring Boot 1.x
+ "org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryAutoConfiguration" // Spring Boot 2.x
})
public class CxfAutoConfiguration {
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/BookStore.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/BookStore.java
index 8e9e01b..b7ace0b 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/BookStore.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/BookStore.java
@@ -100,15 +100,15 @@ public class BookStore {
assertInjections();
BeanValidationProvider prov = new BeanValidationProvider(
- new ValidationProviderResolver() {
- @Override
- public List<ValidationProvider<?>> getValidationProviders() {
- ValidationProvider<HibernateValidatorConfiguration> prov = new HibernateValidator();
- List<ValidationProvider<?>> provs = new ArrayList<>();
- provs.add(prov);
- return provs;
- }
- }, HibernateValidator.class);
+ new ValidationProviderResolver() {
+ @Override
+ public List<ValidationProvider<?>> getValidationProviders() {
+ ValidationProvider<HibernateValidatorConfiguration> prov = new HibernateValidator();
+ List<ValidationProvider<?>> provs = new ArrayList<>();
+ provs.add(prov);
+ return provs;
+ }
+ }, HibernateValidator.class);
try {
prov.validateBean(book);
} catch (ConstraintViolationException cve) {
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/jakartaee/IconType.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/jakartaee/IconType.java
index de8a437..a4bb78a 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/jakartaee/IconType.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/jakartaee/IconType.java
@@ -52,8 +52,11 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
* </pre>
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "iconType", propOrder = {
- "smallIcon", "largeIcon" })
+@XmlType(name = "iconType",
+ propOrder = {
+ "smallIcon",
+ "largeIcon"
+ })
public class IconType {
@XmlElement(name = "small-icon")
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/jakartaee/ParamValueType.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/jakartaee/ParamValueType.java
index 4973673..b376ea9 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/jakartaee/ParamValueType.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/jakartaee/ParamValueType.java
@@ -54,8 +54,12 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
* </pre>
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "param-valueType", propOrder = {
- "description", "paramName", "paramValue" })
+@XmlType(name = "param-valueType",
+ propOrder = {
+ "description",
+ "paramName",
+ "paramValue"
+ })
public class ParamValueType {
protected List<DescriptionType> description;
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/jakartaee/PortComponentHandlerType.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/jakartaee/PortComponentHandlerType.java
index 4fdea80..6059481 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/jakartaee/PortComponentHandlerType.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/jakartaee/PortComponentHandlerType.java
@@ -60,9 +60,17 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
* </pre>
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "port-component_handlerType", propOrder = {
- "description", "displayName", "icon", "handlerName", "handlerClass", "initParam", "soapHeader",
- "soapRole" })
+@XmlType(name = "port-component_handlerType",
+ propOrder = {
+ "description",
+ "displayName",
+ "icon",
+ "handlerName",
+ "handlerClass",
+ "initParam",
+ "soapHeader",
+ "soapRole"
+ })
public class PortComponentHandlerType {
protected List<DescriptionType> description;
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/types/IconType.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/types/IconType.java
index c8de2c0..1113cd6 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/types/IconType.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/types/IconType.java
@@ -52,8 +52,11 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
* </pre>
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "iconType", propOrder = {
- "smallIcon", "largeIcon" })
+@XmlType(name = "iconType",
+ propOrder = {
+ "smallIcon",
+ "largeIcon"
+ })
public class IconType {
@XmlElement(name = "small-icon")
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/types/ParamValueType.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/types/ParamValueType.java
index 06212d5..87be953 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/types/ParamValueType.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/types/ParamValueType.java
@@ -54,8 +54,12 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
* </pre>
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "param-valueType", propOrder = {
- "description", "paramName", "paramValue" })
+@XmlType(name = "param-valueType",
+ propOrder = {
+ "description",
+ "paramName",
+ "paramValue"
+ })
public class ParamValueType {
protected List<DescriptionType> description;
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/types/PortComponentHandlerType.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/types/PortComponentHandlerType.java
index 308b45f..247add3 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/types/PortComponentHandlerType.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/types/PortComponentHandlerType.java
@@ -60,9 +60,17 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
* </pre>
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "port-component_handlerType", propOrder = {
- "description", "displayName", "icon", "handlerName", "handlerClass", "initParam", "soapHeader",
- "soapRole" })
+@XmlType(name = "port-component_handlerType",
+ propOrder = {
+ "description",
+ "displayName",
+ "icon",
+ "handlerName",
+ "handlerClass",
+ "initParam",
+ "soapHeader",
+ "soapRole"
+ })
public class PortComponentHandlerType {
protected List<DescriptionType> description;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java
index d516a4e..befedf5 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java
@@ -342,8 +342,7 @@ public class PolicyAnnotationTest {
@WebService()
@Policies({
@Policy(placement = Policy.Placement.BINDING, uri = "annotationpolicies/TestImplPolicy.xml")
- }
- )
+ })
public static class TestImplWithPoliciesNoInterface {
@WebMethod
public int echoInt(int i) {
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
index af0fe42..c8341c9 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
@@ -374,9 +374,7 @@ public class JAXRSAsyncClientTest extends AbstractBusClientServerTestBase {
assertTrue(booleanHolder.value);
}
- @SuppressWarnings({
- "unchecked", "rawtypes"
- })
+ @SuppressWarnings({ "unchecked", "rawtypes" })
private static <T> InvocationCallback<T> createGenericInvocationCallback() {
return new GenericInvocationCallback();
}
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/XopType.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/XopType.java
index 7878d3a..9642ffb 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/XopType.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/XopType.java
@@ -29,12 +29,14 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
@XmlRootElement(name = "xopType", namespace = "http://xop/jaxrs")
-@XmlType(name = "XopType", propOrder = {
+@XmlType(name = "XopType",
+ propOrder = {
"name",
"attachinfo",
"attachinfo2",
"attachInfoRef",
- "image" })
+ "image"
+ })
public class XopType {
private String name;
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/AnnotatedCorsServer.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/AnnotatedCorsServer.java
index 7e6eb9b..76eb41a 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/AnnotatedCorsServer.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/AnnotatedCorsServer.java
@@ -36,13 +36,20 @@ import org.apache.cxf.rs.security.cors.CorsHeaderConstants;
import org.apache.cxf.rs.security.cors.CrossOriginResourceSharing;
import org.apache.cxf.rs.security.cors.LocalPreflight;
-@CrossOriginResourceSharing(allowOrigins = {
- "http://area51.mil:31415"
- }, allowCredentials = true, maxAge = 1, allowHeaders = {
- "X-custom-1", "X-custom-2"
- }, exposeHeaders = {
- "X-custom-3", "X-custom-4"
- }
+@CrossOriginResourceSharing(
+ allowOrigins = {
+ "http://area51.mil:31415"
+ },
+ allowCredentials = true,
+ maxAge = 1,
+ allowHeaders = {
+ "X-custom-1",
+ "X-custom-2"
+ },
+ exposeHeaders = {
+ "X-custom-3",
+ "X-custom-4"
+ }
)
public class AnnotatedCorsServer {
@Context
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CorsSecuredBase.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CorsSecuredBase.java
index b801570..6e1b20f 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CorsSecuredBase.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CorsSecuredBase.java
@@ -20,13 +20,20 @@ package org.apache.cxf.systest.jaxrs.cors;
import org.apache.cxf.rs.security.cors.CrossOriginResourceSharing;
-@CrossOriginResourceSharing(allowOrigins = {
+@CrossOriginResourceSharing(
+ allowOrigins = {
"http://area51.mil:31415"
- }, allowCredentials = true, maxAge = 1, allowHeaders = {
- "X-custom-1", "X-custom-2"
- }, exposeHeaders = {
- "X-custom-3", "X-custom-4"
- }
+ },
+ allowCredentials = true,
+ maxAge = 1,
+ allowHeaders = {
+ "X-custom-1",
+ "X-custom-2"
+ },
+ exposeHeaders = {
+ "X-custom-3",
+ "X-custom-4"
+ }
)
public interface CorsSecuredBase {
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/UnannotatedCorsServer.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/UnannotatedCorsServer.java
index bd53cb8..ab8b498 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/UnannotatedCorsServer.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/UnannotatedCorsServer.java
@@ -49,9 +49,14 @@ public class UnannotatedCorsServer {
}
@GET
- @CrossOriginResourceSharing(allowOrigins = {
- "http://area51.mil:31415" },
- exposeHeaders = {"X-custom-3", "X-custom-4" })
+ @CrossOriginResourceSharing(
+ allowOrigins = {
+ "http://area51.mil:31415"
+ },
+ exposeHeaders = {
+ "X-custom-3",
+ "X-custom-4"
+ })
@Produces("text/plain")
@Path("/annotatedGet/{echo}")
public String annotatedGet(@PathParam("echo") String echo) {
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java
index fe8950d..7711b85 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java
@@ -47,17 +47,15 @@ import org.apache.cxf.systest.jaxws.types.Bar;
targetNamespace = "http://cxf.apache.org/systest/jaxws/DocLitWrappedCodeFirstService")
@SOAPBinding(style = SOAPBinding.Style.DOCUMENT,
use = SOAPBinding.Use.LITERAL)
-@WSDLDocumentationCollection(
- {
- @WSDLDocumentation("DocLitWrappedCodeFirstService interface"),
- @WSDLDocumentation(value = "DocLitWrappedCodeFirstService top level doc",
- placement = WSDLDocumentation.Placement.TOP),
- @WSDLDocumentation(value = "DocLitWrappedCodeFirstService binding doc",
- placement = WSDLDocumentation.Placement.BINDING),
- @WSDLDocumentation(value = "DocLitWrappedCodeFirstService service/port doc",
- placement = WSDLDocumentation.Placement.SERVICE_PORT)
- }
-)
+@WSDLDocumentationCollection({
+ @WSDLDocumentation("DocLitWrappedCodeFirstService interface"),
+ @WSDLDocumentation(value = "DocLitWrappedCodeFirstService top level doc",
+ placement = WSDLDocumentation.Placement.TOP),
+ @WSDLDocumentation(value = "DocLitWrappedCodeFirstService binding doc",
+ placement = WSDLDocumentation.Placement.BINDING),
+ @WSDLDocumentation(value = "DocLitWrappedCodeFirstService service/port doc",
+ placement = WSDLDocumentation.Placement.SERVICE_PORT)
+})
@GZIP
@FastInfoset
public interface DocLitWrappedCodeFirstService {
@@ -90,25 +88,23 @@ public interface DocLitWrappedCodeFirstService {
String multiListInput(List<String> inputs1, List<String> inputs2, String x, int y);
@WebMethod
- @WSDLDocumentationCollection(
- {
- @WSDLDocumentation("multiInOut doc"),
- @WSDLDocumentation(value = "multiInOut Input doc",
- placement = WSDLDocumentation.Placement.PORT_TYPE_OPERATION_INPUT),
- @WSDLDocumentation(value = "multiInOut Output doc",
- placement = WSDLDocumentation.Placement.PORT_TYPE_OPERATION_OUTPUT),
- @WSDLDocumentation(value = "multiInOut InputMessage doc",
- placement = WSDLDocumentation.Placement.INPUT_MESSAGE),
- @WSDLDocumentation(value = "multiInOut OutputMessage doc",
- placement = WSDLDocumentation.Placement.OUTPUT_MESSAGE),
- @WSDLDocumentation(value = "multiInOut binding doc",
- placement = WSDLDocumentation.Placement.BINDING_OPERATION),
- @WSDLDocumentation(value = "multiInOut binding Input doc",
- placement = WSDLDocumentation.Placement.BINDING_OPERATION_INPUT),
- @WSDLDocumentation(value = "multiInOut binding Output doc",
- placement = WSDLDocumentation.Placement.BINDING_OPERATION_OUTPUT)
- }
- )
+ @WSDLDocumentationCollection({
+ @WSDLDocumentation("multiInOut doc"),
+ @WSDLDocumentation(value = "multiInOut Input doc",
+ placement = WSDLDocumentation.Placement.PORT_TYPE_OPERATION_INPUT),
+ @WSDLDocumentation(value = "multiInOut Output doc",
+ placement = WSDLDocumentation.Placement.PORT_TYPE_OPERATION_OUTPUT),
+ @WSDLDocumentation(value = "multiInOut InputMessage doc",
+ placement = WSDLDocumentation.Placement.INPUT_MESSAGE),
+ @WSDLDocumentation(value = "multiInOut OutputMessage doc",
+ placement = WSDLDocumentation.Placement.OUTPUT_MESSAGE),
+ @WSDLDocumentation(value = "multiInOut binding doc",
+ placement = WSDLDocumentation.Placement.BINDING_OPERATION),
+ @WSDLDocumentation(value = "multiInOut binding Input doc",
+ placement = WSDLDocumentation.Placement.BINDING_OPERATION_INPUT),
+ @WSDLDocumentation(value = "multiInOut binding Output doc",
+ placement = WSDLDocumentation.Placement.BINDING_OPERATION_OUTPUT)
+ })
String multiInOut(@WebParam(mode = WebParam.Mode.OUT)
Holder<String> a,
@WebParam(mode = WebParam.Mode.INOUT)
@@ -154,8 +150,7 @@ public interface DocLitWrappedCodeFirstService {
@WSDLDocumentation(value = "fault porttype doc",
placement = WSDLDocumentation.Placement.PORT_TYPE_OPERATION_FAULT,
faultClass = CustomException.class)
- }
- )
+ })
int throwException(int i)
throws ServiceTestFault,
CustomException,
diff --git a/systests/ldap/src/test/java/org/apache/cxf/systest/ldap/jaxrs/JAXRSLDAPUserTest.java b/systests/ldap/src/test/java/org/apache/cxf/systest/ldap/jaxrs/JAXRSLDAPUserTest.java
index cef75fb..372a3d7 100644
--- a/systests/ldap/src/test/java/org/apache/cxf/systest/ldap/jaxrs/JAXRSLDAPUserTest.java
+++ b/systests/ldap/src/test/java/org/apache/cxf/systest/ldap/jaxrs/JAXRSLDAPUserTest.java
@@ -48,26 +48,27 @@ import org.junit.runner.RunWith;
//Define the DirectoryService
@CreateDS(name = "JAXRSLDAPUserTest-class",
- enableAccessControl = false,
- allowAnonAccess = false,
- enableChangeLog = true,
- partitions = {
- @CreatePartition(
- name = "example",
- suffix = "dc=example,dc=com",
- indexes = {
- @CreateIndex(attribute = "objectClass"),
- @CreateIndex(attribute = "dc"),
- @CreateIndex(attribute = "ou")
- }
- ) }
- )
+ enableAccessControl = false,
+ allowAnonAccess = false,
+ enableChangeLog = true,
+ partitions = {
+ @CreatePartition(
+ name = "example",
+ suffix = "dc=example,dc=com",
+ indexes = {
+ @CreateIndex(attribute = "objectClass"),
+ @CreateIndex(attribute = "dc"),
+ @CreateIndex(attribute = "ou")
+ }
+ )
+ }
+)
@CreateLdapServer(
- transports = {
- @CreateTransport(protocol = "LDAP", address = "localhost")
- }
- )
+ transports = {
+ @CreateTransport(protocol = "LDAP", address = "localhost")
+ }
+)
//Inject an file containing entries
@ApplyLdifFiles("ldap.ldif")
diff --git a/systests/ldap/src/test/java/org/apache/cxf/systest/ldap/sts/LDAPClaimsTest.java b/systests/ldap/src/test/java/org/apache/cxf/systest/ldap/sts/LDAPClaimsTest.java
index b4cb442..5a96136 100644
--- a/systests/ldap/src/test/java/org/apache/cxf/systest/ldap/sts/LDAPClaimsTest.java
+++ b/systests/ldap/src/test/java/org/apache/cxf/systest/ldap/sts/LDAPClaimsTest.java
@@ -65,10 +65,10 @@ import org.junit.runner.RunWith;
//Define the DirectoryService
@CreateDS(name = "LDAPClaimsTest-class",
- enableAccessControl = false,
- allowAnonAccess = false,
- enableChangeLog = true,
- partitions = {
+ enableAccessControl = false,
+ allowAnonAccess = false,
+ enableChangeLog = true,
+ partitions = {
@CreatePartition(
name = "example",
suffix = "dc=example,dc=com",
@@ -77,14 +77,15 @@ import org.junit.runner.RunWith;
@CreateIndex(attribute = "dc"),
@CreateIndex(attribute = "ou")
}
- ) }
- )
+ )
+ }
+)
@CreateLdapServer(
transports = {
@CreateTransport(protocol = "LDAP", address = "localhost")
- }
- )
+ }
+)
//Inject an file containing entries
@ApplyLdifFiles("ldap.ldif")
diff --git a/systests/ldap/src/test/java/org/apache/cxf/systest/ldap/xkms/LDAPCertificateRepoTest.java b/systests/ldap/src/test/java/org/apache/cxf/systest/ldap/xkms/LDAPCertificateRepoTest.java
index 12d7231..b1e8fb7 100644
--- a/systests/ldap/src/test/java/org/apache/cxf/systest/ldap/xkms/LDAPCertificateRepoTest.java
+++ b/systests/ldap/src/test/java/org/apache/cxf/systest/ldap/xkms/LDAPCertificateRepoTest.java
@@ -53,26 +53,27 @@ import static org.junit.Assert.assertNull;
//Define the DirectoryService
@CreateDS(name = "LDAPCertificateRepoTest-class",
- enableAccessControl = false,
- allowAnonAccess = false,
- enableChangeLog = true,
- partitions = {
- @CreatePartition(
- name = "example",
- suffix = "dc=example,dc=com",
- indexes = {
- @CreateIndex(attribute = "objectClass"),
- @CreateIndex(attribute = "dc"),
- @CreateIndex(attribute = "ou")
- }
- ) }
- )
+ enableAccessControl = false,
+ allowAnonAccess = false,
+ enableChangeLog = true,
+ partitions = {
+ @CreatePartition(
+ name = "example",
+ suffix = "dc=example,dc=com",
+ indexes = {
+ @CreateIndex(attribute = "objectClass"),
+ @CreateIndex(attribute = "dc"),
+ @CreateIndex(attribute = "ou")
+ }
+ )
+ }
+)
@CreateLdapServer(
- transports = {
- @CreateTransport(protocol = "LDAP", address = "localhost")
- }
- )
+ transports = {
+ @CreateTransport(protocol = "LDAP", address = "localhost")
+ }
+)
//Inject an file containing entries
@ApplyLdifFiles("ldap.ldif")
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/shared/JMSSharedQueueTest.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/shared/JMSSharedQueueTest.java
index 60dc1d6..734c873 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/shared/JMSSharedQueueTest.java
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/shared/JMSSharedQueueTest.java
@@ -155,24 +155,22 @@ public class JMSSharedQueueTest extends AbstractVmJMSTest {
HelloWorldServiceAppCorrelationID service = new HelloWorldServiceAppCorrelationID(wsdl, serviceName);
HelloWorldPortType portEng = markForClose(service.getPort(portNameEng, HelloWorldPortType.class, cff));
- ClientRunnable engClient =
- new ClientRunnable(portEng,
- new CorrelationIDFactory() {
- private int counter;
- public String createCorrealtionID() {
- return "com.mycompany.eng:" + counter++;
- }
- });
+ ClientRunnable engClient = new ClientRunnable(portEng,
+ new CorrelationIDFactory() {
+ private int counter;
+ public String createCorrealtionID() {
+ return "com.mycompany.eng:" + counter++;
+ }
+ });
HelloWorldPortType portSales = markForClose(service.getPort(portNameSales, HelloWorldPortType.class, cff));
- ClientRunnable salesClient =
- new ClientRunnable(portSales,
- new CorrelationIDFactory() {
- private int counter;
- public String createCorrealtionID() {
- return "com.mycompany.sales:" + counter++;
- }
- });
+ ClientRunnable salesClient = new ClientRunnable(portSales,
+ new CorrelationIDFactory() {
+ private int counter;
+ public String createCorrealtionID() {
+ return "com.mycompany.sales:" + counter++;
+ }
+ });
executeAsync(new ClientRunnable[]{engClient, salesClient});
}
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_schema_validation/Hello.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_schema_validation/Hello.java
index abcbdc56..a4eebc3 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_schema_validation/Hello.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_schema_validation/Hello.java
@@ -47,10 +47,11 @@ import javax.xml.bind.annotation.XmlType;
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "hello", propOrder = {
- "arg0",
- "file"
- })
+@XmlType(name = "hello",
+ propOrder = {
+ "arg0",
+ "file"
+ })
public class Hello {
protected String arg0;
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_schema_validation/TestProvider.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_schema_validation/TestProvider.java
index 71b9db6..80ba68d 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_schema_validation/TestProvider.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_schema_validation/TestProvider.java
@@ -38,9 +38,9 @@ import org.apache.cxf.annotations.EndpointProperty;
@WebServiceProvider(targetNamespace = "http://cxf.apache.org/", serviceName = "HelloWS", portName = "hello")
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
@EndpointProperties(value = {
- @EndpointProperty(key = "schema-validation-enabled", value = "true"),
- @EndpointProperty(key = "mtom-enabled", value = "true")
- })
+ @EndpointProperty(key = "schema-validation-enabled", value = "true"),
+ @EndpointProperty(key = "mtom-enabled", value = "true")
+})
public class TestProvider implements Provider<SAXSource> {
private String successRsp = "<ns2:helloResponse xmlns:ns2=\"http://cxf.apache.org/\">"
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/HelloServiceImpl.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/HelloServiceImpl.java
index 38c8f13..9c57e9f 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/HelloServiceImpl.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/HelloServiceImpl.java
@@ -29,12 +29,12 @@ import org.apache.cxf.rt.security.SecurityConstants;
@WebService(name = "HelloPolicyService", serviceName = "HelloPolicyService")
@EndpointProperties(value = {
- @EndpointProperty(key = SecurityConstants.CALLBACK_HANDLER,
- value = "org.apache.cxf.systest.ws.policy.handler.CommonPasswordCallback"),
- @EndpointProperty(key = "ws-security.is-bsp-compliant", value = "false"),
- @EndpointProperty(key = SecurityConstants.SIGNATURE_PROPERTIES, value = "alice.properties"),
- @EndpointProperty(key = SecurityConstants.SIGNATURE_USERNAME, value = "alice")
- })
+ @EndpointProperty(key = SecurityConstants.CALLBACK_HANDLER,
+ value = "org.apache.cxf.systest.ws.policy.handler.CommonPasswordCallback"),
+ @EndpointProperty(key = "ws-security.is-bsp-compliant", value = "false"),
+ @EndpointProperty(key = SecurityConstants.SIGNATURE_PROPERTIES, value = "alice.properties"),
+ @EndpointProperty(key = SecurityConstants.SIGNATURE_USERNAME, value = "alice")
+})
@HandlerChain(file = "handlers.xml")
public class HelloServiceImpl implements HelloService {
@Override
[cxf] 01/03: Update Checkstyle to 8.41.1 (#773)
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 a0b7be62d175d9fce45e2e0e59e65d8689fc8cf7
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Apr 19 18:39:26 2021 -0400
Update Checkstyle to 8.41.1 (#773)
(cherry picked from commit 5cbed0aaa0160a8588cca6d8a2290a61bba2cdbf)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 2 +-
rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index b994584..f4ddf14 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -385,7 +385,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
- <version>8.35</version>
+ <version>8.41.1</version>
</dependency>
</dependencies>
<configuration>
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..7663131 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
@@ -1309,7 +1309,7 @@ public class WebClient extends AbstractClient {
}
@SuppressWarnings({
- "rawtypes", "unchecked"
+ "rawtypes", "unchecked"
})
public <T extends RxInvoker> T rx(Class<T> rxCls, ExecutorService executorService) {
if (CompletionStageRxInvoker.class.isAssignableFrom(rxCls)) {
[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 3c2a3f4b4878d0637b9a88c0415c4509dc2dbcda
Author: reta <dr...@gmail.com>
AuthorDate: Mon Apr 19 21:58:05 2021 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 663d761..57748b5 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -86,6 +86,7 @@ M 39ff641f3d81d8e0b9487ae8c49ac2a5bf055bc1
M 4162189dabdb22aec54dc3c5ae93cf42b0575d3d
M 420f6f35915cbd50cc175a6a10359125516b0213
M 4c3c5196be3e9295c31b5bc592ebc8f911c93c6d
+M 5cbed0aaa0160a8588cca6d8a2290a61bba2cdbf
M 5df02724d93f6a65ee790136e9c50be350748c26
M 601939d43496c5a1da0e6ff14434f5a50bb3f6a9
M 62dee0b664bc1d0c1dfd1617895c731d7d079bb5