This is an automated email from the ASF dual-hosted git repository.
coheigea 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 f1ce68d Some code cleanup
f1ce68d is described below
commit f1ce68df4cb17b5fe09766526ef5b7de3fef64a1
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Tue Feb 27 16:39:40 2018 +0000
Some code cleanup
---
.../cxf/binding/soap/SoapBindingFactory.java | 5 +-
.../cxf/binding/soap/SoapTransportFactory.java | 4 +-
.../apache/cxf/binding/xml/XMLBindingFactory.java | 5 +-
.../apache/cxf/jaxrs/client/AbstractClient.java | 16 ++--
.../spring/JaxRsProxyClientConfiguration.java | 9 +--
.../apache/cxf/jaxrs/swagger/Swagger2Feature.java | 88 +++++++++++-----------
.../apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 4 +-
.../cxf/jaxrs/provider/json/JSONProvider.java | 6 +-
.../ext/search/DefaultParamConverterProvider.java | 7 +-
.../sci/JaxrsServletContainerInitializer.java | 9 ++-
.../cors/CrossOriginResourceSharingFilter.java | 4 +-
.../security/jose/jwe/AbstractJweEncryption.java | 3 +-
.../security/oauth2/client/OAuthClientUtils.java | 6 +-
.../oauth2/tokens/hawk/NonceVerifierImpl.java | 2 +-
.../utils/crypto/ModelEncryptionSupport.java | 12 +--
.../cxf/rs/security/oidc/utils/OidcUtils.java | 46 ++++++-----
.../cxf/transport/sse/SseHttpTransportFactory.java | 7 +-
.../apache/cxf/rt/security/crypto/CryptoUtils.java | 16 ++--
.../asyncclient/AsyncHttpTransportFactory.java | 5 +-
.../http_jetty/JettyHTTPServerEngine.java | 16 ++--
.../netty/client/NettyHttpTransportFactory.java | 7 +-
.../netty/server/NettyHttpTransportFactory.java | 5 +-
.../cxf/transport/http/HTTPTransportFactory.java | 5 +-
.../cxf/transport/jms/JMSMessageHeadersType.java | 35 ++++-----
.../apache/cxf/transport/jms/JMSMessageUtils.java | 10 +--
.../cxf/transport/jms/JMSTransportFactory.java | 5 +-
.../apache/cxf/transport/jms/uri/JMSEndpoint.java | 10 +--
.../cxf/transport/local/LocalTransportFactory.java | 3 +-
.../cxf/transport/udp/UDPTransportFactory.java | 3 +-
.../websocket/WebSocketTransportFactory.java | 5 +-
.../cxf/sts/rest/RESTSecurityTokenServiceImpl.java | 35 +++++----
.../apache/cxf/mtom_xop/TestMtomProviderImpl.java | 19 ++---
.../tools/corba/processors/idl/StringVisitor.java | 2 +-
33 files changed, 216 insertions(+), 198 deletions(-)
diff --git
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
index 1060f4f..e1dbc07 100644
---
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
+++
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
@@ -22,6 +22,7 @@ package org.apache.cxf.binding.soap;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
@@ -114,14 +115,14 @@ import static org.apache.cxf.helpers.CastUtils.cast;
@NoJSR250Annotations(unlessNull = { "bus" })
public class SoapBindingFactory extends AbstractWSDLBindingFactory {
- public static final Collection<String> DEFAULT_NAMESPACES = Arrays.asList(
+ public static final Collection<String> DEFAULT_NAMESPACES =
Collections.unmodifiableList(Arrays.asList(
"http://schemas.xmlsoap.org/soap/";,
"http://schemas.xmlsoap.org/wsdl/soap/";,
"http://schemas.xmlsoap.org/wsdl/soap12/";,
"http://schemas.xmlsoap.org/wsdl/soap/http";,
"http://www.w3.org/2003/05/soap/bindings/HTTP/";,
"http://www.w3.org/2010/soapjms/";
- );
+ ));
public static final String SOAP_11_BINDING =
"http://schemas.xmlsoap.org/wsdl/soap/";;
diff --git
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
index e4d2d3e..c8b907a 100644
---
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
+++
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
@@ -65,14 +65,14 @@ public class SoapTransportFactory extends
AbstractTransportFactory implements De
public static final String TRANSPORT_ID =
"http://schemas.xmlsoap.org/soap/";;
- public static final List<String> DEFAULT_NAMESPACES = Arrays.asList(
+ public static final List<String> DEFAULT_NAMESPACES =
Collections.unmodifiableList(Arrays.asList(
"http://schemas.xmlsoap.org/soap/";,
"http://schemas.xmlsoap.org/wsdl/soap/";,
"http://schemas.xmlsoap.org/wsdl/soap12/";,
"http://schemas.xmlsoap.org/soap/http";,
"http://schemas.xmlsoap.org/wsdl/soap/http";,
"http://www.w3.org/2010/soapjms/";,
- "http://www.w3.org/2003/05/soap/bindings/HTTP/";);
+ "http://www.w3.org/2003/05/soap/bindings/HTTP/";));
public static final Set<String> DEFAULT_PREFIXES
= Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
"soap.udp"
diff --git
a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBindingFactory.java
b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBindingFactory.java
index 4b1f554..b05056c 100644
---
a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBindingFactory.java
+++
b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBindingFactory.java
@@ -20,6 +20,7 @@ package org.apache.cxf.binding.xml;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import javax.xml.namespace.QName;
@@ -47,10 +48,10 @@ import
org.apache.cxf.wsdl.interceptors.WrappedOutInterceptor;
@NoJSR250Annotations(unlessNull = { "bus" })
public class XMLBindingFactory extends AbstractBindingFactory {
public static final Collection<String> DEFAULT_NAMESPACES
- = Arrays.asList(
+ = Collections.unmodifiableList(Arrays.asList(
"http://cxf.apache.org/bindings/xformat";,
"http://www.w3.org/2004/08/wsdl/http";,
- "http://schemas.xmlsoap.org/wsdl/http/";);
+ "http://schemas.xmlsoap.org/wsdl/http/";));
public XMLBindingFactory() {
}
diff --git
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
index fc7d7ce..e2fb4ea 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
@@ -110,12 +110,12 @@ import org.apache.cxf.transport.MessageObserver;
*/
public abstract class AbstractClient implements Client {
public static final String EXECUTOR_SERVICE_PROPERTY = "executorService";
-
+
protected static final String REQUEST_CONTEXT = "RequestContext";
protected static final String RESPONSE_CONTEXT = "ResponseContext";
protected static final String KEEP_CONDUIT_ALIVE = "KeepConduitAlive";
protected static final String HTTP_SCHEME = "http";
-
+
private static final String ALLOW_EMPTY_PATH_VALUES =
"allow.empty.path.template.value";
private static final String PROXY_PROPERTY = "jaxrs.proxy";
private static final String HEADER_SPLIT_PROPERTY =
"org.apache.cxf.http.header.split";
@@ -436,7 +436,7 @@ public abstract class AbstractClient implements Client {
if (splitHeaders && valObject instanceof String) {
String val = (String)valObject;
String[] values;
- if (val == null || val.length() == 0) {
+ if (val.length() == 0) {
values = new String[]{""};
} else if (val.charAt(0) == '"' &&
val.charAt(val.length() - 1) == '"') {
// if the value starts with a quote and ends with
a quote, we do a best
@@ -606,7 +606,7 @@ public abstract class AbstractClient implements Client {
Exchange exchange = outMessage.getExchange();
Integer responseCode = getResponseCode(exchange);
if (responseCode == null
- || responseCode < 300 && !(actualEx instanceof IOException)
+ || responseCode < 300 && !(actualEx instanceof IOException)
|| actualEx instanceof IOException &&
exchange.get("client.redirect.exception") != null) {
if (actualEx instanceof ProcessingException) {
throw (RuntimeException)actualEx;
@@ -1098,14 +1098,14 @@ public abstract class AbstractClient implements Client {
ExecutorService executor =
(ExecutorService)cfg.getRequestContext().get(EXECUTOR_SERVICE_PROPERTY);
if (executor != null) {
exchange.put(Executor.class, executor);
-
+
final ClientMessageObserver observer = new
ClientMessageObserver(cfg);
-
+
exchange.put(MessageObserver.class, new MessageObserver() {
public void onMessage(final Message message) {
if (!message.getExchange()
.containsKey(Executor.class.getName() +
".USING_SPECIFIED")) {
-
+
executor.execute(new Runnable() {
public void run() {
observer.onMessage(message);
@@ -1202,7 +1202,7 @@ public abstract class AbstractClient implements Client {
state.reset();
}
}
-
+
protected abstract class AbstractBodyWriter extends
AbstractOutDatabindingInterceptor {
public AbstractBodyWriter() {
diff --git
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JaxRsProxyClientConfiguration.java
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JaxRsProxyClientConfiguration.java
index ee39de6..e98f8b6 100644
---
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JaxRsProxyClientConfiguration.java
+++
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JaxRsProxyClientConfiguration.java
@@ -53,12 +53,9 @@ public class JaxRsProxyClientConfiguration extends
AbstractJaxRsClientConfigurat
} else if (!StringUtils.isEmpty(scanPackages)) {
try {
final Map< Class< ? extends Annotation >, Collection< Class< ?
> > > classes =
- serviceClass == null ?
ClasspathScanner.findClasses(scanPackages, Path.class, Provider.class)
- : ClasspathScanner.findClasses(scanPackages,
Provider.class);
- if (serviceClass == null) {
- factory.setServiceClass(
-
JAXRSClientFactoryBeanDefinitionParser.getServiceClass(classes.get(Path.class)));
- }
+ ClasspathScanner.findClasses(scanPackages, Path.class,
Provider.class);
+ factory.setServiceClass(
+
JAXRSClientFactoryBeanDefinitionParser.getServiceClass(classes.get(Path.class)));
factory.setProviders(
JAXRSClientFactoryBeanDefinitionParser.getProviders(context,
classes.get(Provider.class)));
} catch (Exception ex) {
diff --git
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
index 19608e1..59887bc 100644
---
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
+++
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
@@ -70,7 +70,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature
implements SwaggerUi
private static final String DEFAULT_LICENSE_VALUE = "Apache 2.0 License";
private static final String DEFAULT_LICENSE_URL =
"http://www.apache.org/licenses/LICENSE-2.0.html";;
-
+
private static final String DEFAULT_PROPS_LOCATION = "/swagger.properties";
private static final String RESOURCE_PACKAGE_PROPERTY = "resource.package";
private static final String TITLE_PROPERTY = "title";
@@ -85,7 +85,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature
implements SwaggerUi
private static final String FILTER_CLASS_PROPERTY = "filter.class";
private static final String HOST_PROPERTY = "host";
private static final String USE_PATH_CFG_PROPERTY =
"use.path.based.config";
-
+
private boolean scan;
private boolean scanAllResources;
@@ -94,7 +94,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature
implements SwaggerUi
private Boolean supportSwaggerUi;
private String swaggerUiVersion;
-
+
private String swaggerUiMavenGroupAndArtifact;
private Map<String, String> swaggerUiMediaTypes;
@@ -102,14 +102,14 @@ public class Swagger2Feature extends
AbstractSwaggerFeature implements SwaggerUi
private boolean dynamicBasePath;
private Map<String, SecuritySchemeDefinition> securityDefinitions;
-
+
private Swagger2Customizer customizer;
-
+
private String host;
private String[] schemes;
private Boolean prettyPrint;
private Boolean usePathBasedConfig;
-
+
private String propertiesLocation = DEFAULT_PROPS_LOCATION;
@Override
@@ -126,7 +126,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature
implements SwaggerUi
ServerProviderFactory factory =
(ServerProviderFactory)server.getEndpoint().get(ServerProviderFactory.class.getName());
ApplicationInfo appInfo = null;
- if (!isScan()) {
+ if (!isScan()) {
appInfo = factory.getApplicationProvider();
if (appInfo == null) {
Set<Class<?>> serviceClasses = new HashSet<>();
@@ -137,10 +137,10 @@ public class Swagger2Feature extends
AbstractSwaggerFeature implements SwaggerUi
server.getEndpoint().put(Application.class.getName(), appInfo);
}
}
-
+
List<Object> swaggerResources = new LinkedList<>();
-
+
if (customizer == null) {
customizer = new Swagger2Customizer();
}
@@ -155,11 +155,11 @@ public class Swagger2Feature extends
AbstractSwaggerFeature implements SwaggerUi
final Properties swaggerProps = getSwaggerProperties(bus);
final Registration swaggerUiRegistration = getSwaggerUi(bus,
swaggerProps, isRunAsFilter());
-
+
if (!isRunAsFilter()) {
swaggerResources.addAll(swaggerUiRegistration.getResources());
- }
-
+ }
+
providers.addAll(swaggerUiRegistration.getProviders());
sfb.setResourceClassesFromBeans(swaggerResources);
@@ -173,7 +173,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature
implements SwaggerUi
}
customizer.setClassResourceInfos(cris);
customizer.setDynamicBasePath(dynamicBasePath);
-
+
BeanConfig beanConfig = appInfo == null
? new BeanConfig()
: new ApplicationBeanConfig(appInfo.getProvider());
@@ -184,7 +184,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature
implements SwaggerUi
swagger.setSecurityDefinitions(securityDefinitions);
}
customizer.setBeanConfig(beanConfig);
-
+
providers.add(new ReaderConfigFilter());
if (beanConfig.isUsePathBasedConfig()) {
@@ -195,8 +195,8 @@ public class Swagger2Feature extends AbstractSwaggerFeature
implements SwaggerUi
}
protected Properties getSwaggerProperties(Bus bus) {
- InputStream is =
ResourceUtils.getClasspathResourceStream(propertiesLocation,
- AbstractSwaggerFeature.class,
+ InputStream is =
ResourceUtils.getClasspathResourceStream(propertiesLocation,
+ AbstractSwaggerFeature.class,
bus);
Properties props = null;
if (is != null) {
@@ -217,14 +217,14 @@ public class Swagger2Feature extends
AbstractSwaggerFeature implements SwaggerUi
return props;
}
protected void initBeanConfig(BeanConfig beanConfig, Properties props) {
-
+
// resource package
String theResourcePackage = getResourcePackage();
if (theResourcePackage == null && props != null) {
theResourcePackage = props.getProperty(RESOURCE_PACKAGE_PROPERTY);
}
beanConfig.setResourcePackage(theResourcePackage);
-
+
// use path based configuration
Boolean theUsePathBasedConfig = isUsePathBasedConfig();
if (theUsePathBasedConfig == null && props != null) {
@@ -234,49 +234,49 @@ public class Swagger2Feature extends
AbstractSwaggerFeature implements SwaggerUi
theUsePathBasedConfig = false;
}
beanConfig.setUsePathBasedConfig(theUsePathBasedConfig);
-
- // version
+
+ // version
String theVersion = getVersion();
if (theVersion == null && props != null) {
theVersion = props.getProperty(VERSION_PROPERTY);
}
beanConfig.setVersion(theVersion);
-
+
// host
String theHost = getHost();
if (theHost == null && props != null) {
theHost = props.getProperty(HOST_PROPERTY);
}
beanConfig.setHost(theHost);
-
+
// schemes
String[] theSchemes = getSchemes();
if (theSchemes == null && props != null &&
props.containsKey(SCHEMES_PROPERTY)) {
theSchemes = props.getProperty(SCHEMES_PROPERTY).split(",");
}
beanConfig.setSchemes(theSchemes);
-
+
// title
String theTitle = getTitle();
if (theTitle == null && props != null) {
theTitle = props.getProperty(TITLE_PROPERTY);
}
beanConfig.setTitle(theTitle);
-
+
// description
String theDescription = getDescription();
if (theDescription == null && props != null) {
theDescription = props.getProperty(DESCRIPTION_PROPERTY);
}
beanConfig.setDescription(theDescription);
-
+
// contact
String theContact = getContact();
if (theContact == null && props != null) {
theContact = props.getProperty(CONTACT_PROPERTY);
}
beanConfig.setContact(theContact);
-
+
// license
String theLicense = getLicense();
if (theLicense == null && !licenseWasSet) {
@@ -290,7 +290,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature
implements SwaggerUi
}
}
beanConfig.setLicense(theLicense);
-
+
// license url
String theLicenseUrl = getLicenseUrl();
if (theLicenseUrl == null && props != null) {
@@ -300,14 +300,14 @@ public class Swagger2Feature extends
AbstractSwaggerFeature implements SwaggerUi
theLicenseUrl = DEFAULT_LICENSE_URL;
}
beanConfig.setLicenseUrl(theLicenseUrl);
-
+
// terms of service url
String theTermsUrl = getTermsOfServiceUrl();
if (theTermsUrl == null && props != null) {
theTermsUrl = props.getProperty(TERMS_URL_PROPERTY);
}
beanConfig.setTermsOfServiceUrl(theTermsUrl);
-
+
// pretty print
Boolean thePrettyPrint = isPrettyPrint();
if (thePrettyPrint == null && props != null) {
@@ -317,20 +317,20 @@ public class Swagger2Feature extends
AbstractSwaggerFeature implements SwaggerUi
thePrettyPrint = false;
}
beanConfig.setPrettyPrint(thePrettyPrint);
-
+
// filter class
String theFilterClass = getFilterClass();
if (theFilterClass == null && props != null) {
theFilterClass = props.getProperty(FILTER_CLASS_PROPERTY);
}
beanConfig.setFilterClass(theFilterClass);
-
+
// scan
beanConfig.setScan(isScan());
-
+
// base path is calculated dynamically
beanConfig.setBasePath(getBasePath());
-
+
}
public Boolean isUsePathBasedConfig() {
@@ -352,7 +352,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature
implements SwaggerUi
public String[] getSchemes() {
return schemes;
}
-
+
public void setSchemes(String[] schemes) {
this.schemes = schemes;
}
@@ -364,7 +364,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature
implements SwaggerUi
public void setPrettyPrint(Boolean prettyPrint) {
this.prettyPrint = prettyPrint;
}
-
+
public Swagger2Customizer getCustomizer() {
return customizer;
}
@@ -372,7 +372,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature
implements SwaggerUi
public void setCustomizer(Swagger2Customizer customizer) {
this.customizer = customizer;
}
-
+
public boolean isScanAllResources() {
return scanAllResources;
}
@@ -404,13 +404,13 @@ public class Swagger2Feature extends
AbstractSwaggerFeature implements SwaggerUi
}
/**
- * Set SwaggerUI Maven group and artifact using the "groupId/artifactId"
format.
+ * Set SwaggerUI Maven group and artifact using the "groupId/artifactId"
format.
* @param swaggerUiMavenGroupAndArtifact
*/
public void setSwaggerUiMavenGroupAndArtifact(String
swaggerUiMavenGroupAndArtifact) {
this.swaggerUiMavenGroupAndArtifact = swaggerUiMavenGroupAndArtifact;
}
-
+
public void setSwaggerUiVersion(String swaggerUiVersion) {
this.swaggerUiVersion = swaggerUiVersion;
}
@@ -427,12 +427,12 @@ public class Swagger2Feature extends
AbstractSwaggerFeature implements SwaggerUi
public void setSwaggerUiMediaTypes(Map<String, String>
swaggerUiMediaTypes) {
this.swaggerUiMediaTypes = swaggerUiMediaTypes;
}
-
+
@Override
public Map<String, String> getSwaggerUiMediaTypes() {
return swaggerUiMediaTypes;
}
-
+
public void setSecurityDefinitions(Map<String, SecuritySchemeDefinition>
securityDefinitions) {
this.securityDefinitions = securityDefinitions;
}
@@ -444,7 +444,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature
implements SwaggerUi
public void setPropertiesLocation(String propertiesLocation) {
this.propertiesLocation = propertiesLocation;
}
-
+
public boolean isScan() {
return scan;
}
@@ -452,7 +452,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature
implements SwaggerUi
public void setScan(boolean scan) {
this.scan = scan;
}
-
+
@Override
public String findSwaggerUiRoot() {
return SwaggerUi.findSwaggerUiRoot(swaggerUiMavenGroupAndArtifact,
swaggerUiVersion);
@@ -473,7 +473,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature
implements SwaggerUi
if (context != null) {
return new SyntheticServletConfig(context);
}
- } else if (sc != null &&
sc.getInitParameter(SwaggerContextService.USE_PATH_BASED_CONFIG) == null) {
+ } else if
(sc.getInitParameter(SwaggerContextService.USE_PATH_BASED_CONFIG) == null) {
return new DelegatingServletConfig(sc);
}
@@ -482,7 +482,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature
implements SwaggerUi
}
@PreMatching
- protected static class SwaggerContainerRequestFilter extends
Swagger2ApiListingResource
+ protected static class SwaggerContainerRequestFilter extends
Swagger2ApiListingResource
implements ContainerRequestFilter {
protected static final String APIDOCS_LISTING_PATH_JSON =
"swagger.json";
diff --git
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index b384c34..6358a2f 100644
---
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -241,7 +241,7 @@ public class WadlGenerator implements
ContainerRequestFilter {
context.abortWith(Response.status(404).build());
return;
}
-
+
if (whiteList != null && whiteList.size() > 0) {
ServletRequest servletRequest =
(ServletRequest)m.getContextualProperty(
"HTTP.REQUEST");
@@ -1594,7 +1594,7 @@ public class WadlGenerator implements
ContainerRequestFilter {
String currentPrefix = name.getPrefix();
if (currentPrefix.startsWith(nsPrefix)) {
int currentIndex = currentPrefix.equals(nsPrefix) ? 0
- :
Integer.valueOf(currentPrefix.substring(nsPrefix.length()));
+ :
Integer.parseInt(currentPrefix.substring(nsPrefix.length()));
if (currentIndex > index) {
index = currentIndex;
}
diff --git
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
index a4953c6..6926f54 100644
---
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
+++
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
@@ -675,10 +675,10 @@ public class JSONProvider<T> extends
AbstractJAXBProvider<T> {
if (totalElementCountStr != null || innerElementCountStr != null
|| elementLevelStr != null) {
try {
int totalElementCount = totalElementCountStr != null
- ? Integer.valueOf(totalElementCountStr) : -1;
- int elementLevel = elementLevelStr != null ?
Integer.valueOf(elementLevelStr) : -1;
+ ? Integer.parseInt(totalElementCountStr) : -1;
+ int elementLevel = elementLevelStr != null ?
Integer.parseInt(elementLevelStr) : -1;
int innerElementCount = innerElementCountStr != null
- ? Integer.valueOf(innerElementCountStr) : -1;
+ ? Integer.parseInt(innerElementCountStr) : -1;
return new DocumentDepthProperties(totalElementCount,
elementLevel, innerElementCount);
} catch (Exception ex) {
throw ExceptionUtils.toInternalServerErrorException(ex,
null);
diff --git
a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/DefaultParamConverterProvider.java
b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/DefaultParamConverterProvider.java
index 0b3c214..7586479 100644
---
a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/DefaultParamConverterProvider.java
+++
b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/DefaultParamConverterProvider.java
@@ -23,6 +23,7 @@ import java.lang.reflect.Type;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+import java.util.Map.Entry;
import javax.ws.rs.ext.ParamConverter;
import javax.ws.rs.ext.ParamConverterProvider;
@@ -125,9 +126,9 @@ public class DefaultParamConverterProvider implements
ParamConverterProvider {
public <T> ParamConverter<T> getConverter(final Class<T> rawType, final
Type genericType,
final Annotation[] annotations) {
- for (final Class< ? > type: converters.keySet()) {
- if (type.isAssignableFrom(rawType)) {
- return (ParamConverter<T>)converters.get(type);
+ for (final Entry<Class<?>, ParamConverter<?>> entry:
converters.entrySet()) {
+ if (entry.getKey().isAssignableFrom(rawType)) {
+ return (ParamConverter<T>)entry.getValue();
}
}
diff --git
a/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/sci/JaxrsServletContainerInitializer.java
b/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/sci/JaxrsServletContainerInitializer.java
index 202f7fa..a26bf53 100644
---
a/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/sci/JaxrsServletContainerInitializer.java
+++
b/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/sci/JaxrsServletContainerInitializer.java
@@ -25,6 +25,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.logging.Logger;
@@ -102,7 +103,7 @@ public class JaxrsServletContainerInitializer implements
ServletContainerInitial
// with a JAX-RS Application class name
servletMapping = getServletMapping(ctx, servletName);
}
- final Map<String, Object> appProperties =
+ final Map<String, Object> appProperties =
app != null ? app.getProperties() : Collections.emptyMap();
app = new Application() {
@Override
@@ -171,9 +172,9 @@ public class JaxrsServletContainerInitializer implements
ServletContainerInitial
if (classes != null) {
for (final Class< ? > clazz: classes) {
if (!classShouldBeIgnored(clazz)) {
- for (final Class< ? extends Annotation > annotation:
grouped.keySet()) {
- if (clazz.isAnnotationPresent(annotation)) {
- grouped.get(annotation).add(clazz);
+ for (final Entry<Class<? extends Annotation>,
Collection<Class<?>>> entry : grouped.entrySet()) {
+ if (clazz.isAnnotationPresent(entry.getKey())) {
+ entry.getValue().add(clazz);
}
}
}
diff --git
a/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
b/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
index 2c081b1..96edd8b 100644
---
a/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
+++
b/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
@@ -123,7 +123,7 @@ public class CrossOriginResourceSharingFilter implements
ContainerRequestFilter,
context.abortWith(r);
}
} else if (findResourceMethod) {
- Method method = findResourceMethod ? getResourceMethod(m,
httpMethod) : null;
+ Method method = getResourceMethod(m, httpMethod);
simpleRequest(m, method);
} else {
m.getInterceptorChain().add(new CorsInInterceptor());
@@ -296,7 +296,7 @@ public class CrossOriginResourceSharingFilter implements
ContainerRequestFilter,
OperationResourceInfo ori =
JAXRSUtils.findTargetMethod(matchedResources,
m, httpMethod, values,
contentType,
- Collections.singletonList(acceptType),
+ Collections.singletonList(acceptType),
false,
false);
if (ori == null) {
diff --git
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
index 6294ca2..361d2a7 100644
---
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
+++
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
@@ -200,8 +200,7 @@ public abstract class AbstractJweEncryption implements
JweEncryptionProvider {
String protectedHeadersJson = writer.toJson(protectedHeaders);
- byte[] additionalEncryptionParam = getAAD(protectedHeadersJson,
- jweInput == null ? null
: jweInput.getAad());
+ byte[] additionalEncryptionParam = getAAD(protectedHeadersJson,
jweInput.getAad());
keyProps.setAdditionalData(additionalEncryptionParam);
state.keyProps = keyProps;
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java
index 45baf91..8cef9b6 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java
@@ -192,7 +192,7 @@ public final class OAuthClientUtils {
throws OAuthServiceException {
return getAccessToken(accessTokenService, null, grant, null, false);
}
-
+
/**
* Obtains the access token from OAuth AccessToken Service
* using the initialized web client
@@ -351,10 +351,10 @@ public final class OAuthClientUtils {
}
String expiresInStr =
map.remove(OAuthConstants.ACCESS_TOKEN_EXPIRES_IN);
if (expiresInStr != null) {
- token.setExpiresIn(Long.valueOf(expiresInStr));
+ token.setExpiresIn(Long.parseLong(expiresInStr));
}
String issuedAtStr =
map.remove(OAuthConstants.ACCESS_TOKEN_ISSUED_AT);
- token.setIssuedAt(issuedAtStr != null ?
Long.valueOf(issuedAtStr)
+ token.setIssuedAt(issuedAtStr != null ?
Long.parseLong(issuedAtStr)
:
System.currentTimeMillis() / 1000);
String scope = map.remove(OAuthConstants.SCOPE);
if (scope != null) {
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceVerifierImpl.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceVerifierImpl.java
index 20c222c..01473cc 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceVerifierImpl.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceVerifierImpl.java
@@ -34,7 +34,7 @@ public class NonceVerifierImpl implements NonceVerifier {
}
long serverClock = System.currentTimeMillis();
- long clientTimestamp = Long.valueOf(clientTimestampString);
+ long clientTimestamp = Long.parseLong(clientTimestampString);
NonceHistory nonceHistory = nonceStore.getNonceHistory(tokenKey);
Nonce nonce = new Nonce(clientNonceString, clientTimestamp);
if (nonceHistory == null) {
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/crypto/ModelEncryptionSupport.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/crypto/ModelEncryptionSupport.java
index e0585c2..b384209 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/crypto/ModelEncryptionSupport.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/crypto/ModelEncryptionSupport.java
@@ -230,8 +230,8 @@ public final class ModelEncryptionSupport {
final ServerAccessToken newToken = new
ServerAccessToken(provider.getClient(parts[4]),
parts[1],
newTokenKey
== null ? parts[0] : newTokenKey,
-
Long.valueOf(parts[2]),
-
Long.valueOf(parts[3])) {
+
Long.parseLong(parts[2]),
+
Long.parseLong(parts[3])) {
};
newToken.setRefreshToken(getStringPart(parts[5]));
@@ -245,7 +245,7 @@ public final class ModelEncryptionSupport {
String[] allPermParts = parts[9].split("\\.");
for (int i = 0; i + 4 < allPermParts.length; i = i + 5) {
OAuthPermission perm = new OAuthPermission(allPermParts[i],
allPermParts[i + 1]);
- perm.setDefaultPermission(Boolean.valueOf(allPermParts[i +
2]));
+ perm.setDefaultPermission(Boolean.parseBoolean(allPermParts[i
+ 2]));
perm.setHttpVerbs(parseSimpleList(allPermParts[i + 3]));
perm.setUris(parseSimpleList(allPermParts[i + 4]));
perms.add(perm);
@@ -336,7 +336,7 @@ public final class ModelEncryptionSupport {
String[] parts = getParts(sequence);
Client c = new Client(parts[0],
parts[1],
- Boolean.valueOf(parts[2]),
+ Boolean.parseBoolean(parts[2]),
getStringPart(parts[3]),
getStringPart(parts[4]));
c.setApplicationDescription(getStringPart(parts[5]));
c.setApplicationLogoUri(getStringPart(parts[6]));
@@ -400,8 +400,8 @@ public final class ModelEncryptionSupport {
String[] parts = getParts(sequence);
ServerAuthorizationCodeGrant grant = new
ServerAuthorizationCodeGrant(provider.getClient(parts[0]),
parts[1],
-
Long.valueOf(parts[2]),
-
Long.valueOf(parts[3]));
+
Long.parseLong(parts[2]),
+
Long.parseLong(parts[3]));
grant.setRedirectUri(getStringPart(parts[4]));
grant.setAudience(getStringPart(parts[5]));
grant.setClientCodeChallenge(getStringPart(parts[6]));
diff --git
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
index 6da6f4c..282bb62 100644
---
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
+++
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
@@ -54,24 +54,30 @@ public final class OidcUtils {
public static final String EMAIL_SCOPE = "email";
public static final String ADDRESS_SCOPE = "address";
public static final String PHONE_SCOPE = "phone";
- public static final List<String> PROFILE_CLAIMS =
Arrays.asList(AbstractUserInfo.NAME_CLAIM,
-
AbstractUserInfo.FAMILY_NAME_CLAIM,
-
AbstractUserInfo.GIVEN_NAME_CLAIM,
-
AbstractUserInfo.MIDDLE_NAME_CLAIM,
-
AbstractUserInfo.NICKNAME_CLAIM,
-
AbstractUserInfo.PREFERRED_USERNAME_CLAIM,
-
AbstractUserInfo.PROFILE_CLAIM,
-
AbstractUserInfo.PICTURE_CLAIM,
-
AbstractUserInfo.WEBSITE_CLAIM,
-
AbstractUserInfo.GENDER_CLAIM,
-
AbstractUserInfo.BIRTHDATE_CLAIM,
-
AbstractUserInfo.ZONEINFO_CLAIM,
-
AbstractUserInfo.LOCALE_CLAIM,
-
AbstractUserInfo.UPDATED_AT_CLAIM);
- public static final List<String> EMAIL_CLAIMS =
Arrays.asList(AbstractUserInfo.EMAIL_CLAIM,
-
AbstractUserInfo.EMAIL_VERIFIED_CLAIM);
- public static final List<String> ADDRESS_CLAIMS =
Arrays.asList(AbstractUserInfo.ADDRESS_CLAIM);
- public static final List<String> PHONE_CLAIMS =
Arrays.asList(AbstractUserInfo.PHONE_CLAIM);
+
+ public static final List<String> PROFILE_CLAIMS =
+ Collections.unmodifiableList(Arrays.asList(AbstractUserInfo.NAME_CLAIM,
+
AbstractUserInfo.FAMILY_NAME_CLAIM,
+
AbstractUserInfo.GIVEN_NAME_CLAIM,
+
AbstractUserInfo.MIDDLE_NAME_CLAIM,
+
AbstractUserInfo.NICKNAME_CLAIM,
+
AbstractUserInfo.PREFERRED_USERNAME_CLAIM,
+
AbstractUserInfo.PROFILE_CLAIM,
+
AbstractUserInfo.PICTURE_CLAIM,
+
AbstractUserInfo.WEBSITE_CLAIM,
+
AbstractUserInfo.GENDER_CLAIM,
+
AbstractUserInfo.BIRTHDATE_CLAIM,
+
AbstractUserInfo.ZONEINFO_CLAIM,
+
AbstractUserInfo.LOCALE_CLAIM,
+
AbstractUserInfo.UPDATED_AT_CLAIM));
+ public static final List<String> EMAIL_CLAIMS =
+
Collections.unmodifiableList(Arrays.asList(AbstractUserInfo.EMAIL_CLAIM,
+
AbstractUserInfo.EMAIL_VERIFIED_CLAIM));
+ public static final List<String> ADDRESS_CLAIMS =
+
Collections.unmodifiableList(Arrays.asList(AbstractUserInfo.ADDRESS_CLAIM));
+ public static final List<String> PHONE_CLAIMS =
+
Collections.unmodifiableList(Arrays.asList(AbstractUserInfo.PHONE_CLAIM));
+
public static final String CLAIMS_PARAM = "claims";
public static final String CLAIM_NAMES_PROPERTY = "_claim_names";
public static final String CLAIM_SOURCES_PROPERTY = "_claim_sources";
@@ -122,7 +128,7 @@ public final class OidcUtils {
public static String getAllScopes() {
return getScope(OPENID_SCOPE, PROFILE_SCOPE, EMAIL_SCOPE,
ADDRESS_SCOPE, PHONE_SCOPE);
}
-
+
public static List<String> getScopeClaims(String... scope) {
List<String> claims = new ArrayList<>();
if (scope != null) {
@@ -186,7 +192,7 @@ public final class OidcUtils {
}
String algoShaSizeString = sigAlgo.getJwaName().substring(2);
String javaShaAlgo = "SHA-" + algoShaSizeString;
- int algoShaSize = Integer.valueOf(algoShaSizeString);
+ int algoShaSize = Integer.parseInt(algoShaSizeString);
int valueHashSize = (algoShaSize / 8) / 2;
try {
byte[] atBytes = StringUtils.toBytesASCII(value);
diff --git
a/rt/rs/sse/src/main/java/org/apache/cxf/transport/sse/SseHttpTransportFactory.java
b/rt/rs/sse/src/main/java/org/apache/cxf/transport/sse/SseHttpTransportFactory.java
index 60ce249..6ba023d 100644
---
a/rt/rs/sse/src/main/java/org/apache/cxf/transport/sse/SseHttpTransportFactory.java
+++
b/rt/rs/sse/src/main/java/org/apache/cxf/transport/sse/SseHttpTransportFactory.java
@@ -20,6 +20,7 @@ package org.apache.cxf.transport.sse;
import java.io.IOException;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import org.apache.cxf.Bus;
@@ -37,10 +38,10 @@ public class SseHttpTransportFactory extends
HTTPTransportFactory
implements ConduitInitiator, DestinationFactory {
public static final String TRANSPORT_ID =
"http://cxf.apache.org/transports/http/sse";;
- public static final List<String> DEFAULT_NAMESPACES = Arrays.asList(
+ public static final List<String> DEFAULT_NAMESPACES =
Collections.unmodifiableList(Arrays.asList(
TRANSPORT_ID,
"http://cxf.apache.org/transports/http/sse/configuration";
- );
+ ));
public SseHttpTransportFactory() {
this(null);
@@ -52,7 +53,7 @@ public class SseHttpTransportFactory extends
HTTPTransportFactory
@Override
public Destination getDestination(EndpointInfo endpointInfo, Bus bus)
throws IOException {
- final AtmosphereSseServletDestination destination = new
AtmosphereSseServletDestination(bus, getRegistry(),
+ final AtmosphereSseServletDestination destination = new
AtmosphereSseServletDestination(bus, getRegistry(),
endpointInfo, endpointInfo.getAddress());
destination.finalizeConfig();
return destination;
diff --git
a/rt/security/src/main/java/org/apache/cxf/rt/security/crypto/CryptoUtils.java
b/rt/security/src/main/java/org/apache/cxf/rt/security/crypto/CryptoUtils.java
index 5971128..e1e62cf 100644
---
a/rt/security/src/main/java/org/apache/cxf/rt/security/crypto/CryptoUtils.java
+++
b/rt/security/src/main/java/org/apache/cxf/rt/security/crypto/CryptoUtils.java
@@ -125,7 +125,7 @@ public final class CryptoUtils {
throw new SecurityException(ex);
}
}
-
+
public static RSAPublicKey getRSAPublicKey(KeyFactory factory,
byte[] modulusBytes,
byte[] publicExponentBytes) {
@@ -133,7 +133,7 @@ public final class CryptoUtils {
BigInteger publicExponent = toBigInteger(publicExponentBytes);
return getRSAPublicKey(factory, modulus, publicExponent);
}
-
+
public static RSAPublicKey getRSAPublicKey(BigInteger modulusBytes,
BigInteger publicExponentBytes)
{
try {
@@ -145,7 +145,7 @@ public final class CryptoUtils {
}
}
-
+
public static RSAPublicKey getRSAPublicKey(KeyFactory factory,
BigInteger modulus,
BigInteger publicExponent) {
@@ -156,7 +156,7 @@ public final class CryptoUtils {
throw new SecurityException(ex);
}
}
-
+
public static RSAPrivateKey getRSAPrivateKey(String encodedModulus,
String
encodedPrivateExponent) {
try {
@@ -348,8 +348,8 @@ public final class CryptoUtils {
}
}
- public static Signature getVerificationSignature(PublicKey key,
- String signAlgo,
+ public static Signature getVerificationSignature(PublicKey key,
+ String signAlgo,
AlgorithmParameterSpec
params) {
try {
Signature s = Signature.getInstance(signAlgo);
@@ -549,7 +549,7 @@ public final class CryptoUtils {
//the default block size is 256 when use private key
under java9
blockSize = secretKey instanceof PublicKey ? 117 : 256;
} else {
-
+
blockSize = secretKey instanceof PublicKey ? 117 : 128;
}
}
@@ -576,7 +576,7 @@ public final class CryptoUtils {
}
private static boolean isJava8Release161OrLater(String javaVersion) {
- return javaVersion.startsWith("1.8.0_") &&
Integer.valueOf(javaVersion.substring(6)) >= 161;
+ return javaVersion.startsWith("1.8.0_") &&
Integer.parseInt(javaVersion.substring(6)) >= 161;
}
public static Cipher initCipher(Key secretKey, KeyProperties keyProps, int
mode) throws SecurityException {
diff --git
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHttpTransportFactory.java
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHttpTransportFactory.java
index 83d952a..8e15133 100644
---
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHttpTransportFactory.java
+++
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHttpTransportFactory.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -38,8 +39,8 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
public class AsyncHttpTransportFactory extends AbstractTransportFactory
implements ConduitInitiator {
- public static final List<String> DEFAULT_NAMESPACES = Arrays
- .asList("http://cxf.apache.org/transports/http/http-client";);
+ public static final List<String> DEFAULT_NAMESPACES =
Collections.unmodifiableList(Arrays
+ .asList("http://cxf.apache.org/transports/http/http-client";));
/**
* This constant holds the prefixes served by this factory.
diff --git
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
index 3189ad2..085291c 100644
---
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
+++
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
@@ -491,7 +491,7 @@ public class JettyHTTPServerEngine implements ServerEngine {
if (isSessionSupport) {
// If we have sessions, we need two handlers.
SessionHandler sh = null;
- if (Server.getVersion().startsWith("9.2")
+ if (Server.getVersion().startsWith("9.2")
|| Server.getVersion().startsWith("9.3")) {
if (sessionHandler == null) {
sessionHandler = new SessionHandler();
@@ -499,8 +499,8 @@ public class JettyHTTPServerEngine implements ServerEngine {
sh = new SessionHandler();
try {
Method get =
ReflectionUtil.getDeclaredMethod(SessionHandler.class, "getSessionManager");
- Method set =
ReflectionUtil.getDeclaredMethod(SessionHandler.class,
-
"setSessionManager",
+ Method set =
ReflectionUtil.getDeclaredMethod(SessionHandler.class,
+
"setSessionManager",
get.getReturnType());
ReflectionUtil.setAccessible(set)
.invoke(sh,
ReflectionUtil.setAccessible(get).invoke(sessionHandler));
@@ -982,10 +982,12 @@ public class JettyHTTPServerEngine implements
ServerEngine {
private void checkConnectorPort() throws IOException {
try {
- int cp = ((ServerConnector)connector).getPort();
- if (null != connector && port != cp) {
- throw new IOException("Error: Connector port " + cp + " does
not match"
- + " with the server engine port " + port);
+ if (null != connector) {
+ int cp = ((ServerConnector)connector).getPort();
+ if (port != cp) {
+ throw new IOException("Error: Connector port " + cp + "
does not match"
+ + " with the server engine port " + port);
+ }
}
} catch (IOException ioe) {
throw ioe;
diff --git
a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpTransportFactory.java
b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpTransportFactory.java
index a8aebdb..30115db 100644
---
a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpTransportFactory.java
+++
b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpTransportFactory.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -39,16 +40,14 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
public class NettyHttpTransportFactory extends AbstractTransportFactory
implements ConduitInitiator {
- public static final List<String> DEFAULT_NAMESPACES = Arrays
- .asList("http://cxf.apache.org/transports/http/netty/client";);
+ public static final List<String> DEFAULT_NAMESPACES =
Collections.unmodifiableList(Arrays
+ .asList("http://cxf.apache.org/transports/http/netty/client";));
/**
* This constant holds the prefixes served by this factory.
*/
private static final Set<String> URI_PREFIXES = new HashSet<>();
-
-
static {
URI_PREFIXES.add("netty://");
}
diff --git
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpTransportFactory.java
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpTransportFactory.java
index 889f3a4..4bb3987 100644
---
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpTransportFactory.java
+++
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpTransportFactory.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -39,8 +40,8 @@ import org.apache.cxf.transport.http.HttpDestinationFactory;
public class NettyHttpTransportFactory extends AbstractTransportFactory
implements DestinationFactory {
- public static final List<String> DEFAULT_NAMESPACES = Arrays
- .asList("http://cxf.apache.org/transports/http/netty/server";);
+ public static final List<String> DEFAULT_NAMESPACES =
Collections.unmodifiableList(Arrays
+ .asList("http://cxf.apache.org/transports/http/netty/server";));
/**
* This constant holds the prefixes served by this factory.
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java
index b40a1b3..1b8cd78 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -60,12 +61,12 @@ public class HTTPTransportFactory
public static final List<String> DEFAULT_NAMESPACES
- = Arrays.asList(
+ = Collections.unmodifiableList(Arrays.asList(
"http://cxf.apache.org/transports/http";,
"http://cxf.apache.org/transports/http/configuration";,
"http://schemas.xmlsoap.org/wsdl/http";,
"http://schemas.xmlsoap.org/wsdl/http/";
- );
+ ));
private static final Logger LOG =
LogUtils.getL7dLogger(HTTPTransportFactory.class);
diff --git
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageHeadersType.java
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageHeadersType.java
index 17a2a51..3fb17dc 100644
---
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageHeadersType.java
+++
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageHeadersType.java
@@ -24,6 +24,7 @@ import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import javax.jms.Destination;
@@ -54,35 +55,35 @@ public class JMSMessageHeadersType {
private String soapjmssoapAction;
private Boolean soapjmsIsFault;
private String soapjmsRequestURI;
-
+
public JMSMessageHeadersType() {
this.properties = new HashMap<>();
}
-
+
@Deprecated
public List<JMSPropertyType> getProperty() {
List<JMSPropertyType> props = new ArrayList<>();
- for (String key : properties.keySet()) {
+ for (Entry<String, Object> entry : properties.entrySet()) {
JMSPropertyType prop = new JMSPropertyType();
- prop.setName(key);
- prop.setValue(properties.get(key));
+ prop.setName(entry.getKey());
+ prop.setValue(entry.getValue());
props.add(prop);
}
return Collections.unmodifiableList(props);
}
-
+
public void putProperty(String key, Object value) {
properties.put(key, value);
}
-
+
public Object getProperty(String key) {
return properties.get(key);
}
-
+
public Set<String> getPropertyKeys() {
return properties.keySet();
}
-
+
public String getJMSCorrelationID() {
return jmsCorrelationID;
}
@@ -314,7 +315,7 @@ public class JMSMessageHeadersType {
public boolean isSOAPJMSIsFault() {
return soapjmsIsFault;
}
-
+
public String getContentType() {
String contentType = getSOAPJMSContentType();
if (contentType == null) {
@@ -328,13 +329,13 @@ public class JMSMessageHeadersType {
}
return contentType;
}
-
+
public static JMSMessageHeadersType from(Message message) throws
JMSException {
JMSMessageHeadersType messageHeaders = new JMSMessageHeadersType();
messageHeaders.read(message);
return messageHeaders;
}
-
+
private void read(Message message) throws JMSException {
setJMSCorrelationID(message.getJMSCorrelationID());
setJMSDeliveryMode(Integer.valueOf(message.getJMSDeliveryMode()));
@@ -377,7 +378,7 @@ public class JMSMessageHeadersType {
putProperty(unescapedName, val);
}
}
-
+
public void writeProp(Message jmsMessage, String origName, Object value)
throws JMSException {
String name = origName.replace(".", "__");
if (value == null) {
@@ -424,17 +425,17 @@ public class JMSMessageHeadersType {
jmsMessage.setBooleanProperty(JMSSpecConstants.ISFAULT_FIELD,
isSOAPJMSIsFault());
}
- for (String key : properties.keySet()) {
- writeProp(jmsMessage, key, properties.get(key));
+ for (Entry<String, Object> entry : properties.entrySet()) {
+ writeProp(jmsMessage, entry.getKey(), entry.getValue());
}
}
-
+
private void setProp(Message jmsMessage, String name, String value) throws
JMSException {
if (value != null) {
jmsMessage.setStringProperty(name, value);
}
}
-
+
}
diff --git
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
index 4bf28a2..669c903 100644
---
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
+++
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
@@ -95,7 +95,7 @@ final class JMSMessageUtils {
}
private static void populateIncomingContext(JMSMessageHeadersType
messageHeaders,
- org.apache.cxf.message.Message
inMessage)
+ org.apache.cxf.message.Message
inMessage)
throws
UnsupportedEncodingException {
String contentType = messageHeaders.getContentType();
if (contentType != null) {
@@ -119,9 +119,7 @@ final class JMSMessageUtils {
protHeaders.put(JMSConstants.TARGET_SERVICE_IN_REQUESTURI,
Collections.singletonList("true"));
}
- if (requestURI != null) {
- inMessage.put(org.apache.cxf.message.Message.REQUEST_URI,
requestURI);
- }
+ inMessage.put(org.apache.cxf.message.Message.REQUEST_URI,
requestURI);
} catch (Exception e) {
protHeaders.put(JMSConstants.MALFORMED_REQUESTURI,
Collections.singletonList("true"));
}
@@ -215,10 +213,10 @@ final class JMSMessageUtils {
// Retrieve or create protocol headers
Map<String, List<String>> headers = CastUtils.cast((Map<?,
?>)outMessage
.get(org.apache.cxf.message.Message.PROTOCOL_HEADERS));
-
+
boolean isSoapMessage =
!PropertyUtils.isTrue(outMessage.getExchange().get(org.apache.cxf.message.Message.REST_MESSAGE));
-
+
if (isSoapMessage) {
if (!messageHeaders.isSetSOAPJMSTargetService()) {
messageHeaders.setSOAPJMSTargetService(jmsConfig.getTargetService());
diff --git
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java
index a382fc8..2993804 100644
---
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java
+++
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java
@@ -21,6 +21,7 @@ package org.apache.cxf.transport.jms;
import java.io.IOException;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -40,10 +41,10 @@ public class JMSTransportFactory extends
AbstractTransportFactory implements Con
DestinationFactory {
public static final List<String> DEFAULT_NAMESPACES
- = Arrays.asList(
+ = Collections.unmodifiableList(Arrays.asList(
"http://cxf.apache.org/transports/jms";,
"http://cxf.apache.org/transports/jms/configuration";
- );
+ ));
private static final Set<String> URI_PREFIXES = new HashSet<>();
static {
diff --git
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
index dd004b8..1bf0f66 100644
---
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
+++
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
@@ -497,17 +497,17 @@ public class JMSEndpoint {
this.retryInterval = retryInterval;
}
public void setRetryInterval(String retryInterval) {
- this.retryInterval = Integer.valueOf(retryInterval);
+ this.retryInterval = Integer.parseInt(retryInterval);
}
-
+
public boolean isOneSessionPerConnection() {
return oneSessionPerConnection;
}
-
+
public void setOneSessionPerConnection(String oneSessionPerConnection) {
- this.oneSessionPerConnection =
Boolean.valueOf(oneSessionPerConnection);
+ this.oneSessionPerConnection =
Boolean.parseBoolean(oneSessionPerConnection);
}
-
+
public void setOneSessionPerConnection(boolean oneSessionPerConnection) {
this.oneSessionPerConnection = oneSessionPerConnection;
}
diff --git
a/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java
b/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java
index d62d95e..44e5e6b 100644
---
a/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java
+++
b/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java
@@ -21,6 +21,7 @@ package org.apache.cxf.transport.local;
import java.io.IOException;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -52,7 +53,7 @@ public class LocalTransportFactory extends
AbstractTransportFactory
public static final String TRANSPORT_ID =
"http://cxf.apache.org/transports/local";;
public static final List<String> DEFAULT_NAMESPACES
- = Arrays.asList(TRANSPORT_ID);
+ = Collections.unmodifiableList(Arrays.asList(TRANSPORT_ID));
public static final String MESSAGE_FILTER_PROPERTIES
diff --git
a/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPTransportFactory.java
b/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPTransportFactory.java
index 475fb52..5703105 100644
---
a/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPTransportFactory.java
+++
b/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPTransportFactory.java
@@ -21,6 +21,7 @@ package org.apache.cxf.transport.udp;
import java.io.IOException;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -45,7 +46,7 @@ public class UDPTransportFactory extends
AbstractTransportFactory
public static final String TRANSPORT_ID =
"http://cxf.apache.org/transports/udp";;
public static final List<String> DEFAULT_NAMESPACES
- = Arrays.asList(TRANSPORT_ID);
+ = Collections.unmodifiableList(Arrays.asList(TRANSPORT_ID));
private static final Logger LOG =
LogUtils.getL7dLogger(UDPTransportFactory.class);
private static final Set<String> URI_PREFIXES = new HashSet<>();
diff --git
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketTransportFactory.java
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketTransportFactory.java
index 172674f..f9160c1 100644
---
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketTransportFactory.java
+++
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketTransportFactory.java
@@ -21,6 +21,7 @@ package org.apache.cxf.transport.websocket;
import java.io.IOException;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -48,10 +49,10 @@ public class WebSocketTransportFactory extends
AbstractTransportFactory implemen
DestinationFactory {
public static final List<String> DEFAULT_NAMESPACES
- = Arrays.asList(
+ = Collections.unmodifiableList(Arrays.asList(
"http://cxf.apache.org/transports/websocket";,
"http://cxf.apache.org/transports/websocket/configuration";
- );
+ ));
private static final Set<String> URI_PREFIXES = new HashSet<>();
static {
diff --git
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenServiceImpl.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenServiceImpl.java
index 382b0b0..8101180 100644
---
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenServiceImpl.java
+++
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenServiceImpl.java
@@ -23,6 +23,7 @@ import java.io.StringWriter;
import java.nio.charset.StandardCharsets;
import java.security.Principal;
import java.security.cert.X509Certificate;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -75,22 +76,24 @@ public class RESTSecurityTokenServiceImpl extends
SecurityTokenServiceImpl imple
private static final Logger LOG =
LogUtils.getL7dLogger(RESTSecurityTokenServiceImpl.class);
static {
- DEFAULT_CLAIM_TYPE_MAP = new HashMap<>();
- DEFAULT_CLAIM_TYPE_MAP.put("emailaddress", CLAIM_TYPE_NS +
"/claims/emailaddress");
- DEFAULT_CLAIM_TYPE_MAP.put("role", CLAIM_TYPE_NS + "/claims/role");
- DEFAULT_CLAIM_TYPE_MAP.put("roles", CLAIM_TYPE_NS + "/claims/role");
- DEFAULT_CLAIM_TYPE_MAP.put("surname", CLAIM_TYPE_NS +
"/claims/surname");
- DEFAULT_CLAIM_TYPE_MAP.put("givenname", CLAIM_TYPE_NS +
"/claims/givenname");
- DEFAULT_CLAIM_TYPE_MAP.put("name", CLAIM_TYPE_NS + "/claims/name");
- DEFAULT_CLAIM_TYPE_MAP.put("upn", CLAIM_TYPE_NS + "/claims/upn");
- DEFAULT_CLAIM_TYPE_MAP.put("nameidentifier", CLAIM_TYPE_NS +
"/claims/nameidentifier");
-
- DEFAULT_TOKEN_TYPE_MAP = new HashMap<>();
- DEFAULT_TOKEN_TYPE_MAP.put("saml",
WSS4JConstants.WSS_SAML2_TOKEN_TYPE);
- DEFAULT_TOKEN_TYPE_MAP.put("saml2.0",
WSS4JConstants.WSS_SAML2_TOKEN_TYPE);
- DEFAULT_TOKEN_TYPE_MAP.put("saml1.1",
WSS4JConstants.WSS_SAML_TOKEN_TYPE);
- DEFAULT_TOKEN_TYPE_MAP.put("jwt", JWTTokenProvider.JWT_TOKEN_TYPE);
- DEFAULT_TOKEN_TYPE_MAP.put("sct", STSUtils.TOKEN_TYPE_SCT_05_12);
+ Map<String, String> tmpClaimTypeMap = new HashMap<>();
+ tmpClaimTypeMap.put("emailaddress", CLAIM_TYPE_NS +
"/claims/emailaddress");
+ tmpClaimTypeMap.put("role", CLAIM_TYPE_NS + "/claims/role");
+ tmpClaimTypeMap.put("roles", CLAIM_TYPE_NS + "/claims/role");
+ tmpClaimTypeMap.put("surname", CLAIM_TYPE_NS + "/claims/surname");
+ tmpClaimTypeMap.put("givenname", CLAIM_TYPE_NS + "/claims/givenname");
+ tmpClaimTypeMap.put("name", CLAIM_TYPE_NS + "/claims/name");
+ tmpClaimTypeMap.put("upn", CLAIM_TYPE_NS + "/claims/upn");
+ tmpClaimTypeMap.put("nameidentifier", CLAIM_TYPE_NS +
"/claims/nameidentifier");
+ DEFAULT_CLAIM_TYPE_MAP = Collections.unmodifiableMap(tmpClaimTypeMap);
+
+ Map<String, String> tmpTokenTypeMap = new HashMap<>();
+ tmpTokenTypeMap.put("saml", WSS4JConstants.WSS_SAML2_TOKEN_TYPE);
+ tmpTokenTypeMap.put("saml2.0", WSS4JConstants.WSS_SAML2_TOKEN_TYPE);
+ tmpTokenTypeMap.put("saml1.1", WSS4JConstants.WSS_SAML_TOKEN_TYPE);
+ tmpTokenTypeMap.put("jwt", JWTTokenProvider.JWT_TOKEN_TYPE);
+ tmpTokenTypeMap.put("sct", STSUtils.TOKEN_TYPE_SCT_05_12);
+ DEFAULT_TOKEN_TYPE_MAP = Collections.unmodifiableMap(tmpTokenTypeMap);
DEFAULT_KEY_TYPE_MAP.put("SymmetricKey",
STSConstants.SYMMETRIC_KEY_KEYTYPE);
DEFAULT_KEY_TYPE_MAP.put("PublicKey", STSConstants.PUBLIC_KEY_KEYTYPE);
diff --git
a/testutils/src/main/java/org/apache/cxf/mtom_xop/TestMtomProviderImpl.java
b/testutils/src/main/java/org/apache/cxf/mtom_xop/TestMtomProviderImpl.java
index de1f442..45af66d 100644
--- a/testutils/src/main/java/org/apache/cxf/mtom_xop/TestMtomProviderImpl.java
+++ b/testutils/src/main/java/org/apache/cxf/mtom_xop/TestMtomProviderImpl.java
@@ -37,9 +37,9 @@ import javax.xml.ws.WebServiceProvider;
import javax.xml.ws.soap.MTOM;
-@WebServiceProvider(portName = "TestMtomProviderPort",
-serviceName = "TestMtomService",
-targetNamespace = "http://cxf.apache.org/mime";,
+@WebServiceProvider(portName = "TestMtomProviderPort",
+serviceName = "TestMtomService",
+targetNamespace = "http://cxf.apache.org/mime";,
wsdlLocation = "testutils/mtom_xop.wsdl")
@ServiceMode(value = Mode.MESSAGE)
@MTOM
@@ -56,7 +56,7 @@ public class TestMtomProviderImpl implements
Provider<SOAPMessage> {
SOAPEnvelope envelope = part.getEnvelope();
SOAPBody body = envelope.getBody();
-
+
SOAPBodyElement testResponse = body
.addBodyElement(envelope.createName("testXopResponse", null,
"http://cxf.apache.org/mime/types";));
SOAPElement name = testResponse.addChildElement("name", null,
"http://cxf.apache.org/mime/types";);
@@ -66,10 +66,11 @@ public class TestMtomProviderImpl implements
Provider<SOAPMessage> {
SOAPElement include = attachinfo.addChildElement("Include", "xop",
"http://www.w3.org/2004/08/xop/include";);
- InputStream pre =
this.getClass().getResourceAsStream("/wsdl/mtom_xop.wsdl");
int fileSize = 0;
- for (int i = pre.read(); i != -1; i = pre.read()) {
- fileSize++;
+ try (InputStream pre =
this.getClass().getResourceAsStream("/wsdl/mtom_xop.wsdl")) {
+ for (int i = pre.read(); i != -1; i = pre.read()) {
+ fileSize++;
+ }
}
int count = 50;
@@ -79,8 +80,8 @@ public class TestMtomProviderImpl implements
Provider<SOAPMessage> {
fileSize * x,
fileSize);
}
-
-
+
+
DataHandler dh = new DataHandler(new ByteArrayDataSource(data,
"application/octet-stream"));
// create the image attachment
diff --git
a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/StringVisitor.java
b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/StringVisitor.java
index 30bebac..06afbfa 100644
---
a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/StringVisitor.java
+++
b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/StringVisitor.java
@@ -174,7 +174,7 @@ public class StringVisitor extends VisitorBase {
// corba:anonstring
Anonstring anonstring = new Anonstring();
anonstring.setQName(new QName(typeMap.getTargetNamespace(),
anonstringName));
- anonstring.setBound(Long.valueOf(boundNode.toString()));
+ anonstring.setBound(Long.parseLong(boundNode.toString()));
anonstring.setType(simpleType.getQName());
anon = anonstring;
--
To stop receiving notification emails like this one, please contact
[email protected].
