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 19f212a Move remaining string literals to the left hand side
19f212a is described below
commit 19f212a3f770250bcaae87bb52c19e6f5d02fa7a
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Thu Nov 8 17:08:19 2018 +0000
Move remaining string literals to the left hand side
---
.../cxf/performance/basic_type/client/Client.java | 2 +-
.../performance/complex_type/client/Client.java | 6 ++--
.../apache/cxf/bus/spring/SpringBeanLocator.java | 2 +-
.../jaxb/EscapeHandlerInvocationHandler.java | 2 +-
.../java/org/apache/cxf/common/jaxb/JAXBUtils.java | 4 +--
.../cxf/databinding/AbstractDataBinding.java | 4 +--
.../databinding/source/XMLStreamDataWriter.java | 4 +--
.../java/org/apache/cxf/endpoint/ClientImpl.java | 4 +--
.../main/java/org/apache/cxf/helpers/DOMUtils.java | 4 +--
.../AbstractOutDatabindingInterceptor.java | 4 +--
.../java/org/apache/cxf/message/MessageUtils.java | 2 +-
.../apache/cxf/service/model/ServiceModelUtil.java | 2 +-
.../cxf/ws/addressing/EndpointReferenceUtils.java | 2 +-
.../cxf/bus/spring/BusDefinitionParserTest.java | 4 +--
.../main/java/demo/jaxrs/server/simple/Server.java | 2 +-
.../demo/wseventing/CreateSubscriptionServlet.java | 2 +-
.../jca/core/classloader/FireWallClassLoader.java | 2 +-
.../cxf/maven_plugin/javatowadl/DumpJavaDoc.java | 4 +--
.../maven_plugin/javatowadl/ParseJavaDocMojo.java | 2 +-
.../interceptors/CorbaStreamInInterceptor.java | 6 ++--
.../CorbaStreamOutEndingInterceptor.java | 10 +++---
.../corba/types/CorbaObjectReferenceListener.java | 2 +-
.../apache/cxf/binding/corba/utils/CorbaUtils.java | 2 +-
.../soap/interceptor/Soap11FaultInInterceptor.java | 8 ++---
.../soap/jms/interceptor/SoapJMSInInterceptor.java | 4 +--
.../binding/soap/ReadHeaderInterceptorTest.java | 4 +--
.../cxf/aegis/type/encoded/ArrayTypeInfo.java | 4 +--
.../cxf/aegis/type/encoded/SoapArrayType.java | 6 ++--
.../cxf/aegis/xml/AbstractMessageReader.java | 2 +-
.../apache/cxf/aegis/type/array/FlatArrayTest.java | 2 +-
.../org/apache/cxf/aegis/xml/stax/ReaderTest.java | 2 +-
.../apache/cxf/aegis/xmlconfig/NillableTest.java | 4 +--
.../org/apache/cxf/jaxb/JAXBEncoderDecoder.java | 10 +++---
.../test/java/org/apache/cxf/jaxb/UtilsTest.java | 2 +-
.../ext/logging/OldLoggingFactoryBeanListener.java | 2 +-
.../ext/logging/event/DefaultLogEventMapper.java | 2 +-
.../cxf/jaxrs/provider/MultipartProvider.java | 2 +-
.../java/org/apache/cxf/jaxrs/utils/HttpUtils.java | 2 +-
.../org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 4 +--
.../handler/AnnotationHandlerChainBuilder.java | 6 ++--
.../interceptors/WrapperClassInInterceptor.java | 4 +--
.../support/WebServiceProviderConfiguration.java | 2 +-
.../handler/soap/SOAPHandlerInterceptorTest.java | 4 +--
.../apache/cxf/javascript/JsXMLHttpRequest.java | 2 +-
.../apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 2 +-
.../AbstractJwsMultipartVerificationFilter.java | 2 +-
.../multipart/JwsMultipartClientRequestFilter.java | 2 +-
.../JwsMultipartContainerResponseFilter.java | 2 +-
.../provider/AbstractOAuthDataProviderTest.java | 4 +--
.../http/asyncclient/AsyncHTTPConduit.java | 2 +-
.../http/netty/client/NettyHttpConduit.java | 4 +--
.../org/apache/cxf/transport/http/Address.java | 2 +-
.../org/apache/cxf/transport/http/HTTPConduit.java | 2 +-
.../cxf/transport/http/auth/HttpAuthHeader.java | 6 ++--
.../cxf/transport/servlet/AbstractHTTPServlet.java | 2 +-
.../apache/cxf/transport/udp/UDPTransportTest.java | 2 +-
.../eventing/shared/utils/DurationAndDateUtil.java | 2 +-
.../assertions/WSAActionAssertingHandler.java | 2 +-
.../org/apache/cxf/ws/mex/MEXServerListener.java | 2 +-
.../cxf/ws/security/trust/AbstractSTSClient.java | 2 +-
.../org/apache/cxf/ws/security/trust/STSUtils.java | 2 +-
.../security/wss4j/AbstractTokenInterceptor.java | 2 +-
.../policyhandlers/AbstractBindingBuilder.java | 2 +-
.../cxf/ws/security/cache/EHCacheUtilsTest.java | 4 +--
.../factory/DefaultServiceConfiguration.java | 2 +-
.../java/org/apache/cxf/wsdl11/SchemaUtil.java | 2 +-
.../apache/cxf/wsdl11/ServiceWSDLBuilderTest.java | 2 +-
.../token/renewer/SAMLTokenRenewerRealmTest.java | 4 +--
.../validator/JWTTokenValidatorRealmTest.java | 4 +--
.../sts/token/validator/JWTTokenValidatorTest.java | 2 +-
.../SAMLTokenValidatorCachedRealmTest.java | 4 +--
.../validator/SAMLTokenValidatorRealmTest.java | 4 +--
.../token/validator/SAMLTokenValidatorTest.java | 4 +--
.../cxf/sts/token/validator/SCTValidatorTest.java | 2 +-
.../cxf/systest/sts/batch/SAMLBatchUnitTest.java | 4 +--
.../systest/sts/batch/SimpleBatchSTSClient.java | 2 +-
.../discovery/internal/WSDiscoveryServiceImpl.java | 4 +--
.../cxf/ws/discovery/WSDiscoveryClientTest.java | 2 +-
.../apache/cxf/systest/grizzly/EndpointBean.java | 4 +--
.../org/apache/cxf/systest/jaxrs/BookServer20.java | 8 ++---
.../org/apache/cxf/systest/jaxrs/BookStore.java | 4 +--
.../cxf/systest/jaxrs/ContentTypeModifyingMBW.java | 2 +-
.../apache/cxf/systest/jaxrs/MultipartStore.java | 4 +--
.../cxf/systest/handlers/TestHandlerBase.java | 8 ++---
.../provider/HWDOMSourcePayloadProvider.java | 2 +-
.../cxf/systest/swa/SwANoMimeServiceImpl.java | 8 ++---
.../org/apache/cxf/systest/swa/SwAServiceImpl.java | 8 ++---
.../apache/cxf/systest/jms/swa/SwAServiceImpl.java | 8 ++---
.../systest/http_jetty/EngineLifecycleTest.java | 2 +-
.../schema_validation/SchemaValidationImpl.java | 6 ++--
.../systest/type_substitution/CarDealerImpl.java | 4 +--
.../systest/ws/security/SecurityPolicyTest.java | 2 +-
.../corba/processors/idl/PortTypeVisitor.java | 2 +-
.../corba/processors/idl/WSDLSchemaManager.java | 2 +-
.../tools/corba/processors/wsdl/WSDLParameter.java | 8 ++---
.../corba/processors/wsdl/WSDLToCorbaHelper.java | 12 +++----
.../corba/processors/wsdl/WSDLToIDLAction.java | 4 +--
.../corba/processors/WSDLToCorbaBindingTest.java | 40 +++++++++++-----------
.../tools/corba/utils/WSDLGenerationTester.java | 8 ++---
.../internal/jaxws/JAXWSFrontEndProcessor.java | 2 +-
.../jaxws/customization/CustomizationParser.java | 10 +++---
.../misc/processor/WSDLToServiceProcessorTest.java | 4 +--
.../misc/processor/WSDLToXMLProcessorTest.java | 2 +-
.../cxf/tools/wsdlto/jaxws/CodeGenBugTest.java | 2 +-
.../cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java | 4 +--
105 files changed, 209 insertions(+), 209 deletions(-)
diff --git
a/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/client/Client.java
b/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/client/Client.java
index c75558e..9c6621d 100644
---
a/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/client/Client.java
+++
b/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/client/Client.java
@@ -78,7 +78,7 @@ public final class Client extends TestCaseBase<BasicPortType>
{
public static void main(String[] args) throws Exception {
Client client = new Client(args);
client.initialize();
- if (client.getOperationName().equals("echoString")) {
+ if ("echoString".equals(client.getOperationName())) {
opid = 0;
} else {
opid = 1;
diff --git
a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java
b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java
index ba5cecc..184ecf2 100644
---
a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java
+++
b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java
@@ -85,11 +85,11 @@ public final class Client extends TestCaseBase<DocPortType>
{
public void processArgs() {
super.processArgs();
- if (getOperationName().equals("echoStringDoc")) {
+ if ("echoStringDoc".equals(getOperationName())) {
opid = 0;
- } else if (getOperationName().equals("echoBase64Doc")) {
+ } else if ("echoBase64Doc".equals(getOperationName())) {
opid = 1;
- } else if (getOperationName().equals("echoComplexTypeDoc")) {
+ } else if ("echoComplexTypeDoc".equals(getOperationName())) {
opid = 2;
} else {
System.out.println("Invalid operation: " + getOperationName());
diff --git
a/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
b/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
index 5843216..ab8dad8 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
@@ -184,7 +184,7 @@ public class SpringBeanLocator implements
ConfiguredBeanLocator {
}
private Class<?> findContextClass(Class<?> cls) {
for (Class<?> c : cls.getInterfaces()) {
- if (c.getName().equals("org.osgi.framework.BundleContext")) {
+ if ("org.osgi.framework.BundleContext".equals(c.getName())) {
return c;
}
}
diff --git
a/core/src/main/java/org/apache/cxf/common/jaxb/EscapeHandlerInvocationHandler.java
b/core/src/main/java/org/apache/cxf/common/jaxb/EscapeHandlerInvocationHandler.java
index 64f1385..664009e 100644
---
a/core/src/main/java/org/apache/cxf/common/jaxb/EscapeHandlerInvocationHandler.java
+++
b/core/src/main/java/org/apache/cxf/common/jaxb/EscapeHandlerInvocationHandler.java
@@ -31,7 +31,7 @@ public final class EscapeHandlerInvocationHandler implements
InvocationHandler {
@Override
public Object invoke(Object proxy, Method method, Object[] args) throws
Throwable {
Object result = null;
- if (method.getName().equals("escape") && args.length == 5) {
+ if ("escape".equals(method.getName()) && args.length == 5) {
if ((Integer)args[1] == 0 && (Integer)args[2] == 0) {
Writer writer = (Writer)args[4];
writer.write("");
diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
index f240bce..25d654b 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
@@ -587,7 +587,7 @@ public final class JAXBUtils {
return cls;
}
if (cls != null) {
- if
(cls.getName().equals("javax.xml.ws.wsaddressing.W3CEndpointReference")) {
+ if
("javax.xml.ws.wsaddressing.W3CEndpointReference".equals(cls.getName())) {
return cls;
}
Constructor<?> cons = ReflectionUtil.getDeclaredConstructor(cls);
@@ -676,7 +676,7 @@ public final class JAXBUtils {
Object ctx = null;
for (Method m : cls.getDeclaredMethods()) {
- if (m.getName().equals("newInstance")
+ if ("newInstance".equals(m.getName())
&& m.getParameterTypes().length == 6) {
ctx = m.invoke(null, clses.toArray(new Class<?>[0]),
typeRefs, null, null, true, null);
diff --git
a/core/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
b/core/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
index 34517a3..0c8dac1 100644
--- a/core/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
+++ b/core/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
@@ -153,7 +153,7 @@ public abstract class AbstractDataBinding implements
DataBinding {
while (n != null) {
if (n instanceof Element) {
Element e = (Element)n;
- if (e.getLocalName().equals("import")) {
+ if ("import".equals(e.getLocalName())) {
patchRequired = true;
break;
}
@@ -169,7 +169,7 @@ public abstract class AbstractDataBinding implements
DataBinding {
while (n != null) {
if (n instanceof Element) {
Element e = (Element)n;
- if (e.getLocalName().equals("import")) {
+ if ("import".equals(e.getLocalName())) {
e = (Element)n;
String loc = e.getAttribute("schemaLocation");
if (ids == null || ids.contains(loc)) {
diff --git
a/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java
b/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java
index 1e3015e..8735e17 100644
---
a/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java
+++
b/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java
@@ -247,8 +247,8 @@ public class XMLStreamDataWriter implements
DataWriter<XMLStreamWriter> {
NodeList subNodeList = nNode.getChildNodes();
for (int j = 0; j < subNodeList.getLength(); j++) {
Node subNode = subNodeList.item(j);
- if
(subNode.getNamespaceURI().equals("http://www.w3.org/2004/08/xop/include";)
- && subNode.getLocalName().equals("Include")) {
+ if
("http://www.w3.org/2004/08/xop/include".equals(subNode.getNamespaceURI())
+ && "Include".equals(subNode.getLocalName())) {
// This is the Mtom element which break the
SchemaValidation so ignore this
return true;
}
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
b/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
index d3ceb22..dff6ef4 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
@@ -569,13 +569,13 @@ public class ClientImpl
//Server Fault
if (faultCode.getNamespaceURI().equals(
soap11NS)
- && faultCode.getLocalPart().equals("Client")) {
+ && "Client".equals(faultCode.getLocalPart())) {
faultCode = new QName(soap11NS, "Server");
fault.setFaultCode(faultCode);
}
if (faultCode.getNamespaceURI().equals(
soap12NS)
- && faultCode.getLocalPart().equals("Sender")) {
+ && "Sender".equals(faultCode.getLocalPart())) {
faultCode = new QName(soap12NS, "Receiver");
fault.setFaultCode(faultCode);
}
diff --git a/core/src/main/java/org/apache/cxf/helpers/DOMUtils.java
b/core/src/main/java/org/apache/cxf/helpers/DOMUtils.java
index be01909..3780514 100644
--- a/core/src/main/java/org/apache/cxf/helpers/DOMUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/DOMUtils.java
@@ -73,7 +73,7 @@ public final class DOMUtils {
Method[] methods = DOMUtils.class.getClassLoader().
loadClass("com.sun.xml.messaging.saaj.soap.SOAPDocumentImpl").getMethods();
for (Method method : methods) {
- if (method.getName().equals("register")) {
+ if ("register".equals(method.getName())) {
//this is the 1.4+ SAAJ impl
setJava9SAAJ(true);
break;
@@ -87,7 +87,7 @@ public final class DOMUtils {
Method[] methods = DOMUtils.class.getClassLoader().
loadClass("com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl").getMethods();
for (Method method : methods) {
- if (method.getName().equals("register")) {
+ if ("register".equals(method.getName())) {
//this is the SAAJ impl in JDK9
setJava9SAAJ(true);
break;
diff --git
a/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java
b/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java
index c17cb36..c3c70a5 100644
---
a/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java
+++
b/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java
@@ -176,8 +176,8 @@ public abstract class AbstractOutDatabindingInterceptor
extends AbstractPhaseInt
}
String enc = (String)m.get(Message.ENCODING);
- return
info.getClass().getName().equals("org.apache.cxf.binding.soap.model.SoapBindingInfo")
- &&
s.getDataBinding().getClass().getName().equals("org.apache.cxf.jaxb.JAXBDataBinding")
+ return
"org.apache.cxf.binding.soap.model.SoapBindingInfo".equals(info.getClass().getName())
+ &&
"org.apache.cxf.jaxb.JAXBDataBinding".equals(s.getDataBinding().getClass().getName())
&& !MessageUtils.isDOMPresent(m)
&& (enc == null || StandardCharsets.UTF_8.name().equals(enc));
}
diff --git a/core/src/main/java/org/apache/cxf/message/MessageUtils.java
b/core/src/main/java/org/apache/cxf/message/MessageUtils.java
index 5ed7787..b684e71 100644
--- a/core/src/main/java/org/apache/cxf/message/MessageUtils.java
+++ b/core/src/main/java/org/apache/cxf/message/MessageUtils.java
@@ -182,7 +182,7 @@ public final class MessageUtils {
return m != null && m.getContent(Node.class) != null;
/*
for (Class c : m.getContentFormats()) {
- if (c.equals(Node.class) ||
c.getName().equals("javax.xml.soap.SOAPMessage")) {
+ if (c.equals(Node.class) ||
"javax.xml.soap.SOAPMessage".equals(c.getName())) {
return true;
}
}
diff --git
a/core/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java
b/core/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java
index b14102f..e0643a9 100644
--- a/core/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java
+++ b/core/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java
@@ -175,7 +175,7 @@ public final class ServiceModelUtil {
if (best == null) {
best = ep;
}
- if
(ep.getTransportId().equals("http://schemas.xmlsoap.org/wsdl/soap/";)) {
+ if
("http://schemas.xmlsoap.org/wsdl/soap/".equals(ep.getTransportId())) {
return ep;
}
}
diff --git
a/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java
b/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java
index a1dfb97..3ced551 100644
---
a/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java
+++
b/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java
@@ -318,7 +318,7 @@ public final class EndpointReferenceUtils {
if ((node.getNamespaceURI().equals(JAXWSAConstants.NS_WSAW)
|| node.getNamespaceURI().equals(NS_WSAW_2005)
|| node.getNamespaceURI().equals(JAXWSAConstants.NS_WSAM))
- && node.getLocalName().equals("ServiceName")) {
+ && "ServiceName".equals(node.getLocalName())) {
String content = node.getTextContent();
String namespaceURI =
node.getFirstChild().getNamespaceURI();
String service = content;
diff --git
a/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
b/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
index 5b33b54..102dbfd 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
@@ -49,7 +49,7 @@ public class BusDefinitionParserTest extends Assert {
List<Interceptor<? extends Message>> in = bus.getInInterceptors();
boolean found = false;
for (Interceptor<? extends Message> i : in) {
- if (i.getClass().getSimpleName().equals("LoggingInInterceptor")) {
+ if ("LoggingInInterceptor".equals(i.getClass().getSimpleName())) {
found = true;
}
}
@@ -133,7 +133,7 @@ public class BusDefinitionParserTest extends Assert {
List<Interceptor<? extends Message>> in = bus.getInInterceptors();
boolean found = false;
for (Interceptor<? extends Message> i : in) {
- if (i.getClass().getSimpleName().equals("LoggingInInterceptor")) {
+ if ("LoggingInInterceptor".equals(i.getClass().getSimpleName())) {
found = true;
}
}
diff --git
a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/Server.java
b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/Server.java
index b6a79d7..e8d8519 100644
---
a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/Server.java
+++
b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/Server.java
@@ -29,7 +29,7 @@ public class Server {
JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
sf.setResourceClasses(StreamingService.class);
- String receiverType = args.length == 1 &&
args[0].equals("-receiverType=queue")
+ String receiverType = args.length == 1 &&
"-receiverType=queue".equals(args[0])
? "queue" : "string";
sf.setResourceProvider(StreamingService.class,
new SingletonResourceProvider(new StreamingService(receiverType)));
diff --git
a/distribution/src/main/release/samples/ws_eventing/src/main/java/demo/wseventing/CreateSubscriptionServlet.java
b/distribution/src/main/release/samples/ws_eventing/src/main/java/demo/wseventing/CreateSubscriptionServlet.java
index 7744b25..6153a89 100644
---
a/distribution/src/main/release/samples/ws_eventing/src/main/java/demo/wseventing/CreateSubscriptionServlet.java
+++
b/distribution/src/main/release/samples/ws_eventing/src/main/java/demo/wseventing/CreateSubscriptionServlet.java
@@ -62,7 +62,7 @@ public class CreateSubscriptionServlet extends HttpServlet {
if (req.getParameter("expires-set") == null) {
expires = req.getParameter("expires");
} else {
- if (!req.getParameter("expires-set").equals("false")) {
+ if (!"false".equals(req.getParameter("expires-set"))) {
expires = req.getParameter("expires");
}
}
diff --git
a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/FireWallClassLoader.java
b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/FireWallClassLoader.java
index 4e8ea43..ea6d6e2 100644
---
a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/FireWallClassLoader.java
+++
b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/FireWallClassLoader.java
@@ -132,7 +132,7 @@ public class FireWallClassLoader extends SecureClassLoader {
javaCovered = true;
} else {
for (int i = 0; i < this.filters.length; i++) {
- if (this.filters[i].equals("java.")) {
+ if ("java.".equals(this.filters[i])) {
javaCovered = true;
}
}
diff --git
a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/DumpJavaDoc.java
b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/DumpJavaDoc.java
index 318b7d4..072cc23 100644
---
a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/DumpJavaDoc.java
+++
b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/DumpJavaDoc.java
@@ -74,7 +74,7 @@ public final class DumpJavaDoc {
String tagName = null;
for (int i = 0; i < options.length; i++) {
String[] opt = options[i];
- if (opt[0].equals("-dumpJavaDocFile")) {
+ if ("-dumpJavaDocFile".equals(opt[0])) {
tagName = opt[1];
}
}
@@ -92,7 +92,7 @@ public final class DumpJavaDoc {
boolean foundTagOption = false;
for (int i = 0; i < options.length; i++) {
String[] opt = options[i];
- if (opt[0].equals("-dumpJavaDocFile")) {
+ if ("-dumpJavaDocFile".equals(opt[0])) {
if (foundTagOption) {
reporter.printError("Only one -dumpJavaDocFile option
allowed.");
return false;
diff --git
a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
index 26435f2..4b15dc5 100644
---
a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
+++
b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
@@ -152,7 +152,7 @@ public class ParseJavaDocMojo extends AbstractMojo {
for (Object o : this.mavenProject.getPluginArtifacts()) {
if (o instanceof Artifact) {
Artifact artifact = (Artifact)o;
- if
(artifact.getArtifactId().equals("cxf-java2wadl-plugin")) {
+ if
("cxf-java2wadl-plugin".equals(artifact.getArtifactId())) {
docletArtifact.setGroupId(artifact.getGroupId());
docletArtifact.setArtifactId(artifact.getArtifactId());
docletArtifact.setVersion(artifact.getVersion());
diff --git
a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java
b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java
index a9b7818..a237bcf 100644
---
a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java
+++
b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java
@@ -279,7 +279,7 @@ public class CorbaStreamInInterceptor extends
AbstractPhaseInterceptor<Message>
QName paramIdlType = param.getIdltype();
QName paramName;
ModeType paramMode = param.getMode();
- if (paramMode.value().equals("in")) {
+ if ("in".equals(paramMode.value())) {
if (wrap) {
paramName = new QName(inWrapNSUri, param.getName());
} else {
@@ -299,10 +299,10 @@ public class CorbaStreamInInterceptor extends
AbstractPhaseInterceptor<Message>
streamables[i] = corbaMsg.createStreamableObject(obj,
paramName);
Any value = CorbaAnyHelper.createAny(orb);
- if (paramMode.value().equals("in")) {
+ if ("in".equals(paramMode.value())) {
streamables[i].setMode(org.omg.CORBA.ARG_IN.value);
streamables[i].getObject().setIntoAny(value,
streamables[i], false);
- } else if (paramMode.value().equals("out")) {
+ } else if ("out".equals(paramMode.value())) {
streamables[i].setMode(org.omg.CORBA.ARG_OUT.value);
streamables[i].getObject().setIntoAny(value,
streamables[i], true);
} else {
diff --git
a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutEndingInterceptor.java
b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutEndingInterceptor.java
index 2493b70..c23eb0c 100644
---
a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutEndingInterceptor.java
+++
b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutEndingInterceptor.java
@@ -138,9 +138,9 @@ public class CorbaStreamOutEndingInterceptor extends
AbstractPhaseInterceptor<Me
}
CorbaStreamable streamable = message.createStreamableObject(obj,
paramName);
ModeType paramMode = param.getMode();
- if (paramMode.value().equals("in")) {
+ if ("in".equals(paramMode.value())) {
streamable.setMode(org.omg.CORBA.ARG_IN.value);
- } else if (paramMode.value().equals("inout")) {
+ } else if ("inout".equals(paramMode.value())) {
streamable.setMode(org.omg.CORBA.ARG_INOUT.value);
} // default mode is out
message.addStreamableArgument(streamable);
@@ -198,11 +198,11 @@ public class CorbaStreamOutEndingInterceptor extends
AbstractPhaseInterceptor<Me
}
CorbaStreamable streamable = message.createStreamableObject(obj,
paramName);
ModeType paramMode = param.getMode();
- if (paramMode.value().equals("in")) {
+ if ("in".equals(paramMode.value())) {
streamable.setMode(org.omg.CORBA.ARG_IN.value);
- } else if (paramMode.value().equals("inout")) {
+ } else if ("inout".equals(paramMode.value())) {
streamable.setMode(org.omg.CORBA.ARG_INOUT.value);
- } else if (paramMode.value().equals("out")) {
+ } else if ("out".equals(paramMode.value())) {
streamable.setMode(org.omg.CORBA.ARG_OUT.value);
}
message.addStreamableArgument(streamable);
diff --git
a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceListener.java
b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceListener.java
index 80bc92d..2ac2eac 100644
---
a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceListener.java
+++
b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceListener.java
@@ -39,7 +39,7 @@ public class CorbaObjectReferenceListener extends
AbstractCorbaTypeListener {
public void processCharacters(String text) {
//REVISIT, just checking the address for now.
- if ((currentElement != null) &&
(currentElement.getLocalPart().equals("Address"))) {
+ if (currentElement != null &&
"Address".equals(currentElement.getLocalPart())) {
org.omg.CORBA.Object ref = null;
if
(text.equals(CorbaObjectReferenceHelper.ADDRESSING_NAMESPACE_URI +
"/anonymous")) {
diff --git
a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java
b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java
index 9be0963..8bffb65 100644
---
a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java
+++
b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java
@@ -230,7 +230,7 @@ public final class CorbaUtils {
} else if (obj instanceof
org.apache.cxf.binding.corba.wsdl.Object) {
org.apache.cxf.binding.corba.wsdl.Object objType =
(org.apache.cxf.binding.corba.wsdl.Object)obj;
- if (objType.getName().equals("CORBA.Object")) {
+ if ("CORBA.Object".equals(objType.getName())) {
tc = orb.create_interface_tc(objType.getRepositoryID(),
"Object");
} else {
tc = orb.create_interface_tc(objType.getRepositoryID(),
diff --git
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultInInterceptor.java
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultInInterceptor.java
index 7b7cb7b..8f8d6b6 100644
---
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultInInterceptor.java
+++
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultInInterceptor.java
@@ -62,14 +62,14 @@ public class Soap11FaultInInterceptor extends
AbstractSoapInterceptor {
String lang = null;
try {
while (reader.nextTag() == XMLStreamConstants.START_ELEMENT) {
- if (reader.getLocalName().equals("faultcode")) {
+ if ("faultcode".equals(reader.getLocalName())) {
faultCode = StaxUtils.readQName(reader);
- } else if (reader.getLocalName().equals("faultstring")) {
+ } else if ("faultstring".equals(reader.getLocalName())) {
lang =
reader.getAttributeValue("http://www.w3.org/XML/1998/namespace";, "lang");
exMessage = reader.getElementText();
- } else if (reader.getLocalName().equals("faultactor")) {
+ } else if ("faultactor".equals(reader.getLocalName())) {
role = reader.getElementText();
- } else if (reader.getLocalName().equals("detail")) {
+ } else if ("detail".equals(reader.getLocalName())) {
//XMLStreamReader newReader = new
DepthXMLStreamReader(reader);
detail = StaxUtils.read(reader).getDocumentElement();
}
diff --git
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSInInterceptor.java
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSInInterceptor.java
index 8aca871..3b1aba4 100644
---
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSInInterceptor.java
+++
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSInInterceptor.java
@@ -151,12 +151,12 @@ public class SoapJMSInInterceptor extends
AbstractSoapInterceptor {
if (ru != null && !ru.isEmpty()) {
String requestURI = ru.get(0);
List<String> mr =
headers.get(SoapJMSConstants.MALFORMED_REQUESTURI);
- if (mr != null && !mr.isEmpty() && mr.get(0).equals("true")) {
+ if (mr != null && !mr.isEmpty() && "true".equals(mr.get(0))) {
jmsFault =
JMSFaultFactory.createMalformedRequestURIFault(requestURI);
}
List<String> trn =
headers.get(SoapJMSConstants.TARGET_SERVICE_IN_REQUESTURI);
- if (trn != null && !trn.isEmpty() && trn.get(0).equals("true")) {
+ if (trn != null && !trn.isEmpty() && "true".equals(trn.get(0))) {
jmsFault =
JMSFaultFactory.createTargetServiceNotAllowedInRequestURIFault();
}
} else {
diff --git
a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java
b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java
index e632b74..3264c57 100644
---
a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java
+++
b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java
@@ -184,7 +184,7 @@ public class ReadHeaderInterceptorTest extends TestBase {
assertEquals(2, headerChilds.size());
for (int i = 0; i < headerChilds.size(); i++) {
Element ele = headerChilds.get(i);
- if (ele.getLocalName().equals("reservation")) {
+ if ("reservation".equals(ele.getLocalName())) {
Element reservation = ele;
List<Element> reservationChilds = new ArrayList<>();
Element elem = DOMUtils.getFirstElement(reservation);
@@ -201,7 +201,7 @@ public class ReadHeaderInterceptorTest extends TestBase {
.getTextContent());
}
- if (ele.getLocalName().equals("passenger")) {
+ if ("passenger".equals(ele.getLocalName())) {
Element passenger = ele;
assertNotNull(passenger);
Element child = DOMUtils.getFirstElement(passenger);
diff --git
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfo.java
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfo.java
index d783185..dfbbef3 100644
---
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfo.java
+++
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfo.java
@@ -112,7 +112,7 @@ public class ArrayTypeInfo {
if (tokens.size() < 3) {
throw new DatabindingException("Invalid ArrayType value " +
arrayTypeValue);
}
- if (tokens.get(1).equals(":")) {
+ if (":".equals(tokens.get(1))) {
typeName =
new QName(namespaceContext.getNamespaceURI(tokens.get(0)),
tokens.get(2), tokens.get(0));
tokens = tokens.subList(3, tokens.size());
@@ -121,7 +121,7 @@ public class ArrayTypeInfo {
tokens = tokens.subList(1, tokens.size());
}
- if (!tokens.get(0).equals("[")) {
+ if (!"[".equals(tokens.get(0))) {
throw new DatabindingException("Invalid ArrayType value " +
arrayTypeValue);
}
diff --git
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapArrayType.java
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapArrayType.java
index d6bcdc1..4064c86 100644
---
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapArrayType.java
+++
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapArrayType.java
@@ -195,8 +195,8 @@ public class SoapArrayType extends AegisType {
List<String> tokens = CastUtils.cast(Collections.list(new
StringTokenizer(positionString,
"[],",
true)));
- if (tokens.size() == 2 + dimensions.size() + dimensions.size() - 1
&& tokens.get(0).equals("[")
- && tokens.get(tokens.size() - 1).equals("]")) {
+ if (tokens.size() == 2 + dimensions.size() + dimensions.size() - 1
&& "[".equals(tokens.get(0))
+ && "]".equals(tokens.get(tokens.size() - 1))) {
// strip off leading [ and trailing ]
tokens = tokens.subList(1, tokens.size() - 1);
@@ -208,7 +208,7 @@ public class SoapArrayType extends AegisType {
index[i] = Integer.parseInt(tokens.get(tokenId));
- if (tokenId + 1 < tokens.size() && !tokens.get(tokenId +
1).equals(",")) {
+ if (tokenId + 1 < tokens.size() &&
!",".equals(tokens.get(tokenId + 1))) {
throw new IllegalStateException(
"Expected a comma but got " +
tokens.get(tokenId + 1));
}
diff --git
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/AbstractMessageReader.java
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/AbstractMessageReader.java
index 27ebaed..287bb0b 100644
---
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/AbstractMessageReader.java
+++
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/AbstractMessageReader.java
@@ -48,7 +48,7 @@ public abstract class AbstractMessageReader implements
MessageReader {
boolean nil = false;
if (nilReader != null) {
String value = nilReader.getValue();
- if (value != null && (value.trim().equals("true") ||
value.trim().equals("1"))) {
+ if (value != null && ("true".equals(value.trim()) ||
"1".equals(value.trim()))) {
return true;
}
}
diff --git
a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/FlatArrayTest.java
b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/FlatArrayTest.java
index 6741662..12aea2b 100644
---
a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/FlatArrayTest.java
+++
b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/FlatArrayTest.java
@@ -66,7 +66,7 @@ public class FlatArrayTest extends AbstractAegisTest {
+ "/xsd:sequence/xsd:element" +
"[@name='array']", arrayWsdlDoc);
Element typeElement = (Element)typeList.item(0);
String nillableValue = typeElement.getAttribute("nillable");
- assertTrue(nillableValue == null || "".equals(nillableValue) ||
"false".equals("nillableValue"));
+ assertTrue(nillableValue == null || "".equals(nillableValue) ||
"false".equals(nillableValue));
String typeString = typeElement.getAttribute("type");
assertEquals("xsd:string", typeString); // no ArrayOf
diff --git
a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java
b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java
index 1bcc34f..5a31283 100644
---
a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java
+++
b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java
@@ -57,7 +57,7 @@ public class ReaderTest extends AbstractCXFTest {
}
public void testReading(MessageReader reader) {
- assertTrue(reader.getLocalName().equals("Envelope"));
+ assertTrue("Envelope".equals(reader.getLocalName()));
// make sure we can repeat this
assertTrue(reader.hasMoreElementReaders());
diff --git
a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/NillableTest.java
b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/NillableTest.java
index 9b079a5..1e3bc7f 100644
---
a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/NillableTest.java
+++
b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/NillableTest.java
@@ -52,7 +52,7 @@ public class NillableTest extends AbstractAegisTest {
+ "[@name='array']", arrayWsdlDoc);
Element typeElement = (Element)typeList.item(0);
String nillableValue = typeElement.getAttribute("nillable");
- assertTrue(nillableValue == null || "".equals(nillableValue) ||
"false".equals("nillableValue"));
+ assertTrue(nillableValue == null || "".equals(nillableValue) ||
"false".equals(nillableValue));
typeList = assertValid("/wsdl:definitions/wsdl:types"
+ "/xsd:schema[@targetNamespace='urn:nillable']"
@@ -60,7 +60,7 @@ public class NillableTest extends AbstractAegisTest {
+ "/xsd:sequence/xsd:element[@name='string']",
arrayWsdlDoc);
typeElement = (Element)typeList.item(0);
nillableValue = typeElement.getAttribute("nillable");
- assertTrue(nillableValue == null || "".equals(nillableValue) ||
"false".equals("nillableValue"));
+ assertTrue(nillableValue == null || "".equals(nillableValue) ||
"false".equals(nillableValue));
}
}
diff --git
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
index 7c2c11d..788abd5 100644
---
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
+++
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
@@ -244,7 +244,7 @@ public final class JAXBEncoderDecoder {
writeObject(marshaller, source, newJAXBElement(elName,
cls, mObj));
}
} else if (byte[].class == cls && part.getTypeQName() != null
- &&
part.getTypeQName().getLocalPart().equals("hexBinary")) {
+ &&
"hexBinary".equals(part.getTypeQName().getLocalPart())) {
mObj = new HexBinaryAdapter().marshal((byte[])mObj);
writeObject(marshaller, source, newJAXBElement(elName,
String.class, mObj));
} else if (mObj instanceof JAXBElement) {
@@ -731,7 +731,7 @@ public final class JAXBEncoderDecoder {
return o;
}
} else if (byte[].class == clazz && part != null &&
part.getTypeQName() != null
- && part.getTypeQName().getLocalPart().equals("hexBinary")) {
+ && "hexBinary".equals(part.getTypeQName().getLocalPart())) {
String obj = (String)unmarshall(u, source, elName, String.class,
unwrap);
return new HexBinaryAdapter().unmarshal(obj);
@@ -857,8 +857,8 @@ public final class JAXBEncoderDecoder {
}
if (clazz != null
- &&
(clazz.getName().equals("javax.xml.datatype.XMLGregorianCalendar")
- || clazz.getName().equals("javax.xml.datatype.Duration"))) {
+ &&
("javax.xml.datatype.XMLGregorianCalendar".equals(clazz.getName())
+ || "javax.xml.datatype.Duration".equals(clazz.getName()))) {
// special treat two jaxb defined built-in abstract types
unmarshalWithClass = true;
}
@@ -966,7 +966,7 @@ public final class JAXBEncoderDecoder {
NamedNodeMap namedNodeMap = element.getAttributes();
for (int i = 0; i < namedNodeMap.getLength(); i++) {
Attr attr = (Attr)namedNodeMap.item(i);
- if (attr.getPrefix() != null &&
attr.getPrefix().equals("xmlns")) {
+ if (attr.getPrefix() != null &&
"xmlns".equals(attr.getPrefix())) {
nsMap.put(attr.getLocalName(), attr.getValue());
}
}
diff --git
a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java
b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java
index 43aac3c..0965d7e 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java
@@ -30,7 +30,7 @@ public class UtilsTest extends Assert {
@Test
public void testGetMethod() {
for (Method method : Utils.getGetters(MyException.class,
XmlAccessType.PUBLIC_MEMBER)) {
- if (method.getName().equals("toString")) {
+ if ("toString".equals(method.getName())) {
fail("toString should not be included in get methods list");
}
}
diff --git
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/OldLoggingFactoryBeanListener.java
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/OldLoggingFactoryBeanListener.java
index 34c4ea1..f3d5db2 100644
---
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/OldLoggingFactoryBeanListener.java
+++
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/OldLoggingFactoryBeanListener.java
@@ -44,7 +44,7 @@ public class OldLoggingFactoryBeanListener implements
FactoryBeanListener {
public OldLoggingFactoryBeanListener(Bus b) {
FactoryBeanListenerManager m =
b.getExtension(FactoryBeanListenerManager.class);
for (FactoryBeanListener f : m.getListeners()) {
- if
(f.getClass().getSimpleName().equals("OldLoggingFactoryBeanListener")) {
+ if
("OldLoggingFactoryBeanListener".equals(f.getClass().getSimpleName())) {
m.removeListener(f);
}
}
diff --git
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
index 00ea2ec..bb53d9f 100644
---
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
+++
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
@@ -187,7 +187,7 @@ public class DefaultLogEventMapper {
*/
private boolean isSOAPMessage(Message message) {
Binding binding = message.getExchange().getBinding();
- return binding != null &&
binding.getClass().getSimpleName().equals("SoapBinding");
+ return binding != null &&
"SoapBinding".equals(binding.getClass().getSimpleName());
}
/**
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
index c2a8210..a4624c3 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
@@ -243,7 +243,7 @@ public class MultipartProvider extends
AbstractConfigurableProvider
}
private boolean mediaTypeSupported(MediaType mt) {
- return mt.getType().equals("multipart") &&
MULTIPART_SUBTYPES.contains(mt.getSubtype());
+ return "multipart".equals(mt.getType()) &&
MULTIPART_SUBTYPES.contains(mt.getSubtype());
}
public long getSize(Object t, Class<?> type, Type genericType,
Annotation[] annotations,
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
index 53a2143..be65378 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
@@ -644,7 +644,7 @@ public final class HttpUtils {
// No, then just keep climbing up until we find a common base.
URI relative = URI.create("");
- while (!(uriRel.getPath().startsWith(commonBase.getPath())) &&
!(commonBase.getPath().equals("/"))) {
+ while (!(uriRel.getPath().startsWith(commonBase.getPath())) &&
!"/".equals(commonBase.getPath())) {
commonBase = commonBase.resolve("../");
relative = relative.resolve("../");
}
diff --git
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
index 2c41ca1..fba0b39 100644
---
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
+++
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
@@ -597,7 +597,7 @@ public class JAXRSUtilsTest extends Assert {
MediaType.valueOf("application/json"));
assertEquals(1, candidateList.size());
- assertTrue(candidateList.get(0).toString().equals("application/json"));
+ assertTrue("application/json".equals(candidateList.get(0).toString()));
//test basic
methodMimeTypes = JAXRSUtils.parseMediaTypes(
@@ -606,7 +606,7 @@ public class JAXRSUtilsTest extends Assert {
MediaType.valueOf("application/json"));
assertEquals(1, candidateList.size());
- assertTrue(candidateList.get(0).toString().equals("application/json"));
+ assertTrue("application/json".equals(candidateList.get(0).toString()));
//test accept wild card */*
candidateList = JAXRSUtils.intersectMimeTypes(
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java
index 7d32846..5919e96 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java
@@ -114,8 +114,8 @@ public class AnnotationHandlerChainBuilder extends
HandlerChainBuilder {
while (node != null) {
if (node instanceof Element) {
el = (Element)node;
- if
(!el.getNamespaceURI().equals("http://java.sun.com/xml/ns/javaee";)
- || !el.getLocalName().equals("handler-chain")) {
+ if
(!"http://java.sun.com/xml/ns/javaee".equals(el.getNamespaceURI())
+ || !"handler-chain".equals(el.getLocalName())) {
String xml = StaxUtils.toString(el);
throw new WebServiceException(
@@ -161,7 +161,7 @@ public class AnnotationHandlerChainBuilder extends
HandlerChainBuilder {
node = node.getNextSibling();
if (cur instanceof Element) {
el = (Element)cur;
- if
(!el.getNamespaceURI().equals("http://java.sun.com/xml/ns/javaee";)) {
+ if
(!"http://java.sun.com/xml/ns/javaee".equals(el.getNamespaceURI())) {
String xml = StaxUtils.toString(el);
throw new WebServiceException(
BundleUtils.getFormattedString(BUNDLE,
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
index f0d4ff4..e815618 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
@@ -66,8 +66,8 @@ public class WrapperClassInInterceptor extends
AbstractPhaseInterceptor<Message>
if (method != null && method.getName().endsWith("Async")) {
Class<?> retType = method.getReturnType();
- if (retType.getName().equals("java.util.concurrent.Future")
- || retType.getName().equals("javax.xml.ws.Response")) {
+ if ("java.util.concurrent.Future".equals(retType.getName())
+ || "javax.xml.ws.Response".equals(retType.getName())) {
return;
}
}
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/WebServiceProviderConfiguration.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/WebServiceProviderConfiguration.java
index 2e9e26c..1107d94 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/WebServiceProviderConfiguration.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/WebServiceProviderConfiguration.java
@@ -34,7 +34,7 @@ public class WebServiceProviderConfiguration extends
JaxWsServiceConfiguration {
@Override
public Boolean isOperation(Method method) {
- return method.getName().equals("invoke")
+ return "invoke".equals(method.getName())
&& method.getParameterTypes().length == 1
&& (Source.class.isAssignableFrom(method.getParameterTypes()[0])
||
SOAPMessage.class.isAssignableFrom(method.getParameterTypes()[0])
diff --git
a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
index a62c85b..a7727e9 100644
---
a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
+++
b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
@@ -275,8 +275,8 @@ public class SOAPHandlerInterceptorTest extends Assert {
Header localHdr = iter.next();
if (localHdr.getObject() instanceof Element) {
Element elem = (Element) localHdr.getObject();
- if
(elem.getNamespaceURI().equals("http://apache.org/hello_world_rpclit/types";)
- && elem.getLocalName().equals("header1")) {
+ if
("http://apache.org/hello_world_rpclit/types".equals(elem.getNamespaceURI())
+ && "header1".equals(elem.getLocalName())) {
requiredHeader = (Element) localHdr.getObject();
break;
}
diff --git
a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsXMLHttpRequest.java
b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsXMLHttpRequest.java
index b92ae68..8c67add 100644
---
a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsXMLHttpRequest.java
+++
b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsXMLHttpRequest.java
@@ -187,7 +187,7 @@ public class JsXMLHttpRequest extends ScriptableObject {
throwError("SYNTAX_ERR");
}
// 7 scheme check. Well, for now ...
- if (!uri.getScheme().equals("http") &&
!uri.getScheme().equals("https")) {
+ if (!"http".equals(uri.getScheme()) &&
!"https".equals(uri.getScheme())) {
LOG.severe("Not http " + uri.toString());
throwError("NOT_SUPPORTED_ERR");
}
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 8f5553a..805e854 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
@@ -1664,7 +1664,7 @@ public class WadlGenerator implements
ContainerRequestFilter {
while (n != null) {
if (n instanceof Element) {
Element e = (Element)n;
- if (e.getLocalName().equals("import")) {
+ if ("import".equals(e.getLocalName())) {
e.removeAttribute("schemaLocation");
}
}
diff --git
a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/multipart/AbstractJwsMultipartVerificationFilter.java
b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/multipart/AbstractJwsMultipartVerificationFilter.java
index 7a404c5..c941fa0 100644
---
a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/multipart/AbstractJwsMultipartVerificationFilter.java
+++
b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/multipart/AbstractJwsMultipartVerificationFilter.java
@@ -36,7 +36,7 @@ public abstract class AbstractJwsMultipartVerificationFilter {
}
protected void addMultipartFilterIfNeeded(MediaType contentType) {
- if (contentType != null && contentType.getType().equals("multipart")) {
+ if (contentType != null && "multipart".equals(contentType.getType())) {
Message m = JAXRSUtils.getCurrentMessage();
MultipartInputFilter jwsFilter = new
JwsMultipartSignatureInFilter(m,
sigVerifier,
diff --git
a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/multipart/JwsMultipartClientRequestFilter.java
b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/multipart/JwsMultipartClientRequestFilter.java
index 79d21c2..bca3caa 100644
---
a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/multipart/JwsMultipartClientRequestFilter.java
+++
b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/multipart/JwsMultipartClientRequestFilter.java
@@ -35,7 +35,7 @@ public class JwsMultipartClientRequestFilter extends
AbstractJwsMultipartSignatu
@Override
public void filter(ClientRequestContext ctx) throws IOException {
MediaType contentType = ctx.getMediaType();
- if (contentType != null && contentType.getType().equals("multipart")) {
+ if (contentType != null && "multipart".equals(contentType.getType())) {
List<Object> parts = getAttachmentParts(ctx.getEntity());
ctx.setEntity(parts);
}
diff --git
a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/multipart/JwsMultipartContainerResponseFilter.java
b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/multipart/JwsMultipartContainerResponseFilter.java
index 15bac66..7013bc4 100644
---
a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/multipart/JwsMultipartContainerResponseFilter.java
+++
b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/multipart/JwsMultipartContainerResponseFilter.java
@@ -36,7 +36,7 @@ public class JwsMultipartContainerResponseFilter extends
AbstractJwsMultipartSig
@Override
public void filter(ContainerRequestContext reqCtx,
ContainerResponseContext respCtx) throws IOException {
MediaType contentType = respCtx.getMediaType();
- if (contentType != null && contentType.getType().equals("multipart")) {
+ if (contentType != null && "multipart".equals(contentType.getType())) {
List<Object> parts = getAttachmentParts(respCtx.getEntity());
respCtx.setEntity(parts);
}
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProviderTest.java
b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProviderTest.java
index b7d4bdc..7c4ef05 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProviderTest.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProviderTest.java
@@ -108,9 +108,9 @@ abstract class AbstractOAuthDataProviderTest extends Assert
{
List<Client> aliceClients = getProvider().getClients(new
UserSubject("alice"));
assertNotNull(aliceClients);
assertEquals(2, aliceClients.size());
- compareClients(c, aliceClients.get(0).getClientId().equals("12345")
+ compareClients(c, "12345".equals(aliceClients.get(0).getClientId())
? aliceClients.get(0) : aliceClients.get(1));
- compareClients(c2, aliceClients.get(0).getClientId().equals("56789")
+ compareClients(c2, "56789".equals(aliceClients.get(0).getClientId())
? aliceClients.get(0) : aliceClients.get(1));
List<Client> bobClients = getProvider().getClients(new
UserSubject("bob"));
diff --git
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
index cb3e4ee..7cf2954 100755
---
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
+++
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
@@ -176,7 +176,7 @@ public class AsyncHTTPConduit extends
URLConnectionHTTPConduit {
if (clientParameters == null) {
clientParameters = tlsClientParameters;
}
- if (uri.getScheme().equals("https")
+ if ("https".equals(uri.getScheme())
&& clientParameters != null
&& clientParameters.getSSLSocketFactory() != null) {
//if they configured in an SSLSocketFactory, we cannot do anything
diff --git
a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
index f735e14..f4931d8 100644
---
a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
+++
b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
@@ -136,7 +136,7 @@ public class NettyHttpConduit extends
URLConnectionHTTPConduit implements BusLif
if (clientParameters == null) {
clientParameters = tlsClientParameters;
}
- if (uri.getScheme().equals("https")
+ if ("https".equals(uri.getScheme())
&& clientParameters != null
&& clientParameters.getSSLSocketFactory() != null) {
//if they configured in an SSLSocketFactory, we cannot do anything
@@ -331,7 +331,7 @@ public class NettyHttpConduit extends
URLConnectionHTTPConduit implements BusLif
}
protected void connect(boolean output) {
- if (url.getScheme().equals("https")) {
+ if ("https".equals(url.getScheme())) {
TLSClientParameters clientParameters =
findTLSClientParameters();
bootstrap.handler(new
NettyHttpClientPipelineFactory(clientParameters));
} else {
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Address.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Address.java
index a12964e..d050e9e 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Address.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Address.java
@@ -95,7 +95,7 @@ public final class Address {
return Proxy.NO_PROXY;
}
//detect usage of user-defined proxy and avoid optimizations in that
case
- if
(!sel.getClass().getName().equals("sun.net.spi.DefaultProxySelector")) {
+ if
(!"sun.net.spi.DefaultProxySelector".equals(sel.getClass().getName())) {
return null;
}
Iterator<Proxy> it = sel.select(uri).iterator();
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
index b3dbba6..d4a1467 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
@@ -1277,7 +1277,7 @@ public abstract class HTTPConduit
// If this is a GET method we must not touch the output
// stream as this automagically turns the request into a POST.
- if (getMethod().equals("GET") || cachedStream == null) {
+ if ("GET".equals(getMethod()) || cachedStream == null) {
handleNoOutput();
return;
}
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
index 7178a54..94ccfa1 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
@@ -84,9 +84,9 @@ public final class HttpAuthHeader {
if (!first) {
builder.append(", ");
}
- if (entry.getKey().equals("nc")
- || entry.getKey().equals("qop")
- || entry.getKey().equals("algorithm")) {
+ if ("nc".equals(entry.getKey())
+ || "qop".equals(entry.getKey())
+ || "algorithm".equals(entry.getKey())) {
builder.append(entry.getKey() + "=" + param + "");
} else {
builder.append(entry.getKey() + "=\"" + param + "\"");
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
index 4bb766f..2f4730c 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
@@ -291,7 +291,7 @@ public abstract class AbstractHTTPServlet extends
HttpServlet implements Filter
boolean staticResourcesMatch = staticResourcesList != null
&& matchPath(staticResourcesList, request);
boolean staticWelcomeFileMatch = staticWelcomeFile != null
- && (StringUtils.isEmpty(request.getPathInfo()) ||
request.getPathInfo().equals("/"));
+ && (StringUtils.isEmpty(request.getPathInfo()) ||
"/".equals(request.getPathInfo()));
if (staticResourcesMatch || staticWelcomeFileMatch) {
serveStaticContent(request, response,
staticWelcomeFileMatch ? staticWelcomeFile :
request.getPathInfo());
diff --git
a/rt/transports/udp/src/test/java/org/apache/cxf/transport/udp/UDPTransportTest.java
b/rt/transports/udp/src/test/java/org/apache/cxf/transport/udp/UDPTransportTest.java
index 178f704..906bd14 100644
---
a/rt/transports/udp/src/test/java/org/apache/cxf/transport/udp/UDPTransportTest.java
+++
b/rt/transports/udp/src/test/java/org/apache/cxf/transport/udp/UDPTransportTest.java
@@ -90,7 +90,7 @@ public class UDPTransportTest extends
AbstractBusClientServerTestBase {
@Test
public void testBroadcastUDP() throws Exception {
// Disable the test on Redhat Enterprise Linux which doesn't enable
the UDP broadcast by default
- if (System.getProperties().getProperty("os.name").equals("Linux")
+ if ("Linux".equals(System.getProperties().getProperty("os.name"))
&& System.getProperties().getProperty("os.version").indexOf("el")
> 0) {
System.out.println("Skipping broadcast test for REL");
return;
diff --git
a/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/utils/DurationAndDateUtil.java
b/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/utils/DurationAndDateUtil.java
index 8521fd0..e927aa2 100644
---
a/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/utils/DurationAndDateUtil.java
+++
b/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/utils/DurationAndDateUtil.java
@@ -113,7 +113,7 @@ public final class DurationAndDateUtil {
}
public static boolean isPT0S(Duration duration) {
- return duration.toString().equals("PT0S");
+ return "PT0S".equals(duration.toString());
}
}
diff --git
a/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/notificationapi/assertions/WSAActionAssertingHandler.java
b/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/notificationapi/assertions/WSAActionAssertingHandler.java
index 5ae2ad7..b4935b9 100644
---
a/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/notificationapi/assertions/WSAActionAssertingHandler.java
+++
b/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/notificationapi/assertions/WSAActionAssertingHandler.java
@@ -61,7 +61,7 @@ public class WSAActionAssertingHandler implements
SOAPHandler<SOAPMessageContext
try {
Element elm =
DOMUtils.getFirstElement(context.getMessage().getSOAPHeader());
while (elm != null) {
- if (elm.getLocalName().equals("Action") &&
elm.getNamespaceURI().contains("addressing")) {
+ if ("Action".equals(elm.getLocalName()) &&
elm.getNamespaceURI().contains("addressing")) {
if (!elm.getTextContent().equals(action)) {
throw new RuntimeException("The event sink should have
received "
+ "WSA-Action: " + action + " but received: "
diff --git
a/rt/ws/mex/src/main/java/org/apache/cxf/ws/mex/MEXServerListener.java
b/rt/ws/mex/src/main/java/org/apache/cxf/ws/mex/MEXServerListener.java
index de4e7fc..4fa1c8e 100644
--- a/rt/ws/mex/src/main/java/org/apache/cxf/ws/mex/MEXServerListener.java
+++ b/rt/ws/mex/src/main/java/org/apache/cxf/ws/mex/MEXServerListener.java
@@ -33,7 +33,7 @@ public class MEXServerListener implements
ServerLifeCycleListener {
public void startServer(Server serv) {
if (serv.getEndpoint().getBinding() instanceof SoapBinding) {
QName qn = serv.getEndpoint().getService().getName();
- if (!qn.getNamespaceURI().equals("http://mex.ws.cxf.apache.org/";))
{
+ if (!"http://mex.ws.cxf.apache.org/".equals(qn.getNamespaceURI()))
{
serv.getEndpoint().getInInterceptors().add(new
MEXInInterceptor(serv));
}
}
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
index e842022..08e01eb 100755
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
@@ -643,7 +643,7 @@ public abstract class AbstractSTSClient implements
Configurable, InterceptorProv
protected String findMEXLocation(Element ref) {
Element el = DOMUtils.getFirstElement(ref);
while (el != null) {
- if (el.getLocalName().equals("Address")
+ if ("Address".equals(el.getLocalName())
&& VersionTransformer.isSupported(el.getNamespaceURI())
&& "MetadataReference".equals(ref.getLocalName())) {
return DOMUtils.getContent(el);
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
index 1aebced..b77d852 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
@@ -237,7 +237,7 @@ public final class STSUtils {
public static String findMEXLocation(Element ref) {
Element el = DOMUtils.getFirstElement(ref);
while (el != null) {
- if (el.getLocalName().equals("Address")
+ if ("Address".equals(el.getLocalName())
&& VersionTransformer.isSupported(el.getNamespaceURI())
&& "MetadataReference".equals(ref.getLocalName())) {
return DOMUtils.getContent(el);
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractTokenInterceptor.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractTokenInterceptor.java
index e9f3d26..632dbe9 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractTokenInterceptor.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractTokenInterceptor.java
@@ -154,7 +154,7 @@ public abstract class AbstractTokenInterceptor extends
AbstractSoapInterceptor {
protected Header findSecurityHeader(SoapMessage message, boolean create) {
for (Header h : message.getHeaders()) {
QName n = h.getName();
- if (n.getLocalPart().equals("Security")
+ if ("Security".equals(n.getLocalPart())
&& (n.getNamespaceURI().equals(WSS4JConstants.WSSE_NS)
|| n.getNamespaceURI().equals(WSS4JConstants.WSSE11_NS))) {
return h;
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
index 8d93ddd..b4a2d48 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
@@ -2301,7 +2301,7 @@ public abstract class AbstractBindingBuilder extends
AbstractCommonBindingHandle
if (signedPart.getId() == null &&
!"Token".equals(signedPart.getName())) {
throw new IllegalArgumentException(
"WSEncryptionPart must be ID based but no id was
found.");
- } else if (encryptedPart.getEncModifier().equals("Header")
+ } else if ("Header".equals(encryptedPart.getEncModifier())
&& signedPart.getId().equals(encryptedPart.getId())) {
// We are to sign something that has already been
encrypted.
// We need to preserve the original aspects of signedPart
but
diff --git
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/cache/EHCacheUtilsTest.java
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/cache/EHCacheUtilsTest.java
index fc01a51..f3fce9f 100644
---
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/cache/EHCacheUtilsTest.java
+++
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/cache/EHCacheUtilsTest.java
@@ -45,7 +45,7 @@ public class EHCacheUtilsTest extends Assert {
CacheManager manager = EHCacheUtils.getCacheManager(bus,
EHCacheManagerHolder.class.getResource("/cxf-test-ehcache.xml"));
- assertFalse(manager.getName().equals("myGlobalConfig"));
+ assertFalse("myGlobalConfig".equals(manager.getName()));
EHCacheManagerHolder.releaseCacheManger(manager);
assertEquals(Status.STATUS_SHUTDOWN, manager.getStatus());
@@ -66,7 +66,7 @@ public class EHCacheUtilsTest extends Assert {
manager = EHCacheUtils.getCacheManager(bus,
EHCacheManagerHolder.class.getResource("/cxf-test-ehcache.xml"));
- assertFalse(manager.getName().equals("myGlobalConfig"));
+ assertFalse("myGlobalConfig".equals(manager.getName()));
EHCacheManagerHolder.releaseCacheManger(manager);
assertEquals(Status.STATUS_SHUTDOWN, manager.getStatus());
}
diff --git
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/DefaultServiceConfiguration.java
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/DefaultServiceConfiguration.java
index 41c800e..1ffc000 100644
---
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/DefaultServiceConfiguration.java
+++
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/DefaultServiceConfiguration.java
@@ -241,7 +241,7 @@ public class DefaultServiceConfiguration extends
AbstractServiceConfiguration {
@Override
public Boolean isHolder(Class<?> cls, Type type) {
- if (cls.getSimpleName().equals("Holder")) {
+ if ("Holder".equals(cls.getSimpleName())) {
for (Field f : cls.getDeclaredFields()) {
if (Modifier.isStatic(f.getModifiers())) {
continue;
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
index 4500929..3f5674a 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
@@ -98,7 +98,7 @@ public final class SchemaUtil {
schemaElem = schema.getElement();
} else if (obj instanceof UnknownExtensibilityElement) {
org.w3c.dom.Element elem =
((UnknownExtensibilityElement)obj).getElement();
- if (elem.getLocalName().equals("schema")) {
+ if ("schema".equals(elem.getLocalName())) {
schemaElem = elem;
}
}
diff --git
a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
index 9359a0e..5f9db5f 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
@@ -307,7 +307,7 @@ public class ServiceWSDLBuilderTest extends Assert {
public void testBindingWithDifferentNamespaceImport() throws Exception {
setupWSDL("wsdl2/person.wsdl");
assertEquals(newDef.getBindings().size(), 1);
-
assertTrue(newDef.getNamespace("ns3").equals("http://cxf.apache.org/samples/wsdl-first";));
+
assertTrue("http://cxf.apache.org/samples/wsdl-first".equals(newDef.getNamespace("ns3")));
}
@Test
diff --git
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
index d526793..8220618 100644
---
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
+++
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
@@ -113,7 +113,7 @@ public class SAMLTokenRenewerRealmTest extends
org.junit.Assert {
assertTrue(validatorResponse != null);
assertTrue(validatorResponse.getToken() != null);
assertTrue(validatorResponse.getToken().getState() == STATE.EXPIRED);
- assertTrue(validatorResponse.getTokenRealm().equals("A"));
+ assertTrue("A".equals(validatorResponse.getTokenRealm()));
// Renew the Assertion
TokenRenewerParameters renewerParameters = new
TokenRenewerParameters();
@@ -186,7 +186,7 @@ public class SAMLTokenRenewerRealmTest extends
org.junit.Assert {
assertTrue(validatorResponse != null);
assertTrue(validatorResponse.getToken() != null);
assertTrue(validatorResponse.getToken().getState() == STATE.EXPIRED);
- assertTrue(validatorResponse.getTokenRealm().equals("B"));
+ assertTrue("B".equals(validatorResponse.getTokenRealm()));
// Renew the Assertion
TokenRenewerParameters renewerParameters = new
TokenRenewerParameters();
diff --git
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java
index c384e7e..30c4626 100644
---
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java
+++
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java
@@ -104,7 +104,7 @@ public class JWTTokenValidatorRealmTest extends
org.junit.Assert {
assertTrue(validatorResponse != null);
assertTrue(validatorResponse.getToken() != null);
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
- assertTrue(validatorResponse.getTokenRealm().equals("A"));
+ assertTrue("A".equals(validatorResponse.getTokenRealm()));
Principal principal = validatorResponse.getPrincipal();
assertTrue(principal != null && principal.getName() != null);
@@ -155,7 +155,7 @@ public class JWTTokenValidatorRealmTest extends
org.junit.Assert {
assertTrue(validatorResponse != null);
assertTrue(validatorResponse.getToken() != null);
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
- assertTrue(validatorResponse.getTokenRealm().equals("B"));
+ assertTrue("B".equals(validatorResponse.getTokenRealm()));
Principal principal = validatorResponse.getPrincipal();
assertTrue(principal != null && principal.getName() != null);
diff --git
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorTest.java
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorTest.java
index cce39d2..2b083ec 100644
---
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorTest.java
+++
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorTest.java
@@ -318,7 +318,7 @@ public class JWTTokenValidatorTest extends org.junit.Assert
{
assertTrue(principal != null && principal.getName() != null);
Set<Principal> roles = validatorResponse.getRoles();
assertTrue(roles != null && !roles.isEmpty());
- assertTrue(roles.iterator().next().getName().equals("manager"));
+ assertTrue("manager".equals(roles.iterator().next().getName()));
}
private TokenProviderParameters createProviderParameters() throws
WSSecurityException {
diff --git
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java
index 2d40123..89e2c3d 100644
---
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java
+++
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java
@@ -96,7 +96,7 @@ public class SAMLTokenValidatorCachedRealmTest extends
org.junit.Assert {
assertTrue(validatorResponse != null);
assertTrue(validatorResponse.getToken() != null);
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
- assertTrue(validatorResponse.getTokenRealm().equals("A"));
+ assertTrue("A".equals(validatorResponse.getTokenRealm()));
}
@@ -247,4 +247,4 @@ public class SAMLTokenValidatorCachedRealmTest extends
org.junit.Assert {
}
-}
\ No newline at end of file
+}
diff --git
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java
index c80bd59..ab889bd 100644
---
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java
+++
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java
@@ -92,7 +92,7 @@ public class SAMLTokenValidatorRealmTest extends
org.junit.Assert {
assertTrue(validatorResponse != null);
assertTrue(validatorResponse.getToken() != null);
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
- assertTrue(validatorResponse.getTokenRealm().equals("A"));
+ assertTrue("A".equals(validatorResponse.getTokenRealm()));
Principal principal = validatorResponse.getPrincipal();
assertTrue(principal != null && principal.getName() != null);
@@ -135,7 +135,7 @@ public class SAMLTokenValidatorRealmTest extends
org.junit.Assert {
assertTrue(validatorResponse != null);
assertTrue(validatorResponse.getToken() != null);
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
- assertTrue(validatorResponse.getTokenRealm().equals("B"));
+ assertTrue("B".equals(validatorResponse.getTokenRealm()));
Principal principal = validatorResponse.getPrincipal();
assertTrue(principal != null && principal.getName() != null);
diff --git
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
index e22d984..3cb7c68 100644
---
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
+++
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
@@ -390,7 +390,7 @@ public class SAMLTokenValidatorTest extends
org.junit.Assert {
assertTrue(principal != null && principal.getName() != null);
Set<Principal> roles = validatorResponse.getRoles();
assertTrue(roles != null && !roles.isEmpty());
- assertTrue(roles.iterator().next().getName().equals("manager"));
+ assertTrue("manager".equals(roles.iterator().next().getName()));
}
@org.junit.Test
@@ -424,7 +424,7 @@ public class SAMLTokenValidatorTest extends
org.junit.Assert {
assertTrue(principal != null && principal.getName() != null);
Set<Principal> roles = validatorResponse.getRoles();
assertTrue(roles != null && !roles.isEmpty());
- assertTrue(roles.iterator().next().getName().equals("employee"));
+ assertTrue("employee".equals(roles.iterator().next().getName()));
}
/**
diff --git
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SCTValidatorTest.java
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SCTValidatorTest.java
index 1f6d33c..4aeb2fd 100644
---
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SCTValidatorTest.java
+++
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SCTValidatorTest.java
@@ -79,7 +79,7 @@ public class SCTValidatorTest extends org.junit.Assert {
assertTrue(
validatorResponse.getAdditionalProperties().get(SCTValidator.SCT_VALIDATOR_SECRET)
!= null
);
- assertTrue(validatorResponse.getPrincipal().getName().equals("alice"));
+ assertTrue("alice".equals(validatorResponse.getPrincipal().getName()));
// Now remove the SCT from the cache
tokenStore.remove(tokenStore.getToken(providerResponse.getTokenId()).getId());
diff --git
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java
index d8cc294..f8332d0 100644
---
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java
+++
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java
@@ -122,9 +122,9 @@ public class SAMLBatchUnitTest extends
AbstractBusClientServerTestBase {
requestSecurityTokens(bus, wsdlLocation, requestList, action,
requestType, port);
assertTrue(tokens != null && tokens.size() == 2);
-
assertTrue(tokens.get(0).getToken().getLocalName().equals("Assertion"));
+
assertTrue("Assertion".equals(tokens.get(0).getToken().getLocalName()));
assertTrue(tokens.get(0).getToken().getNamespaceURI().equals(SAMLConstants.SAML1_NS));
-
assertTrue(tokens.get(1).getToken().getLocalName().equals("Assertion"));
+
assertTrue("Assertion".equals(tokens.get(1).getToken().getLocalName()));
assertTrue(tokens.get(1).getToken().getNamespaceURI().equals(SAMLConstants.SAML20_NS));
// Now validate the tokens
diff --git
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
index 7e8a321..dc6188d 100644
---
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
+++
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
@@ -451,7 +451,7 @@ public class SimpleBatchSTSClient implements Configurable,
InterceptorProvider {
protected String findMEXLocation(Element ref) {
Element el = DOMUtils.getFirstElement(ref);
while (el != null) {
- if (el.getLocalName().equals("Address")
+ if ("Address".equals(el.getLocalName())
&& VersionTransformer.isSupported(el.getNamespaceURI())
&& "MetadataReference".equals(ref.getLocalName())) {
return DOMUtils.getContent(el);
diff --git
a/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/internal/WSDiscoveryServiceImpl.java
b/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/internal/WSDiscoveryServiceImpl.java
index 65a9678..429340d 100644
---
a/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/internal/WSDiscoveryServiceImpl.java
+++
b/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/internal/WSDiscoveryServiceImpl.java
@@ -318,10 +318,10 @@ public class WSDiscoveryServiceImpl implements
WSDiscoveryService {
if (uri.getScheme() == null) {
return UUID.fromString(scope);
}
- if (uri.getScheme().equals("urn")) {
+ if ("urn".equals(uri.getScheme())) {
uri = URI.create(uri.getSchemeSpecificPart());
}
- if (uri.getScheme().equals("uuid")) {
+ if ("uuid".equals(uri.getScheme())) {
return UUID.fromString(uri.getSchemeSpecificPart());
}
return null;
diff --git
a/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java
b/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java
index b31ac99..17df37b 100644
---
a/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java
+++
b/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java
@@ -80,7 +80,7 @@ public final class WSDiscoveryClientTest {
@Test
public void testMultiResponses() throws Exception {
// Disable the test on Redhat Enterprise Linux which doesn't enable
the UDP broadcast by default
- if (System.getProperties().getProperty("os.name").equals("Linux")
+ if ("Linux".equals(System.getProperties().getProperty("os.name"))
&& System.getProperties().getProperty("os.version").indexOf("el")
> 0) {
System.out.println("Skipping MultiResponse test for REL");
return;
diff --git
a/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointBean.java
b/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointBean.java
index c819ab2..17c513a 100644
---
a/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointBean.java
+++
b/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointBean.java
@@ -66,10 +66,10 @@ public class EndpointBean implements EndpointInterface {
DataHandler dataHandler = request.getDataHandler();
try {
- if (!dataHandler.getContentType().equals("text/plain")) {
+ if (!"text/plain".equals(dataHandler.getContentType())) {
throw new WebServiceException("Wrong content type");
}
- if (!dataHandler.getContent().equals("some string")) {
+ if (!"some string".equals(dataHandler.getContent())) {
throw new WebServiceException("Wrong data");
}
} catch (IOException e) {
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer20.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer20.java
index 02b61a6..ae87a19 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer20.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer20.java
@@ -143,7 +143,7 @@ public class BookServer20 extends AbstractBusTestServerBase
{
UriInfo ui = context.getUriInfo();
String path = ui.getPath(false);
- if (context.getMethod().equals("POST")
+ if ("POST".equals(context.getMethod())
&& "bookstore/bookheaders/simple".equals(path) &&
!context.hasEntity()) {
byte[] bytes =
StringUtils.toBytesUTF8("<Book><name>Book</name><id>126</id></Book>");
context.getHeaders().putSingle(HttpHeaders.CONTENT_LENGTH,
Integer.toString(bytes.length));
@@ -169,7 +169,7 @@ public class BookServer20 extends AbstractBusTestServerBase
{
}
MediaType mt = context.getMediaType();
- if (mt != null && mt.toString().equals("text/xml")) {
+ if (mt != null && "text/xml".equals(mt.toString())) {
String method = context.getMethod();
if ("PUT".equals(method)) {
context.setMethod("POST");
@@ -182,7 +182,7 @@ public class BookServer20 extends AbstractBusTestServerBase
{
}
}
List<MediaType> acceptTypes = context.getAcceptableMediaTypes();
- if (acceptTypes.size() == 1 &&
acceptTypes.get(0).toString().equals("text/mistypedxml")) {
+ if (acceptTypes.size() == 1 &&
"text/mistypedxml".equals(acceptTypes.get(0).toString())) {
context.getHeaders().putSingle("Accept", "text/xml");
}
}
@@ -356,7 +356,7 @@ public class BookServer20 extends AbstractBusTestServerBase
{
public void filter(ContainerRequestContext requestContext,
ContainerResponseContext responseContext) throws
IOException {
responseContext.getHeaders().add("Custom", "custom");
- if (!responseContext.getEntity().equals("Postmatch filter error"))
{
+ if (!"Postmatch filter error".equals(responseContext.getEntity()))
{
Book book = (Book)responseContext.getEntity();
responseContext.setEntity(new Book(book.getName(), 1 +
book.getId()), null, null);
}
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
index 20ba1ee..0e99af8 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
@@ -311,7 +311,7 @@ public class BookStore {
@Produces("application/xml")
@Consumes("application/xml")
public Response patchBook(Book book) {
- if (book.getName().equals("Timeout")) {
+ if ("Timeout".equals(book.getName())) {
try {
Thread.sleep(2000);
} catch (InterruptedException e) {
@@ -473,7 +473,7 @@ public class BookStore {
@Path("emptyput")
@Consumes("application/json")
public void emptyput() {
- if (!httpHeaders.getMediaType().toString().equals("application/json"))
{
+ if (!"application/json".equals(httpHeaders.getMediaType().toString()))
{
throw new RuntimeException();
}
}
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ContentTypeModifyingMBW.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ContentTypeModifyingMBW.java
index 0fd4f82..67a53da 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ContentTypeModifyingMBW.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ContentTypeModifyingMBW.java
@@ -37,7 +37,7 @@ public class ContentTypeModifyingMBW implements
MessageBodyWriter<String> {
@Override
public boolean isWriteable(Class<?> arg0, Type arg1, Annotation[] arg2,
MediaType mt) {
- return mt.toString().equals("text/custom");
+ return "text/custom".equals(mt.toString());
}
@Override
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartStore.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartStore.java
index 436d713..b109af9 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartStore.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartStore.java
@@ -690,7 +690,7 @@ public class MultipartStore {
public Response addBookFromMessageContext() throws Exception {
Map<String, Attachment> handlers =
AttachmentUtils.getAttachmentsMap(context);
for (Map.Entry<String, Attachment> entry : handlers.entrySet()) {
- if (entry.getKey().equals("book2")) {
+ if ("book2".equals(entry.getKey())) {
return
readBookFromInputStream(entry.getValue().getDataHandler().getInputStream());
}
}
@@ -703,7 +703,7 @@ public class MultipartStore {
public Response addBookFromAttachments() throws Exception {
Collection<Attachment> handlers =
AttachmentUtils.getChildAttachments(context);
for (Attachment a : handlers) {
- if (a.getContentId().equals("book2")) {
+ if ("book2".equals(a.getContentId())) {
return
readBookFromInputStream(a.getDataHandler().getInputStream());
}
}
diff --git
a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java
b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java
index 930bd3c..4d08170 100644
---
a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java
+++
b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java
@@ -148,19 +148,19 @@ public abstract class TestHandlerBase {
throw new PingException("WSDL_OPERATION not found");
}
URI wsdlDescription =
(URI)ctx.get(MessageContext.WSDL_DESCRIPTION);
- if
(!wsdlDescription.toString().equals("http://localhost:9005/HandlerTest/SoapPort?wsdl";))
{
+ if
(!"http://localhost:9005/HandlerTest/SoapPort?wsdl".equals(wsdlDescription.toString()))
{
throw new PingException("WSDL_DESCRIPTION not found");
}
QName wsdlPort = (QName)ctx.get(MessageContext.WSDL_PORT);
- if (!wsdlPort.getLocalPart().equals("SoapPort")) {
+ if (!"SoapPort".equals(wsdlPort.getLocalPart())) {
throw new PingException("WSDL_PORT not found");
}
QName wsdlInterface =
(QName)ctx.get(MessageContext.WSDL_INTERFACE);
- if (!wsdlInterface.getLocalPart().equals("HandlerTest")) {
+ if (!"HandlerTest".equals(wsdlInterface.getLocalPart())) {
throw new PingException("WSDL_INTERFACE not found");
}
QName wsdlService = (QName)ctx.get(MessageContext.WSDL_SERVICE);
- if (!wsdlService.getLocalPart().equals("HandlerTestService")) {
+ if (!"HandlerTestService".equals(wsdlService.getLocalPart())) {
throw new PingException("WSDL_SERVICE not found");
}
*/
diff --git
a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourcePayloadProvider.java
b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourcePayloadProvider.java
index f2e0fcf..ab8b082 100644
---
a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourcePayloadProvider.java
+++
b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourcePayloadProvider.java
@@ -91,7 +91,7 @@ public class HWDOMSourcePayloadProvider implements
Provider<DOMSource> {
} else if (n.getLocalName().equals(greetMe.getLocalPart())) {
Element el = DOMUtils.getFirstElement(n);
String s = DOMUtils.getContent(el);
- if (s.trim().equals("throwFault")) {
+ if ("throwFault".equals(s.trim())) {
try {
SOAPFactory f = SOAPFactory.newInstance();
SOAPFault soapFault = f.createFault();
diff --git
a/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/SwANoMimeServiceImpl.java
b/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/SwANoMimeServiceImpl.java
index 4012aab..f5f285b 100644
---
a/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/SwANoMimeServiceImpl.java
+++
b/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/SwANoMimeServiceImpl.java
@@ -55,7 +55,7 @@ public class SwANoMimeServiceImpl implements
SwAServiceInterface {
}
if (attach2 == null || attach2.value == null) {
System.err.println("attach2.value is null (unexpected)");
- if (theResponse.getReason().equals("ok")) {
+ if ("ok".equals(theResponse.getReason())) {
theResponse.setReason("attach2.value is null
(unexpected)");
} else {
theResponse.setReason(theResponse.getReason() +
"\nattach2.value is null (unexpected)");
@@ -64,7 +64,7 @@ public class SwANoMimeServiceImpl implements
SwAServiceInterface {
}
if (attach3 == null || attach3.value == null) {
System.err.println("attach3.value is null (unexpected)");
- if (theResponse.getReason().equals("ok")) {
+ if ("ok".equals(theResponse.getReason())) {
theResponse.setReason("attach3.value is null
(unexpected)");
} else {
theResponse.setReason(theResponse.getReason() +
"\nattach3.value is null (unexpected)");
@@ -73,7 +73,7 @@ public class SwANoMimeServiceImpl implements
SwAServiceInterface {
}
if (attach4 == null || attach4.value == null) {
System.err.println("attach4.value is null (unexpected)");
- if (theResponse.getReason().equals("ok")) {
+ if ("ok".equals(theResponse.getReason())) {
theResponse.setReason("attach4.value is null
(unexpected)");
} else {
theResponse.setReason(theResponse.getReason() +
"\nattach4.value is null (unexpected)");
@@ -82,7 +82,7 @@ public class SwANoMimeServiceImpl implements
SwAServiceInterface {
}
if (attach5 == null || attach5.value == null) {
System.err.println("attach5.value is null (unexpected)");
- if (theResponse.getReason().equals("ok")) {
+ if ("ok".equals(theResponse.getReason())) {
theResponse.setReason("attach5.value is null
(unexpected)");
} else {
theResponse.setReason(theResponse.getReason() +
"\nattach5.value is null (unexpected)");
diff --git
a/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/SwAServiceImpl.java
b/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/SwAServiceImpl.java
index 0fe0ccd..86b96cd 100644
---
a/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/SwAServiceImpl.java
+++
b/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/SwAServiceImpl.java
@@ -107,7 +107,7 @@ public class SwAServiceImpl implements SwAServiceInterface {
}
if (attach2 == null || attach2.value == null) {
System.err.println("attach2.value is null (unexpected)");
- if (theResponse.getReason().equals("ok")) {
+ if ("ok".equals(theResponse.getReason())) {
theResponse.setReason("attach2.value is null
(unexpected)");
} else {
theResponse.setReason(theResponse.getReason() +
"\nattach2.value is null (unexpected)");
@@ -116,7 +116,7 @@ public class SwAServiceImpl implements SwAServiceInterface {
}
if (attach3 == null || attach3.value == null) {
System.err.println("attach3.value is null (unexpected)");
- if (theResponse.getReason().equals("ok")) {
+ if ("ok".equals(theResponse.getReason())) {
theResponse.setReason("attach3.value is null
(unexpected)");
} else {
theResponse.setReason(theResponse.getReason() +
"\nattach3.value is null (unexpected)");
@@ -125,7 +125,7 @@ public class SwAServiceImpl implements SwAServiceInterface {
}
if (attach4 == null || attach4.value == null) {
System.err.println("attach4.value is null (unexpected)");
- if (theResponse.getReason().equals("ok")) {
+ if ("ok".equals(theResponse.getReason())) {
theResponse.setReason("attach4.value is null
(unexpected)");
} else {
theResponse.setReason(theResponse.getReason() +
"\nattach4.value is null (unexpected)");
@@ -134,7 +134,7 @@ public class SwAServiceImpl implements SwAServiceInterface {
}
if (attach5 == null || attach5.value == null) {
System.err.println("attach5.value is null (unexpected)");
- if (theResponse.getReason().equals("ok")) {
+ if ("ok".equals(theResponse.getReason())) {
theResponse.setReason("attach5.value is null
(unexpected)");
} else {
theResponse.setReason(theResponse.getReason() +
"\nattach5.value is null (unexpected)");
diff --git
a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/SwAServiceImpl.java
b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/SwAServiceImpl.java
index d7d75b9..e12eafc 100644
---
a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/SwAServiceImpl.java
+++
b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/SwAServiceImpl.java
@@ -107,7 +107,7 @@ public class SwAServiceImpl implements SwAServiceInterface {
}
if (attach2 == null || attach2.value == null) {
System.err.println("attach2.value is null (unexpected)");
- if (theResponse.getReason().equals("ok")) {
+ if ("ok".equals(theResponse.getReason())) {
theResponse.setReason("attach2.value is null
(unexpected)");
} else {
theResponse.setReason(theResponse.getReason() +
"\nattach2.value is null (unexpected)");
@@ -116,7 +116,7 @@ public class SwAServiceImpl implements SwAServiceInterface {
}
if (attach3 == null || attach3.value == null) {
System.err.println("attach3.value is null (unexpected)");
- if (theResponse.getReason().equals("ok")) {
+ if ("ok".equals(theResponse.getReason())) {
theResponse.setReason("attach3.value is null
(unexpected)");
} else {
theResponse.setReason(theResponse.getReason() +
"\nattach3.value is null (unexpected)");
@@ -125,7 +125,7 @@ public class SwAServiceImpl implements SwAServiceInterface {
}
if (attach4 == null || attach4.value == null) {
System.err.println("attach4.value is null (unexpected)");
- if (theResponse.getReason().equals("ok")) {
+ if ("ok".equals(theResponse.getReason())) {
theResponse.setReason("attach4.value is null
(unexpected)");
} else {
theResponse.setReason(theResponse.getReason() +
"\nattach4.value is null (unexpected)");
@@ -134,7 +134,7 @@ public class SwAServiceImpl implements SwAServiceInterface {
}
if (attach5 == null || attach5.value == null) {
System.err.println("attach5.value is null (unexpected)");
- if (theResponse.getReason().equals("ok")) {
+ if ("ok".equals(theResponse.getReason())) {
theResponse.setReason("attach5.value is null
(unexpected)");
} else {
theResponse.setReason(theResponse.getReason() +
"\nattach5.value is null (unexpected)");
diff --git
a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
index 5d25534..ce4ae5c 100644
---
a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
+++
b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
@@ -161,7 +161,7 @@ public class EngineLifecycleTest extends Assert {
WebAppContext servletContext = null;
for (Handler h : contexts) {
WebAppContext wac = (WebAppContext) h;
- if (wac.getContextPath().equals("/jsunit")) {
+ if ("/jsunit".equals(wac.getContextPath())) {
servletContext = wac;
break;
}
diff --git
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schema_validation/SchemaValidationImpl.java
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schema_validation/SchemaValidationImpl.java
index 383d81d..63af3eb 100644
---
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schema_validation/SchemaValidationImpl.java
+++
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schema_validation/SchemaValidationImpl.java
@@ -74,13 +74,13 @@ public class SchemaValidationImpl implements
SchemaValidation {
@Override
public SomeResponse doSomething(SomeRequest in) throws DoSomethingFault {
SomeResponse response = new SomeResponse();
- if (in.getId().equals("1234567890")) {
+ if ("1234567890".equals(in.getId())) {
response.setTransactionId("aaaaaaaaaaxxx"); // invalid transaction
id
- } else if (in.getId().equals("9999999999")) {
+ } else if ("9999999999".equals(in.getId())) {
SomeFault someFault = new SomeFault();
someFault.setErrorCode("1234");
throw new DoSomethingFault("Fault", someFault);
- } else if (in.getId().equals("8888888888")) {
+ } else if ("8888888888".equals(in.getId())) {
SomeFault someFault = new SomeFault();
someFault.setErrorCode("1");
throw new DoSomethingFault("Fault", someFault);
diff --git
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/CarDealerImpl.java
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/CarDealerImpl.java
index 9aae725..679a967 100644
---
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/CarDealerImpl.java
+++
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/CarDealerImpl.java
@@ -50,8 +50,8 @@ public class CarDealerImpl implements CarDealer {
}
Porsche porsche = (Porsche)oldCar;
- if (porsche.getMake().equals("Porsche") &&
porsche.getModel().equals("GT2000")
- && porsche.getYear().equals("2000") &&
porsche.getColor().equals("white")) {
+ if ("Porsche".equals(porsche.getMake()) &&
"GT2000".equals(porsche.getModel())
+ && "2000".equals(porsche.getYear()) &&
"white".equals(porsche.getColor())) {
return newPorsche("911GT3", "2007", "black");
}
throw new WebServiceException("Invalid Porsche Car");
diff --git
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
index be25805..b926fd3 100644
---
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
+++
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
@@ -101,7 +101,7 @@ public class SecurityPolicyTest extends
AbstractBusClientServerTestBase {
UnsupportedCallbackException {
WSPasswordCallback pc = (WSPasswordCallback) callbacks[0];
- if (pc.getIdentifier().equals("bob")) {
+ if ("bob".equals(pc.getIdentifier())) {
// set the password on the callback. This will be compared to
the
// password which was sent from the client.
pc.setPassword("pwd");
diff --git
a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PortTypeVisitor.java
b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PortTypeVisitor.java
index 0b58c9d..5e9be17 100644
---
a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PortTypeVisitor.java
+++
b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PortTypeVisitor.java
@@ -81,7 +81,7 @@ public class PortTypeVisitor extends VisitorBase {
AST identifierNode = node.getFirstChild();
- if (identifierNode.getText().equals("local")) {
+ if ("local".equals(identifierNode.getText())) {
identifierNode = identifierNode.getNextSibling();
}
// Check if its a forward declaration
diff --git
a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java
b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java
index ea968a3..e6050ad 100644
---
a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java
+++
b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java
@@ -139,7 +139,7 @@ public class WSDLSchemaManager {
}
public void addWSDLDefinitionImport(Definition rootDefn, Definition defn,
String prefix, File file) {
- if (rootDefn.getImports().get(defn.getTargetNamespace()) == null &&
!file.getName().equals(".wsdl")) {
+ if (rootDefn.getImports().get(defn.getTargetNamespace()) == null &&
!".wsdl".equals(file.getName())) {
// Only import if not already done to prevent multiple imports of
the same file
// in the WSDL. Also watch out for empty fileNames, which by this
point in the
// code would show up as ".wsdl".
diff --git
a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java
b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java
index 4637533..640fc49 100644
---
a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java
+++
b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java
@@ -305,7 +305,7 @@ public final class WSDLParameter {
if (!outputs.isEmpty()) {
ParamType d2 = outputs.get(0);
- if (d2.getMode().value().equals("out")) {
+ if ("out".equals(d2.getMode().value())) {
ArgType argType = new ArgType();
argType.setName(d2.getName());
argType.setIdltype(d2.getIdltype());
@@ -320,13 +320,13 @@ public final class WSDLParameter {
while (inputit.hasNext()) {
ParamType d2 = inputit.next();
- if (d2.getMode().value().equals("inout")) {
+ if ("inout".equals(d2.getMode().value())) {
ListIterator<ParamType> it = outputs.listIterator();
while (it.hasNext()) {
ParamType d3 = it.next();
- if (!d3.getName().equals(d2.getName()) && (!simpleOrdering)
- && (!d3.getMode().value().equals("inout"))) {
+ if (!d3.getName().equals(d2.getName()) && !simpleOrdering
+ && !"inout".equals(d3.getMode().value())) {
// the in/outs are in a different order in the
// output than the input
// we'll try and use the input oder for the INOUT's,
diff --git
a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
index 8da06ea..2772d5d 100644
---
a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
+++
b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
@@ -1150,7 +1150,7 @@ public class WSDLToCorbaHelper {
// Add base as a member of this struct
MemberType memberType = new MemberType();
memberType.setName(extName.getLocalPart() + "_f");
- if (extName.getLocalPart().equals("anyType")) {
+ if ("anyType".equals(extName.getLocalPart())) {
memberType.setIdltype(processPrimitiveType(extName).getQName());
} else {
memberType.setIdltype(createQNameCorbaNamespace(extName.getLocalPart()));
@@ -1415,20 +1415,20 @@ public class WSDLToCorbaHelper {
caselist.add(enumerator.getValue());
}
} else if
(SUPPORTEDDISTYPES.contains(disctype.getQName().getLocalPart())) {
- if (disctype.getQName().getLocalPart().equals("long")
- || disctype.getQName().getLocalPart().equals("short")) {
+ if ("long".equals(disctype.getQName().getLocalPart())
+ || "short".equals(disctype.getQName().getLocalPart())) {
for (int i = 0; i < fields.size(); i++) {
caselist.add(Integer.toString(i));
}
- } else if (disctype.getQName().getLocalPart().equals("char")) {
+ } else if ("char".equals(disctype.getQName().getLocalPart())) {
for (int i = 0; i < fields.size(); i++) {
caselist.add(Integer.toString(i));
}
- } else if (disctype.getQName().getLocalPart().equals("char")) {
+ } else if ("char".equals(disctype.getQName().getLocalPart())) {
for (int i = 0; i < fields.size(); i++) {
caselist.add(Integer.toString(i));
}
- } else if (disctype.getQName().getLocalPart().equals("boolean")) {
+ } else if ("boolean".equals(disctype.getQName().getLocalPart())) {
if (fields.size() == 2) {
caselist.add("TRUE");
caselist.add("FALSE");
diff --git
a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java
b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java
index b3131cf..a7d8b22 100644
---
a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java
+++
b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java
@@ -395,7 +395,7 @@ public class WSDLToIDLAction {
}
protected IdlType createType(QName idlType, String[] name, CorbaType
corbaType) throws Exception {
- if (idlType.getLocalPart().equals("CORBA.Object")) {
+ if ("CORBA.Object".equals(idlType.getLocalPart())) {
return IdlInterface.create(null, "Object");
}
@@ -424,7 +424,7 @@ public class WSDLToIDLAction {
// name array.
if ("CORBA".equals(dotScopedName.toString())
&& name.length == 2 && i == 0
- && name[1].equals("Object")) {
+ && "Object".equals(name[1])) {
break;
}
diff --git
a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java
b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java
index 595c400..8349a17 100644
---
a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java
+++
b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java
@@ -171,7 +171,7 @@ public class WSDLToCorbaBindingTest extends Assert {
private void checkSequenceType(BindingOperation bindingOperation,
Map<String, CorbaType> mapType) {
for (ExtensibilityElement extElement :
getExtensibilityElements(bindingOperation)) {
- if
(extElement.getElementType().getLocalPart().equals("operation")) {
+ if
("operation".equals(extElement.getElementType().getLocalPart())) {
OperationType corbaOpType = (OperationType)extElement;
assertEquals(corbaOpType.getName(), "op_h");
assertEquals(3, corbaOpType.getParam().size());
@@ -191,7 +191,7 @@ public class WSDLToCorbaBindingTest extends Assert {
assertEquals(bindingOperation.getBindingInput().getName(), "op_k");
assertEquals(bindingOperation.getBindingOutput().getName(),
"op_kResponse");
for (ExtensibilityElement extElement :
getExtensibilityElements(bindingOperation)) {
- if
(extElement.getElementType().getLocalPart().equals("operation")) {
+ if
("operation".equals(extElement.getElementType().getLocalPart())) {
OperationType corbaOpType = (OperationType)extElement;
assertEquals(corbaOpType.getName(), "op_k");
assertEquals(3, corbaOpType.getParam().size());
@@ -211,7 +211,7 @@ public class WSDLToCorbaBindingTest extends Assert {
private void checkFixedTypeTwo(BindingOperation bindingOperation,
Map<String, CorbaType> mapType) {
for (ExtensibilityElement extElement :
getExtensibilityElements(bindingOperation)) {
- if
(extElement.getElementType().getLocalPart().equals("operation")) {
+ if
("operation".equals(extElement.getElementType().getLocalPart())) {
OperationType corbaOpType = (OperationType)extElement;
assertEquals(corbaOpType.getName(), "op_m");
assertEquals(3, corbaOpType.getParam().size());
@@ -230,7 +230,7 @@ public class WSDLToCorbaBindingTest extends Assert {
private void checkFixedTypeThree(BindingOperation bindingOperation,
Map<String, CorbaType> mapType) {
for (ExtensibilityElement extElement :
getExtensibilityElements(bindingOperation)) {
- if
(extElement.getElementType().getLocalPart().equals("operation")) {
+ if
("operation".equals(extElement.getElementType().getLocalPart())) {
OperationType corbaOpType = (OperationType)extElement;
assertEquals(corbaOpType.getName(), "op_n");
assertEquals(3, corbaOpType.getParam().size());
@@ -249,7 +249,7 @@ public class WSDLToCorbaBindingTest extends Assert {
private void checkFixedTypeFour(BindingOperation bindingOperation,
Map<String, CorbaType> mapType) {
for (ExtensibilityElement extElement :
getExtensibilityElements(bindingOperation)) {
- if
(extElement.getElementType().getLocalPart().equals("operation")) {
+ if
("operation".equals(extElement.getElementType().getLocalPart())) {
OperationType corbaOpType = (OperationType)extElement;
assertEquals(corbaOpType.getName(), "extended_op_m");
assertEquals(3, corbaOpType.getParam().size());
@@ -368,7 +368,7 @@ public class WSDLToCorbaBindingTest extends Assert {
assertEquals(1, binding.getBindingOperations().size());
for (ExtensibilityElement extElement :
getExtensibilityElements(binding)) {
- if (extElement.getElementType().getLocalPart().equals("binding")) {
+ if ("binding".equals(extElement.getElementType().getLocalPart())) {
BindingType bindingType = (BindingType)extElement;
assertEquals(bindingType.getRepositoryID(),
"IDL:TestException/ExceptionTest:1.0");
}
@@ -397,7 +397,7 @@ public class WSDLToCorbaBindingTest extends Assert {
assertTrue("Did not get expected MyException", hasMyException);
for (ExtensibilityElement extElement :
getExtensibilityElements(bindingOperation)) {
- if
(extElement.getElementType().getLocalPart().equals("operation")) {
+ if
("operation".equals(extElement.getElementType().getLocalPart())) {
OperationType corbaOpType = (OperationType)extElement;
assertEquals(corbaOpType.getName(), "review_data");
assertEquals(1, corbaOpType.getParam().size());
@@ -439,7 +439,7 @@ public class WSDLToCorbaBindingTest extends Assert {
assertEquals(1, binding.getBindingOperations().size());
for (ExtensibilityElement extElement :
getExtensibilityElements(binding)) {
- if (extElement.getElementType().getLocalPart().equals("binding")) {
+ if ("binding".equals(extElement.getElementType().getLocalPart())) {
BindingType bindingType = (BindingType)extElement;
assertEquals(bindingType.getRepositoryID(),
"IDL:BasePortType:1.0");
}
@@ -453,7 +453,7 @@ public class WSDLToCorbaBindingTest extends Assert {
assertEquals(bindingOperation.getBindingOutput().getName(),
"echoStringResponse");
for (ExtensibilityElement extElement :
getExtensibilityElements(bindingOperation)) {
- if
(extElement.getElementType().getLocalPart().equals("operation")) {
+ if
("operation".equals(extElement.getElementType().getLocalPart())) {
OperationType corbaOpType = (OperationType)extElement;
assertEquals(corbaOpType.getName(), "echoString");
assertEquals(3, corbaOpType.getParam().size());
@@ -559,7 +559,7 @@ public class WSDLToCorbaBindingTest extends Assert {
List<ExtensibilityElement> extElements =
getExtensibilityElements(binding);
ExtensibilityElement extElement = extElements.get(0);
- if (extElement.getElementType().getLocalPart().equals("binding")) {
+ if ("binding".equals(extElement.getElementType().getLocalPart())) {
BindingType bindingType = (BindingType)extElement;
assertEquals(bindingType.getRepositoryID(),
"IDL:Test/MultiPart:1.0");
}
@@ -602,7 +602,7 @@ public class WSDLToCorbaBindingTest extends Assert {
assertEquals(bindingOp.getBindingInput().getName(),
"_get_string_attribute");
assertEquals(bindingOp.getBindingOutput().getName(),
"_get_string_attributeResponse");
for (ExtensibilityElement extElement :
getExtensibilityElements(bindingOp)) {
- if
(extElement.getElementType().getLocalPart().equals("operation")) {
+ if
("operation".equals(extElement.getElementType().getLocalPart())) {
OperationType corbaOpType = (OperationType)extElement;
assertEquals(corbaOpType.getName(), "_get_string_attribute");
assertEquals(corbaOpType.getReturn().getName(), "return");
@@ -619,7 +619,7 @@ public class WSDLToCorbaBindingTest extends Assert {
assertEquals(bindingOp.getBindingInput().getName(), "_get_test_id");
assertEquals(bindingOp.getBindingOutput().getName(),
"_get_test_idResponse");
for (ExtensibilityElement extElement :
getExtensibilityElements(bindingOp)) {
- if
(extElement.getElementType().getLocalPart().equals("operation")) {
+ if
("operation".equals(extElement.getElementType().getLocalPart())) {
OperationType corbaOpType = (OperationType)extElement;
assertEquals(corbaOpType.getName(), "_get_test_id");
assertEquals(corbaOpType.getReturn().getName(), "return");
@@ -636,7 +636,7 @@ public class WSDLToCorbaBindingTest extends Assert {
assertEquals(bindingOp.getBindingInput().getName(), "_set_test_id");
assertEquals(bindingOp.getBindingOutput().getName(),
"_set_test_idResponse");
for (ExtensibilityElement extElement :
getExtensibilityElements(bindingOp)) {
- if
(extElement.getElementType().getLocalPart().equals("operation")) {
+ if
("operation".equals(extElement.getElementType().getLocalPart())) {
OperationType corbaOpType = (OperationType)extElement;
assertEquals(corbaOpType.getName(), "_set_test_id");
assertEquals(1, corbaOpType.getParam().size());
@@ -655,7 +655,7 @@ public class WSDLToCorbaBindingTest extends Assert {
assertEquals(bindingOp.getBindingInput().getName(), "test_void");
assertEquals(bindingOp.getBindingOutput().getName(),
"test_voidResponse");
for (ExtensibilityElement extElement :
getExtensibilityElements(bindingOp)) {
- if
(extElement.getElementType().getLocalPart().equals("operation")) {
+ if
("operation".equals(extElement.getElementType().getLocalPart())) {
OperationType corbaOpType = (OperationType)extElement;
assertEquals(corbaOpType.getName(), "test_void");
assertEquals(0, corbaOpType.getParam().size());
@@ -671,7 +671,7 @@ public class WSDLToCorbaBindingTest extends Assert {
assertEquals(bindingOp.getBindingInput().getName(), name);
assertEquals(bindingOp.getBindingOutput().getName(), name +
"Response");
for (ExtensibilityElement extElement :
getExtensibilityElements(bindingOp)) {
- if
(extElement.getElementType().getLocalPart().equals("operation")) {
+ if
("operation".equals(extElement.getElementType().getLocalPart())) {
OperationType corbaOpType = (OperationType)extElement;
assertEquals(corbaOpType.getName(), name);
assertEquals(3, corbaOpType.getParam().size());
@@ -705,7 +705,7 @@ public class WSDLToCorbaBindingTest extends Assert {
assertEquals(1, binding.getBindingOperations().size());
for (ExtensibilityElement extElement :
getExtensibilityElements(binding)) {
- if
(extElement.getElementType().getLocalPart().equals("binding")) {
+ if
("binding".equals(extElement.getElementType().getLocalPart())) {
BindingType bindingType = (BindingType)extElement;
assertEquals(bindingType.getRepositoryID(), "IDL:X:1.0");
}
@@ -719,7 +719,7 @@ public class WSDLToCorbaBindingTest extends Assert {
assertEquals(bindingOperation.getBindingOutput().getName(),
"op_aResponse");
for (ExtensibilityElement extElement :
getExtensibilityElements(bindingOperation)) {
- if
(extElement.getElementType().getLocalPart().equals("operation")) {
+ if
("operation".equals(extElement.getElementType().getLocalPart())) {
OperationType corbaOpType = (OperationType)extElement;
assertEquals(corbaOpType.getName(), "op_a");
assertEquals(1, corbaOpType.getParam().size());
@@ -766,7 +766,7 @@ public class WSDLToCorbaBindingTest extends Assert {
assertEquals(1, binding.getBindingOperations().size());
for (ExtensibilityElement extElement:
getExtensibilityElements(binding)) {
- if
(extElement.getElementType().getLocalPart().equals("binding")) {
+ if
("binding".equals(extElement.getElementType().getLocalPart())) {
BindingType bindingType = (BindingType)extElement;
assertEquals(bindingType.getRepositoryID(), "IDL:X:1.0");
}
@@ -794,7 +794,7 @@ public class WSDLToCorbaBindingTest extends Assert {
assertEquals(bindingOperation.getBindingOutput().getName(),
"op_aResponse");
for (ExtensibilityElement extElement:
getExtensibilityElements(bindingOperation)) {
- if
(extElement.getElementType().getLocalPart().equals("operation")) {
+ if
("operation".equals(extElement.getElementType().getLocalPart())) {
OperationType corbaOpType = (OperationType)extElement;
assertEquals(corbaOpType.getName(), "op_a");
assertEquals(1, corbaOpType.getParam().size());
@@ -805,7 +805,7 @@ public class WSDLToCorbaBindingTest extends Assert {
"MixedArrayType", "ns1");
assertEquals(paramtype.getIdltype(), idltype);
assertEquals(paramtype.getMode().toString(), "IN");
- } else if
(extElement.getElementType().getLocalPart().equals("typeMapping")) {
+ } else if
("typeMapping".equals(extElement.getElementType().getLocalPart())) {
System.out.println("x");
}
}
diff --git
a/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/WSDLGenerationTester.java
b/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/WSDLGenerationTester.java
index 3aa5800..4b43b0c 100644
---
a/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/WSDLGenerationTester.java
+++
b/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/WSDLGenerationTester.java
@@ -94,8 +94,8 @@ public class WSDLGenerationTester {
int actualAttrCount = actual.getAttributeCount();
for (int i = 0; i < origAttrCount; i++) {
QName origAttrName = orig.getAttributeName(i);
- if ((origAttrName.getLocalPart().equals("location"))
- || (origAttrName.getLocalPart().equals("schemaLocation"))) {
+ if ("location".equals(origAttrName.getLocalPart())
+ || "schemaLocation".equals(origAttrName.getLocalPart())) {
//skip this atribute
origAttrCount--;
} else {
@@ -116,8 +116,8 @@ public class WSDLGenerationTester {
}
for (int i = 0; i < actualAttrCount; i++) {
QName actualAttrName = actual.getAttributeName(i);
- if ((actualAttrName.getLocalPart().equals("location"))
- || (actualAttrName.getLocalPart().equals("schemaLocation"))) {
+ if ("location".equals(actualAttrName.getLocalPart())
+ || "schemaLocation".equals(actualAttrName.getLocalPart())) {
//skip this atribute
actualAttrCount--;
}
diff --git
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java
index 1f9d3f0..3dbb7f6 100644
---
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java
+++
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java
@@ -172,7 +172,7 @@ public class JAXWSFrontEndProcessor implements Processor {
private boolean isImplRmiRemote(Class<?> claz) {
for (Method method : claz.getMethods()) {
if (Modifier.isPublic(method.getModifiers()) &&
!Modifier.isStatic(method.getModifiers())
- &&
!method.getDeclaringClass().getName().equals("java.lang.Object")) {
+ &&
!"java.lang.Object".equals(method.getDeclaringClass().getName())) {
Class<?>[] paraClasses = method.getParameterTypes();
for (Class<?> clz : paraClasses) {
getInfClass(clz);
diff --git
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
index f2a0654..35a0a26 100644
---
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
+++
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
@@ -452,11 +452,11 @@ public final class CustomizationParser {
private boolean isGlobaleBindings(Element binding) {
boolean globleNode =
binding.getNamespaceURI().equals(ToolConstants.NS_JAXWS_BINDINGS)
- && binding.getLocalName().equals("package")
- ||
binding.getLocalName().equals("enableAsyncMapping")
- ||
binding.getLocalName().equals("enableAdditionalSOAPHeaderMapping")
- ||
binding.getLocalName().equals("enableWrapperStyle")
- ||
binding.getLocalName().equals("enableMIMEContent");
+ && "package".equals(binding.getLocalName())
+ ||
"enableAsyncMapping".equals(binding.getLocalName())
+ ||
"enableAdditionalSOAPHeaderMapping".equals(binding.getLocalName())
+ ||
"enableWrapperStyle".equals(binding.getLocalName())
+ ||
"enableMIMEContent".equals(binding.getLocalName());
Node parentNode = binding.getParentNode();
if (parentNode instanceof Element) {
Element ele = (Element)parentNode;
diff --git
a/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessorTest.java
b/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessorTest.java
index 3baa636..69d1ff7 100644
---
a/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessorTest.java
+++
b/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessorTest.java
@@ -78,7 +78,7 @@ public class WSDLToServiceProcessorTest extends
ProcessorTestBase {
if (obj instanceof SOAPAddress) {
SOAPAddress soapAddress = (SOAPAddress)obj;
if (soapAddress.getLocationURI() != null
- &&
soapAddress.getLocationURI().equals("http://localhost:9000/newservice/newport";))
{
+ &&
"http://localhost:9000/newservice/newport".equals(soapAddress.getLocationURI()))
{
found = true;
break;
}
@@ -168,7 +168,7 @@ public class WSDLToServiceProcessorTest extends
ProcessorTestBase {
if (obj instanceof SOAPAddress) {
SOAPAddress soapAddress = (SOAPAddress)obj;
if (soapAddress.getLocationURI() != null
- &&
soapAddress.getLocationURI().equals("http://localhost:9000/serviceins/portins";))
{
+ &&
"http://localhost:9000/serviceins/portins".equals(soapAddress.getLocationURI()))
{
found = true;
break;
}
diff --git
a/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessorTest.java
b/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessorTest.java
index 5817ca0..ccf1e24 100644
---
a/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessorTest.java
+++
b/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessorTest.java
@@ -84,7 +84,7 @@ public class WSDLToXMLProcessorTest extends ProcessorTestBase
{
found = false;
for (Object obj : bo.getBindingInput().getExtensibilityElements()) {
if (obj instanceof XMLBindingMessageFormat
- &&
((XMLBindingMessageFormat)obj).getRootNode().getLocalPart().equals("sayHi")) {
+ &&
"sayHi".equals(((XMLBindingMessageFormat)obj).getRootNode().getLocalPart())) {
found = true;
break;
}
diff --git
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
index 2517a28..0b148ca 100644
---
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
+++
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
@@ -929,7 +929,7 @@ public class CodeGenBugTest extends AbstractCodeGenTest {
boolean existSayHiAsyn = false;
for (Method m : methods) {
- if (m.getName().equals("sayHiAsyn")) {
+ if ("sayHiAsyn".equals(m.getName())) {
existSayHiAsyn = true;
}
}
diff --git
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java
index 2862ba1..fd6dd77 100644
---
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java
+++
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java
@@ -123,7 +123,7 @@ public class JAXWSContainerTest extends ProcessorTestBase {
assertEquals(6, methods.size());
Boolean methodSame = false;
for (JavaMethod m1 : methods) {
- if (m1.getName().equals("testDocLitFault")) {
+ if ("testDocLitFault".equals(m1.getName())) {
methodSame = true;
break;
}
@@ -182,7 +182,7 @@ public class JAXWSContainerTest extends ProcessorTestBase {
Boolean methodSame = false;
JavaMethod m1 = null;
for (JavaMethod m2 : methods) {
- if (m2.getName().equals("testDocLitFault")) {
+ if ("testDocLitFault".equals(m2.getName())) {
methodSame = true;
m1 = m2;
break;
