You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2012/10/18 16:37:29 UTC
svn commit: r1399678 - in /cxf/trunk:
api/src/main/java/org/apache/cxf/interceptor/
rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/
rt/frontend/jaxws/src/main/java/org/apache/c...
Author: coheigea
Date: Thu Oct 18 14:37:29 2012
New Revision: 1399678
URL: http://svn.apache.org/viewvc?rev=1399678&view=rev
Log:
More cleanup work
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java
cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SymmetricKeyHandler.java
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java?rev=1399678&r1=1399677&r2=1399678&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java Thu Oct 18 14:37:29 2012
@@ -207,7 +207,7 @@ public abstract class AbstractInDatabind
ex.setOneWay(operation.getOperationInfo().isOneWay());
//Set standard MessageContext properties required by JAX_WS, but not specific to JAX_WS.
- boolean synthetic = operation.getProperty("operation.is.synthetic") == Boolean.TRUE;
+ boolean synthetic = Boolean.TRUE.equals(operation.getProperty("operation.is.synthetic"));
if (!synthetic) {
message.put(Message.WSDL_OPERATION, operation.getName());
}
Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java?rev=1399678&r1=1399677&r2=1399678&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java Thu Oct 18 14:37:29 2012
@@ -164,7 +164,7 @@ public class SAAJInInterceptor extends A
return;
}
Boolean bodySet = (Boolean)message.get(BODY_FILLED_IN);
- if (bodySet != null && bodySet == Boolean.TRUE) {
+ if (Boolean.TRUE.equals(bodySet)) {
return;
}
message.put(BODY_FILLED_IN, Boolean.TRUE);
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java?rev=1399678&r1=1399677&r2=1399678&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java Thu Oct 18 14:37:29 2012
@@ -43,7 +43,7 @@ import org.apache.cxf.jaxrs.utils.HttpUt
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.PhaseInterceptorChain;
-public final class ResponseBuilderImpl extends ResponseBuilder {
+public final class ResponseBuilderImpl extends ResponseBuilder implements Cloneable {
private int status = 200;
private Object entity;
private MultivaluedMap<String, Object> metadata = new MetadataMap<String, Object>();
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java?rev=1399678&r1=1399677&r2=1399678&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java Thu Oct 18 14:37:29 2012
@@ -41,7 +41,7 @@ import org.apache.cxf.jaxrs.model.URITem
import org.apache.cxf.jaxrs.utils.HttpUtils;
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
-public class UriBuilderImpl extends UriBuilder {
+public class UriBuilderImpl extends UriBuilder implements Cloneable {
private String scheme;
private String userInfo;
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java?rev=1399678&r1=1399677&r2=1399678&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java Thu Oct 18 14:37:29 2012
@@ -258,7 +258,7 @@ public class WrappedMessageContext imple
}
} else if (Message.WSDL_OPERATION.equals(key)) {
BindingOperationInfo boi = getBindingOperationInfo(exchange);
- if (boi != null && boi.getProperty("operation.is.synthetic") != Boolean.TRUE) {
+ if (boi != null && !Boolean.TRUE.equals(boi.getProperty("operation.is.synthetic"))) {
ret = boi.getName();
}
} else if (Message.WSDL_SERVICE.equals(key)) {
Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java?rev=1399678&r1=1399677&r2=1399678&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java Thu Oct 18 14:37:29 2012
@@ -97,7 +97,7 @@ public class FormattedServiceListWriter
+ sd.getEndpointInfo().getInterface().getName().getLocalPart() + "</span>");
writer.write("<ul>");
for (OperationInfo oi : sd.getEndpointInfo().getInterface().getOperations()) {
- if (oi.getProperty("operation.is.synthetic") != Boolean.TRUE) {
+ if (!Boolean.TRUE.equals(oi.getProperty("operation.is.synthetic"))) {
writer.write("<li>" + oi.getName().getLocalPart() + "</li>");
}
}
Modified: cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SymmetricKeyHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SymmetricKeyHandler.java?rev=1399678&r1=1399677&r2=1399678&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SymmetricKeyHandler.java (original)
+++ cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SymmetricKeyHandler.java Thu Oct 18 14:37:29 2012
@@ -133,7 +133,7 @@ public class SymmetricKeyHandler {
if (((long)secretValue.length * 8L) < signatureProperties.getMinimumKeySize()
|| ((long)secretValue.length * 8L) > signatureProperties.getMaximumKeySize()) {
LOG.log(
- Level.WARNING, "Received secret of length " + secret.length
+ Level.WARNING, "Received secret of length " + secretValue.length
+ " bits is not accepted"
);
LOG.log(Level.WARNING, "User Entropy rejected");