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 2017/02/14 09:49:47 UTC
[42/51] [partial] cxf git commit: Remove all trailing whitespaces
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/DeferredConduitSelector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/DeferredConduitSelector.java b/core/src/main/java/org/apache/cxf/endpoint/DeferredConduitSelector.java
index 006f87c..b723e77 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/DeferredConduitSelector.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/DeferredConduitSelector.java
@@ -26,24 +26,24 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.transport.Conduit;
/**
- * Strategy for lazy deferred retreival of a Conduit to mediate an
+ * Strategy for lazy deferred retreival of a Conduit to mediate an
* outbound message.
*/
public class DeferredConduitSelector extends AbstractConduitSelector {
-
+
private static final Logger LOG =
LogUtils.getL7dLogger(DeferredConduitSelector.class);
-
+
/**
* Normal constructor.
*/
public DeferredConduitSelector() {
super();
}
-
+
/**
* Constructor, allowing a specific conduit to override normal selection.
- *
+ *
* @param c specific conduit
*/
public DeferredConduitSelector(Conduit c) {
@@ -52,7 +52,7 @@ public class DeferredConduitSelector extends AbstractConduitSelector {
/**
* Called prior to the interceptor chain being traversed.
- *
+ *
* @param message the current Message
*/
public void prepare(Message message) {
@@ -61,7 +61,7 @@ public class DeferredConduitSelector extends AbstractConduitSelector {
/**
* Called when a Conduit is actually required.
- *
+ *
* @param message
* @return the Conduit to use for mediation of the message
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/Endpoint.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/Endpoint.java b/core/src/main/java/org/apache/cxf/endpoint/Endpoint.java
index d88e51e..ee16b84 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/Endpoint.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/Endpoint.java
@@ -32,36 +32,36 @@ import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.MessageObserver;
/**
- * Represents an endpoint that receives messages.
+ * Represents an endpoint that receives messages.
*
*/
public interface Endpoint extends Map<String, Object>, InterceptorProvider {
EndpointInfo getEndpointInfo();
-
+
Binding getBinding();
-
+
Service getService();
void setExecutor(Executor executor);
-
+
Executor getExecutor();
-
+
MessageObserver getInFaultObserver();
-
+
MessageObserver getOutFaultObserver();
-
+
void setInFaultObserver(MessageObserver observer);
-
+
void setOutFaultObserver(MessageObserver observer);
List<Feature> getActiveFeatures();
-
+
/**
* Add a hook that will be called when this end point being terminated.
* This will be called prior to the Server/ClientLifecycleListener.*Destroyed()
* method is called. This provides an opportunity to cleanup any resources
- * that are specific to this Endpoint.
+ * that are specific to this Endpoint.
* @param c
*/
void addCleanupHook(Closeable c);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java b/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java
index 9aec397..b726a2c 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java
@@ -70,12 +70,12 @@ public class EndpointImpl extends AbstractAttributedInterceptorProvider implemen
public EndpointImpl(Bus bus, Service s, QName endpointName) throws EndpointException {
this(bus, s, s.getEndpointInfo(endpointName));
}
-
+
public EndpointImpl(Bus bus, Service s, EndpointInfo ei) throws EndpointException {
if (ei == null) {
throw new NullPointerException("EndpointInfo can not be null!");
}
-
+
if (bus == null) {
this.bus = BusFactory.getThreadDefaultBus();
} else {
@@ -85,7 +85,7 @@ public class EndpointImpl extends AbstractAttributedInterceptorProvider implemen
endpointInfo = ei;
createBinding(endpointInfo.getBinding());
-
+
inFaultObserver = new InFaultChainInitiatorObserver(bus);
outFaultObserver = new OutFaultChainInitiatorObserver(bus);
@@ -93,12 +93,12 @@ public class EndpointImpl extends AbstractAttributedInterceptorProvider implemen
getOutInterceptors().add(new MessageSenderInterceptor());
getOutFaultInterceptors().add(new MessageSenderInterceptor());
}
-
+
public String getBeanName() {
return endpointInfo.getName().toString() + ".endpoint";
}
-
-
+
+
public EndpointInfo getEndpointInfo() {
return endpointInfo;
}
@@ -141,9 +141,9 @@ public class EndpointImpl extends AbstractAttributedInterceptorProvider implemen
} catch (BusException ex) {
throw new EndpointException(ex);
}
- }
+ }
}
-
+
public MessageObserver getInFaultObserver() {
return inFaultObserver;
@@ -154,23 +154,23 @@ public class EndpointImpl extends AbstractAttributedInterceptorProvider implemen
}
public void setInFaultObserver(MessageObserver observer) {
- inFaultObserver = observer;
+ inFaultObserver = observer;
}
public void setOutFaultObserver(MessageObserver observer) {
outFaultObserver = observer;
-
+
}
-
+
/**
* Utility method to make it easy to set properties from Spring.
- *
+ *
* @param properties
*/
public void setProperties(Map<String, Object> properties) {
this.putAll(properties);
}
-
+
/**
* @return the list of features <b>already</b> activated for this endpoint.
*/
@@ -193,10 +193,10 @@ public class EndpointImpl extends AbstractAttributedInterceptorProvider implemen
if (!(obj instanceof EndpointImpl)) {
return false;
}
-
+
return super.equals(obj);
}
-
+
/**
* Returns the hashCode based on the EndpointInfo so that this object
* can be used as a map key.
@@ -205,7 +205,7 @@ public class EndpointImpl extends AbstractAttributedInterceptorProvider implemen
public int hashCode() {
return endpointInfo.hashCode();
}
-
+
public synchronized void addCleanupHook(Closeable c) {
if (cleanupHooks == null) {
cleanupHooks = new CopyOnWriteArrayList<Closeable>();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/EndpointImplFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/EndpointImplFactory.java b/core/src/main/java/org/apache/cxf/endpoint/EndpointImplFactory.java
index ac19120..56a23bd 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/EndpointImplFactory.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/EndpointImplFactory.java
@@ -25,7 +25,7 @@ import org.apache.cxf.service.model.EndpointInfo;
/**
* This interface defines an object that can create EndpointImpl
- * objects.
+ * objects.
*/
public interface EndpointImplFactory {
/**
@@ -34,6 +34,6 @@ public interface EndpointImplFactory {
* @param service
* @param endpointInfo
*/
- EndpointImpl newEndpointImpl(Bus bus, Service service,
+ EndpointImpl newEndpointImpl(Bus bus, Service service,
EndpointInfo endpointInfo) throws EndpointException;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/EndpointResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/EndpointResolver.java b/core/src/main/java/org/apache/cxf/endpoint/EndpointResolver.java
index a505110..826b1f8 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/EndpointResolver.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/EndpointResolver.java
@@ -54,18 +54,18 @@ public interface EndpointResolver {
*/
EndpointReferenceType renew(EndpointReferenceType logical,
EndpointReferenceType physical);
-
+
/**
* Mint a new abstract EPR for a given service name.
- *
+ *
* @param serviceName
* @return the newly minted EPR if appropriate, null otherwise
*/
EndpointReferenceType mint(QName serviceName);
-
+
/**
* Mint a new abstract EPR for a given concrete EPR
- *
+ *
* @param physical
* @return the newly minted EPR if appropriate, null otherwise
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/EndpointResolverRegistry.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/EndpointResolverRegistry.java b/core/src/main/java/org/apache/cxf/endpoint/EndpointResolverRegistry.java
index 4cdedc3..7989577 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/EndpointResolverRegistry.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/EndpointResolverRegistry.java
@@ -57,43 +57,43 @@ public interface EndpointResolverRegistry {
* This API is used by any actor that requires a concrete EPR (e.g.
* a transport-level Conduit), and must be called each and every
* time the EPR content is to be accessed (e.g. before each connection
- * establishment attempt).
+ * establishment attempt).
*
* @param logical the abstract EPR to resolve
*/
EndpointReferenceType resolve(EndpointReferenceType logical);
/**
- * Walk the list of registered EndpointResolvers, so as to force a fresh
- * resolution of the given abstract EPR, discarding any previously cached
+ * Walk the list of registered EndpointResolvers, so as to force a fresh
+ * resolution of the given abstract EPR, discarding any previously cached
* reference.
* <p>
* This API may be used by say the transport-level Conduit when it
* detects a non-transient error on the outgoing connection, or
* by any other actor in the dispatch with the ability to infer
* server-side unavailability.
- *
+ *
* @param logical the previously resolved abstract EPR
* @param physical the concrete EPR to refresh
* @return the renewed concrete EPR if appropriate, null otherwise
*/
EndpointReferenceType renew(EndpointReferenceType logical,
EndpointReferenceType physical);
-
+
/**
- * Walk the list of registered EndpointResolvers, so as to mint a new
+ * Walk the list of registered EndpointResolvers, so as to mint a new
* abstract EPR for a given service name.
- *
- * @param serviceName
+ *
+ * @param serviceName
* @return the newly minted EPR if appropriate, null otherwise
*/
EndpointReferenceType mint(QName serviceName);
-
+
/**
- * Walk the list of registered EndpointResolvers, so as to mint a new
+ * Walk the list of registered EndpointResolvers, so as to mint a new
* abstract EPR for a gievn physical EPR.
- *
- * @param physical
+ *
+ * @param physical
* @return the newly minted EPR if appropriate, null otherwise
*/
EndpointReferenceType mint(EndpointReferenceType physical);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java b/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java
index 165f3b7..b0d0277 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java
@@ -30,7 +30,7 @@ import org.apache.cxf.management.annotation.ManagedAttribute;
import org.apache.cxf.management.annotation.ManagedOperation;
import org.apache.cxf.management.annotation.ManagedResource;
-@ManagedResource(componentName = "Endpoint",
+@ManagedResource(componentName = "Endpoint",
description = "Responsible for managing server instances.")
public class ManagedEndpoint implements ManagedComponent, ServerLifeCycleListener {
@@ -41,17 +41,17 @@ public class ManagedEndpoint implements ManagedComponent, ServerLifeCycleListene
protected final Bus bus;
protected final Endpoint endpoint;
protected final Server server;
-
+
private enum State { CREATED, STARTED, STOPPED };
private State state = State.CREATED;
-
+
public ManagedEndpoint(Bus b, Endpoint ep, Server s) {
bus = b;
endpoint = ep;
server = s;
}
- @ManagedOperation
+ @ManagedOperation
public void start() {
if (state == State.STARTED) {
return;
@@ -62,12 +62,12 @@ public class ManagedEndpoint implements ManagedComponent, ServerLifeCycleListene
}
server.start();
}
-
+
@ManagedOperation
public void stop() {
server.stop();
}
-
+
@ManagedOperation
public void destroy() {
server.destroy();
@@ -77,24 +77,24 @@ public class ManagedEndpoint implements ManagedComponent, ServerLifeCycleListene
public String getAddress() {
return endpoint.getEndpointInfo().getAddress();
}
-
+
@ManagedAttribute(description = "TransportId Attribute", currencyTimeLimit = 60)
public String getTransportId() {
return endpoint.getEndpointInfo().getTransportId();
}
-
+
@ManagedAttribute(description = "Server State")
public String getState() {
return state.toString();
}
-
+
public ObjectName getObjectName() throws JMException {
String busId = bus.getId();
StringBuilder buffer = new StringBuilder();
buffer.append(ManagementConstants.DEFAULT_DOMAIN_NAME).append(':');
buffer.append(ManagementConstants.BUS_ID_PROP).append('=').append(busId).append(',');
buffer.append(ManagementConstants.TYPE_PROP).append('=').append("Bus.Service.Endpoint,");
-
+
String serviceName = (String)endpoint.get(SERVICE_NAME);
if (StringUtils.isEmpty(serviceName)) {
@@ -102,8 +102,8 @@ public class ManagedEndpoint implements ManagedComponent, ServerLifeCycleListene
}
serviceName = ObjectName.quote(serviceName);
buffer.append(ManagementConstants.SERVICE_NAME_PROP).append('=').append(serviceName).append(',');
-
-
+
+
String endpointName = (String)endpoint.get(ENDPOINT_NAME);
if (StringUtils.isEmpty(endpointName)) {
endpointName = endpoint.getEndpointInfo().getName().getLocalPart();
@@ -116,14 +116,14 @@ public class ManagedEndpoint implements ManagedComponent, ServerLifeCycleListene
}
// Added the instance id to make the ObjectName unique
buffer.append(ManagementConstants.INSTANCE_ID_PROP).append('=').append(instanceId);
-
+
//Use default domain name of server
return new ObjectName(buffer.toString());
}
public void startServer(Server s) {
if (server.equals(s)) {
- state = State.STARTED;
+ state = State.STARTED;
}
}
@@ -133,7 +133,7 @@ public class ManagedEndpoint implements ManagedComponent, ServerLifeCycleListene
// unregister server to avoid the memory leak
ServerLifeCycleManager mgr = bus.getExtension(ServerLifeCycleManager.class);
if (mgr != null) {
- mgr.unRegisterListener(this);
+ mgr.unRegisterListener(this);
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/NullConduitSelector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/NullConduitSelector.java b/core/src/main/java/org/apache/cxf/endpoint/NullConduitSelector.java
index 5fffa9b..f06763a 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/NullConduitSelector.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/NullConduitSelector.java
@@ -25,19 +25,19 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.transport.Conduit;
/**
- * Strategy for null Conduit retrieval.
+ * Strategy for null Conduit retrieval.
* An instance of this class is set on the Exchange to clear
- * the current ConduitSelector, as a work-around for broken
+ * the current ConduitSelector, as a work-around for broken
* Exchange.remove(ConduitSelector.class) semantics.
*/
@NoJSR250Annotations
public class NullConduitSelector implements ConduitSelector {
private Endpoint endpoint;
-
+
/**
* Called prior to the interceptor chain being traversed.
- *
+ *
* @param message the current Message
*/
public void prepare(Message message) {
@@ -46,7 +46,7 @@ public class NullConduitSelector implements ConduitSelector {
/**
* Called when a Conduit is actually required.
- *
+ *
* @param message
* @return the Conduit to use for mediation of the message
*/
@@ -56,13 +56,13 @@ public class NullConduitSelector implements ConduitSelector {
/**
* Called on completion of the MEP for which the Conduit was required.
- *
+ *
* @param exchange represents the completed MEP
*/
public void complete(Exchange exchange) {
// nothing to do
}
-
+
/**
* @return the encapsulated Endpoint
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/PreexistingConduitSelector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/PreexistingConduitSelector.java b/core/src/main/java/org/apache/cxf/endpoint/PreexistingConduitSelector.java
index 1326f7d..e402875 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/PreexistingConduitSelector.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/PreexistingConduitSelector.java
@@ -29,7 +29,7 @@ import org.apache.cxf.transport.MessageObserver;
/**
- * Strategy for retreival of a pre-existing Conduit to mediate an
+ * Strategy for retreival of a pre-existing Conduit to mediate an
* outbound message.
*/
public class PreexistingConduitSelector implements
@@ -40,16 +40,16 @@ public class PreexistingConduitSelector implements
/**
* Constructor.
- *
+ *
* @param c the pre-existing Conduit.
*/
public PreexistingConduitSelector(Conduit c) {
this(c, null);
}
-
+
/**
* Constructor.
- *
+ *
* @param c the pre-existing Conduit.
* @param e the target Endpoint
*/
@@ -60,11 +60,11 @@ public class PreexistingConduitSelector implements
/**
* Called prior to the interceptor chain being traversed.
- *
+ *
* @param message the current Message
*/
public void prepare(Message message) {
- MessageObserver observer =
+ MessageObserver observer =
message.getExchange().get(MessageObserver.class);
if (observer != null) {
selectedConduit.setMessageObserver(observer);
@@ -73,7 +73,7 @@ public class PreexistingConduitSelector implements
/**
* Called when a Conduit is actually required.
- *
+ *
* @param message
* @return the Conduit to use for mediation of the message
*/
@@ -83,7 +83,7 @@ public class PreexistingConduitSelector implements
/**
* Called on completion of the MEP for which the Conduit was required.
- *
+ *
* @param exchange represents the completed MEP
*/
public void complete(Exchange exchange) {
@@ -95,7 +95,7 @@ public class PreexistingConduitSelector implements
//IGNORE
}
}
-
+
/**
* @return the encapsulated Endpoint
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/Retryable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/Retryable.java b/core/src/main/java/org/apache/cxf/endpoint/Retryable.java
index 775394c..519c31d 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/Retryable.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/Retryable.java
@@ -29,7 +29,7 @@ import org.apache.cxf.service.model.BindingOperationInfo;
*/
public interface Retryable {
Object[] invoke(BindingOperationInfo oi,
- Object[] params,
+ Object[] params,
Map<String, Object> context,
Exchange exchange) throws Exception;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/Server.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/Server.java b/core/src/main/java/org/apache/cxf/endpoint/Server.java
index d5d2981..42fc2ec 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/Server.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/Server.java
@@ -24,14 +24,14 @@ import org.apache.cxf.transport.Destination;
public interface Server {
void start();
-
+
void stop();
-
+
void destroy();
-
+
boolean isStarted();
-
+
Destination getDestination();
-
+
Endpoint getEndpoint();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java b/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
index 5180594..dea9686 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
@@ -39,7 +39,7 @@ import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.transport.MultipleEndpointObserver;
public class ServerImpl implements Server {
- private static final Logger LOG = LogUtils.getL7dLogger(ServerImpl.class);
+ private static final Logger LOG = LogUtils.getL7dLogger(ServerImpl.class);
protected final Endpoint endpoint;
protected final Bus bus;
@@ -52,22 +52,22 @@ public class ServerImpl implements Server {
private ManagedEndpoint mep;
private boolean stopped = true;
- public ServerImpl(Bus bus,
- Endpoint endpoint,
- DestinationFactory destinationFactory,
+ public ServerImpl(Bus bus,
+ Endpoint endpoint,
+ DestinationFactory destinationFactory,
BindingFactory bindingFactory) throws BusException, IOException {
this.endpoint = endpoint;
this.bus = bus;
this.bindingFactory = bindingFactory;
-
+
initDestination(destinationFactory);
}
private void initDestination(DestinationFactory destinationFactory) throws BusException, IOException {
EndpointInfo ei = endpoint.getEndpointInfo();
-
+
//Treat local transport as a special case, transports loaded by transportId can be replaced
- //by local transport when the publishing address is a local transport protocol.
+ //by local transport when the publishing address is a local transport protocol.
//Of course its not an ideal situation here to use a hard-coded prefix. To be refactored.
if (destinationFactory == null) {
if (ei.getAddress() != null && ei.getAddress().indexOf("local://") != -1) {
@@ -80,20 +80,20 @@ public class ServerImpl implements Server {
.getDestinationFactory(ei.getTransportId());
}
}
-
+
destination = destinationFactory.getDestination(ei, bus);
LOG.info("Setting the server's publish address to be " + ei.getAddress());
serverRegistry = bus.getExtension(ServerRegistry.class);
-
+
mep = createManagedEndpoint();
-
+
slcMgr = bus.getExtension(ServerLifeCycleManager.class);
if (slcMgr != null) {
slcMgr.registerListener(mep);
}
-
- iMgr = bus.getExtension(InstrumentationManager.class);
- if (iMgr != null) {
+
+ iMgr = bus.getExtension(InstrumentationManager.class);
+ if (iMgr != null) {
try {
iMgr.register(mep);
} catch (JMException jmex) {
@@ -101,7 +101,7 @@ public class ServerImpl implements Server {
}
}
}
-
+
protected ManagedEndpoint createManagedEndpoint() {
return new ManagedEndpoint(bus, endpoint, this);
}
@@ -119,9 +119,9 @@ public class ServerImpl implements Server {
return;
}
LOG.fine("Server is starting.");
-
+
bindingFactory.addListener(destination, endpoint);
-
+
// register the active server to run
if (null != serverRegistry) {
LOG.fine("register the server to serverRegistry ");
@@ -138,7 +138,7 @@ public class ServerImpl implements Server {
}
stopped = false;
}
-
+
public boolean isStopped() {
return stopped;
}
@@ -150,9 +150,9 @@ public class ServerImpl implements Server {
if (stopped) {
return;
}
-
+
LOG.fine("Server is stopping.");
-
+
for (Closeable c : endpoint.getCleanupHooks()) {
try {
c.close();
@@ -163,7 +163,7 @@ public class ServerImpl implements Server {
if (slcMgr != null) {
slcMgr.stopServer(this);
}
-
+
MessageObserver mo = getDestination().getMessageObserver();
if (mo instanceof MultipleEndpointObserver) {
((MultipleEndpointObserver)mo).getEndpoints().remove(endpoint);
@@ -172,10 +172,10 @@ public class ServerImpl implements Server {
}
} else {
getDestination().setMessageObserver(null);
- }
+ }
stopped = true;
}
-
+
public void destroy() {
stop();
// we should shutdown the destination here
@@ -186,7 +186,7 @@ public class ServerImpl implements Server {
serverRegistry.unregister(this);
}
- if (iMgr != null) {
+ if (iMgr != null) {
try {
iMgr.unregister(mep);
} catch (JMException jmex) {
@@ -194,11 +194,11 @@ public class ServerImpl implements Server {
}
iMgr = null;
}
-
+
}
public Endpoint getEndpoint() {
return endpoint;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/ServerLifeCycleListener.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ServerLifeCycleListener.java b/core/src/main/java/org/apache/cxf/endpoint/ServerLifeCycleListener.java
index 5e3a9bc..5c91911 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ServerLifeCycleListener.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ServerLifeCycleListener.java
@@ -21,5 +21,5 @@ package org.apache.cxf.endpoint;
public interface ServerLifeCycleListener {
void startServer(Server server);
- void stopServer(Server server);
+ void stopServer(Server server);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/ServerLifeCycleManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ServerLifeCycleManager.java b/core/src/main/java/org/apache/cxf/endpoint/ServerLifeCycleManager.java
index 005103b..a107b8b 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ServerLifeCycleManager.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ServerLifeCycleManager.java
@@ -20,7 +20,7 @@
package org.apache.cxf.endpoint;
-public interface ServerLifeCycleManager {
+public interface ServerLifeCycleManager {
void startServer(Server server);
void stopServer(Server server);
void registerListener(ServerLifeCycleListener listener);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolver.java b/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolver.java
index 6ab6fd1..8a76678 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolver.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolver.java
@@ -30,9 +30,9 @@ import javax.xml.namespace.QName;
public interface ServiceContractResolver {
/**
- * Resolves a service's QName to a URI representing the location of a WSDL
- * contract. This method is called by the
- * <code>ServiceContractResolverRegistry</code> with which the contract
+ * Resolves a service's QName to a URI representing the location of a WSDL
+ * contract. This method is called by the
+ * <code>ServiceContractResolverRegistry</code> with which the contract
* resolver is registered.
*
* @param qname the QName being mapped to a URI
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistry.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistry.java b/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistry.java
index 1c5c56c..9bc26b8 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistry.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistry.java
@@ -29,9 +29,9 @@ import javax.xml.namespace.QName;
public interface ServiceContractResolverRegistry {
/**
- * Resolves a service's QName to a URI representing the location of a
- * WSDL contract. The registry method is called by the bus and should use
- * the <code>getContractLocation</code> methods of the registered contract
+ * Resolves a service's QName to a URI representing the location of a
+ * WSDL contract. The registry method is called by the bus and should use
+ * the <code>getContractLocation</code> methods of the registered contract
* resolvers to do the actual resolution.
*
* @param qname the service qname to resolve into a URI
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/SimpleEndpointImplFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/SimpleEndpointImplFactory.java b/core/src/main/java/org/apache/cxf/endpoint/SimpleEndpointImplFactory.java
index f8ce861..46d73d3 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/SimpleEndpointImplFactory.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/SimpleEndpointImplFactory.java
@@ -27,13 +27,13 @@ import org.apache.cxf.service.model.EndpointInfo;
* Create ordinary EndpointImpl objects.
*/
public class SimpleEndpointImplFactory implements EndpointImplFactory {
-
- private static EndpointImplFactory singleton
+
+ private static EndpointImplFactory singleton
= new SimpleEndpointImplFactory();
/** {@inheritDoc}
*/
- public EndpointImpl newEndpointImpl(Bus bus,
+ public EndpointImpl newEndpointImpl(Bus bus,
Service service, EndpointInfo endpointInfo) throws EndpointException {
return new EndpointImpl(bus, service, endpointInfo);
}
@@ -46,5 +46,5 @@ public class SimpleEndpointImplFactory implements EndpointImplFactory {
public static EndpointImplFactory getSingleton() {
return singleton;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/UpfrontConduitSelector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/UpfrontConduitSelector.java b/core/src/main/java/org/apache/cxf/endpoint/UpfrontConduitSelector.java
index 84ccce9..5ba76be 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/UpfrontConduitSelector.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/UpfrontConduitSelector.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-
+
package org.apache.cxf.endpoint;
import java.util.logging.Logger;
@@ -28,24 +28,24 @@ import org.apache.cxf.transport.Conduit;
/**
- * Strategy for eager upfront retreival of a Conduit to mediate an
+ * Strategy for eager upfront retreival of a Conduit to mediate an
* outbound message.
*/
public class UpfrontConduitSelector extends AbstractConduitSelector {
private static final Logger LOG =
LogUtils.getL7dLogger(UpfrontConduitSelector.class);
-
+
/**
* Normal constructor.
*/
public UpfrontConduitSelector() {
super();
}
-
+
/**
* Constructor, allowing a specific conduit to override normal selection.
- *
+ *
* @param c specific conduit
*/
public UpfrontConduitSelector(Conduit c) {
@@ -54,7 +54,7 @@ public class UpfrontConduitSelector extends AbstractConduitSelector {
/**
* Called prior to the interceptor chain being traversed.
- *
+ *
* @param message the current Message
*/
public void prepare(Message message) {
@@ -64,10 +64,10 @@ public class UpfrontConduitSelector extends AbstractConduitSelector {
message.put(Conduit.class, c);
}
}
-
+
/**
* Called when a Conduit is actually required.
- *
+ *
* @param message
* @return the Conduit to use for mediation of the message
*/
@@ -79,7 +79,7 @@ public class UpfrontConduitSelector extends AbstractConduitSelector {
}
return c;
}
-
+
/**
* @return the logger to use
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/extension/BusExtension.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/extension/BusExtension.java b/core/src/main/java/org/apache/cxf/extension/BusExtension.java
index 23c8b72..63157a6 100644
--- a/core/src/main/java/org/apache/cxf/extension/BusExtension.java
+++ b/core/src/main/java/org/apache/cxf/extension/BusExtension.java
@@ -20,6 +20,6 @@
package org.apache.cxf.extension;
public interface BusExtension {
-
+
Class<?> getRegistrationType();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/extension/Registry.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/extension/Registry.java b/core/src/main/java/org/apache/cxf/extension/Registry.java
index 59ab855..1090409 100644
--- a/core/src/main/java/org/apache/cxf/extension/Registry.java
+++ b/core/src/main/java/org/apache/cxf/extension/Registry.java
@@ -20,13 +20,13 @@
package org.apache.cxf.extension;
/**
- *
+ *
*/
public interface Registry<K, T> {
-
+
/**
- * Registers an object of type T with this registry.
- *
+ * Registers an object of type T with this registry.
+ *
* @param k the key under which rto register the object
* @param t the object to register
*/
@@ -34,8 +34,8 @@ public interface Registry<K, T> {
/**
* Unregisters the object stored under the given key from this registry.
- *
- * @param k the key
+ *
+ * @param k the key
*/
void unregister(K k);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/extension/RegistryImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/extension/RegistryImpl.java b/core/src/main/java/org/apache/cxf/extension/RegistryImpl.java
index 0a79915..a16ac7c 100644
--- a/core/src/main/java/org/apache/cxf/extension/RegistryImpl.java
+++ b/core/src/main/java/org/apache/cxf/extension/RegistryImpl.java
@@ -23,16 +23,16 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
- *
+ *
*/
public class RegistryImpl<K, T> implements Registry<K, T> {
-
+
protected final Map<K, T> entries;
-
+
protected RegistryImpl() {
this(null);
}
-
+
protected RegistryImpl(Map<K, T> e) {
if (null == e) {
e = new ConcurrentHashMap<K, T>(16, 0.75f, 4);
@@ -58,7 +58,7 @@ public class RegistryImpl<K, T> implements Registry<K, T> {
return entries.get(k);
}
-
-
-
+
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/feature/AbstractFeature.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/feature/AbstractFeature.java b/core/src/main/java/org/apache/cxf/feature/AbstractFeature.java
index 9a22a0b..c6ff44d 100644
--- a/core/src/main/java/org/apache/cxf/feature/AbstractFeature.java
+++ b/core/src/main/java/org/apache/cxf/feature/AbstractFeature.java
@@ -32,7 +32,7 @@ import org.apache.cxf.interceptor.InterceptorProvider;
* adding capabilities. For instance, there may be a LoggingFeature which configures
* one of the above to log each of their messages.
* <p>
- * By default the initialize methods all delegate to initializeProvider(InterceptorProvider).
+ * By default the initialize methods all delegate to initializeProvider(InterceptorProvider).
* If you're simply adding interceptors to a Server, Client, or Bus, this allows you to add
* them easily.
*/
@@ -40,30 +40,30 @@ public abstract class AbstractFeature extends WebServiceFeature implements Featu
public String getID() {
return getClass().getName();
}
-
+
public void initialize(Server server, Bus bus) {
initializeProvider(server.getEndpoint(), bus);
}
-
+
public void initialize(Client client, Bus bus) {
initializeProvider(client, bus);
}
-
+
public void initialize(InterceptorProvider interceptorProvider, Bus bus) {
initializeProvider(interceptorProvider, bus);
}
-
+
public void initialize(Bus bus) {
initializeProvider(bus, bus);
}
-
+
protected void initializeProvider(InterceptorProvider provider, Bus bus) {
-
+
}
/**
* Convenience method to extract a feature by type from an active list.
- *
+ *
* @param features the given feature list
* @param type the feature type required
* @return the feature of the specified type if active
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/feature/FastInfosetFeature.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/feature/FastInfosetFeature.java b/core/src/main/java/org/apache/cxf/feature/FastInfosetFeature.java
index 91bdc74..a18841d 100644
--- a/core/src/main/java/org/apache/cxf/feature/FastInfosetFeature.java
+++ b/core/src/main/java/org/apache/cxf/feature/FastInfosetFeature.java
@@ -50,11 +50,11 @@ public class FastInfosetFeature extends AbstractFeature {
public FastInfosetFeature() {
//
}
-
-
+
+
@Override
protected void initializeProvider(InterceptorProvider provider, Bus bus) {
-
+
FIStaxInInterceptor in = new FIStaxInInterceptor();
FIStaxOutInterceptor out = new FIStaxOutInterceptor(force);
@@ -78,7 +78,7 @@ public class FastInfosetFeature extends AbstractFeature {
if (serializerMaxCharacterContentChunkSize != null && serializerMaxCharacterContentChunkSize.intValue() > 0) {
out.setSerializerMaxCharacterContentChunkSize(serializerMaxCharacterContentChunkSize);
}
-
+
provider.getInInterceptors().add(in);
provider.getInFaultInterceptors().add(in);
provider.getOutInterceptors().add(out);
@@ -86,17 +86,17 @@ public class FastInfosetFeature extends AbstractFeature {
}
/**
- * Set if FastInfoset is always used without negotiation
+ * Set if FastInfoset is always used without negotiation
* @param b
*/
public void setForce(boolean b) {
force = b;
}
-
+
/**
* Retrieve the value set with {@link #setForce(boolean)}.
*/
public boolean getForce() {
return force;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/feature/Feature.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/feature/Feature.java b/core/src/main/java/org/apache/cxf/feature/Feature.java
index 1b8962c..5c8a401 100644
--- a/core/src/main/java/org/apache/cxf/feature/Feature.java
+++ b/core/src/main/java/org/apache/cxf/feature/Feature.java
@@ -28,16 +28,16 @@ import org.apache.cxf.interceptor.InterceptorProvider;
* adding capabilities. For instance, there may be a LoggingFeature which configures
* one of the above to log each of their messages.
* <p>
- * By default the initialize methods all delegate to initializeProvider(InterceptorProvider).
+ * By default the initialize methods all delegate to initializeProvider(InterceptorProvider).
* If you're simply adding interceptors to a Server, Client, or Bus, this allows you to add
* them easily.
*/
public interface Feature {
void initialize(Server server, Bus bus);
-
+
void initialize(Client client, Bus bus);
-
+
void initialize(InterceptorProvider interceptorProvider, Bus bus);
-
+
void initialize(Bus bus);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/feature/Features.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/feature/Features.java b/core/src/main/java/org/apache/cxf/feature/Features.java
index 7e82423..97ad9c8 100644
--- a/core/src/main/java/org/apache/cxf/feature/Features.java
+++ b/core/src/main/java/org/apache/cxf/feature/Features.java
@@ -29,6 +29,6 @@ import java.lang.annotation.Target;
@Inherited
public @interface Features {
String[] features() default { };
-
+
Class<? extends Feature>[] classes() default { };
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java b/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java
index dbd6638..c85ab6f 100644
--- a/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java
+++ b/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java
@@ -29,11 +29,11 @@ import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.interceptor.LoggingOutInterceptor;
/**
- * This class is used to control message-on-the-wire logging.
+ * This class is used to control message-on-the-wire logging.
* By attaching this feature to an endpoint, you
* can specify logging. If this feature is present, an endpoint will log input
* and output of ordinary and log messages.
- *
+ *
* <pre>
* <![CDATA[
<jaxws:endpoint ...>
@@ -43,8 +43,8 @@ import org.apache.cxf.interceptor.LoggingOutInterceptor;
</jaxws:endpoint>
]]>
</pre>
- *
- * @deprecated use the logging module rt/features/logging instead
+ *
+ * @deprecated use the logging module rt/features/logging instead
*/
@NoJSR250Annotations
@Deprecated
@@ -53,17 +53,17 @@ public class LoggingFeature extends AbstractFeature {
private static final int DEFAULT_LIMIT = AbstractLoggingInterceptor.DEFAULT_LIMIT;
private static final LoggingInInterceptor IN = new LoggingInInterceptor(DEFAULT_LIMIT);
private static final LoggingOutInterceptor OUT = new LoggingOutInterceptor(DEFAULT_LIMIT);
-
-
+
+
String inLocation;
String outLocation;
boolean prettyLogging;
boolean showBinary;
-
+
int limit = DEFAULT_LIMIT;
public LoggingFeature() {
-
+
}
public LoggingFeature(int lim) {
limit = lim;
@@ -84,7 +84,7 @@ public class LoggingFeature extends AbstractFeature {
limit = lim;
prettyLogging = p;
}
-
+
public LoggingFeature(String in, String out, int lim, boolean p, boolean showBinary) {
this(in, out, lim, p);
this.showBinary = showBinary;
@@ -100,7 +100,7 @@ public class LoggingFeature extends AbstractFeature {
@Override
protected void initializeProvider(InterceptorProvider provider, Bus bus) {
- if (limit == DEFAULT_LIMIT && inLocation == null
+ if (limit == DEFAULT_LIMIT && inLocation == null
&& outLocation == null && !prettyLogging) {
provider.getInInterceptors().add(IN);
provider.getInFaultInterceptors().add(IN);
@@ -115,7 +115,7 @@ public class LoggingFeature extends AbstractFeature {
out.setOutputLocation(outLocation);
out.setPrettyLogging(prettyLogging);
out.setShowBinaryContent(showBinary);
-
+
provider.getInInterceptors().add(in);
provider.getInFaultInterceptors().add(in);
provider.getOutInterceptors().add(out);
@@ -130,14 +130,14 @@ public class LoggingFeature extends AbstractFeature {
public void setLimit(int lim) {
limit = lim;
}
-
+
/**
* Retrieve the value set with {@link #setLimit(int)}.
*/
public int getLimit() {
return limit;
}
-
+
/**
*/
public boolean isPrettyLogging() {
@@ -149,5 +149,5 @@ public class LoggingFeature extends AbstractFeature {
*/
public void setPrettyLogging(boolean prettyLogging) {
this.prettyLogging = prettyLogging;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/feature/StaxTransformFeature.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/feature/StaxTransformFeature.java b/core/src/main/java/org/apache/cxf/feature/StaxTransformFeature.java
index 2a9bf83..398b6b8 100644
--- a/core/src/main/java/org/apache/cxf/feature/StaxTransformFeature.java
+++ b/core/src/main/java/org/apache/cxf/feature/StaxTransformFeature.java
@@ -40,17 +40,17 @@ import org.apache.cxf.interceptor.transform.TransformOutInterceptor;
*/
@NoJSR250Annotations
public class StaxTransformFeature extends AbstractFeature {
-
+
private TransformInInterceptor in = new TransformInInterceptor();
private TransformOutInterceptor out = new TransformOutInterceptor();
-
+
public StaxTransformFeature() {
//
}
-
+
@Override
protected void initializeProvider(InterceptorProvider provider, Bus bus) {
-
+
provider.getInInterceptors().add(in);
provider.getOutInterceptors().add(out);
provider.getOutFaultInterceptors().add(out);
@@ -71,7 +71,7 @@ public class StaxTransformFeature extends AbstractFeature {
public void setSkipOnFault(boolean value) {
out.setSkipOnFault(value);
}
-
+
public void setOutAppendElements(Map<String, String> map) {
out.setOutAppendElements(map);
}
@@ -83,23 +83,23 @@ public class StaxTransformFeature extends AbstractFeature {
public void setInAppendElements(Map<String, String> inElements) {
in.setInAppendElements(inElements);
}
-
+
public void setInDropElements(List<String> dropElementsSet) {
in.setInDropElements(dropElementsSet);
}
-
+
public void setInTransformElements(Map<String, String> inElements) {
in.setInTransformElements(inElements);
}
-
+
public void setInTransformAttributes(Map<String, String> inAttributes) {
in.setInTransformAttributes(inAttributes);
}
-
+
public void setOutDefaultNamespace(String ns) {
out.setDefaultNamespace(ns);
}
-
+
public void setContextPropertyName(String propertyName) {
in.setContextPropertyName(propertyName);
out.setContextPropertyName(propertyName);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/feature/WrappedFeature.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/feature/WrappedFeature.java b/core/src/main/java/org/apache/cxf/feature/WrappedFeature.java
index ba8aa78..18ec628 100644
--- a/core/src/main/java/org/apache/cxf/feature/WrappedFeature.java
+++ b/core/src/main/java/org/apache/cxf/feature/WrappedFeature.java
@@ -28,7 +28,7 @@ import org.apache.cxf.interceptor.InterceptorProvider;
* adding capabilities. For instance, there may be a LoggingFeature which configures
* one of the above to log each of their messages.
* <p>
- * By default the initialize methods all delegate to initializeProvider(InterceptorProvider).
+ * By default the initialize methods all delegate to initializeProvider(InterceptorProvider).
* If you're simply adding interceptors to a Server, Client, or Bus, this allows you to add
* them easily.
*/
@@ -37,21 +37,21 @@ public class WrappedFeature extends AbstractFeature {
public WrappedFeature(Feature f) {
wrapped = f;
}
-
+
public void initialize(Server server, Bus bus) {
wrapped.initialize(server, bus);
}
-
+
public void initialize(Client client, Bus bus) {
wrapped.initialize(client, bus);
}
-
+
public void initialize(InterceptorProvider interceptorProvider, Bus bus) {
wrapped.initialize(interceptorProvider, bus);
}
-
+
public void initialize(Bus bus) {
wrapped.initialize(bus);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java b/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java
index 562e7b1..a1045b6 100644
--- a/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java
@@ -53,7 +53,7 @@ public abstract class AbstractXSLTInterceptor extends AbstractPhaseInterceptor<M
private String contextPropertyName;
private final Templates xsltTemplate;
-
+
public AbstractXSLTInterceptor(String phase, Class<?> before, Class<?> after, String xsltPath) {
super(phase);
if (before != null) {
@@ -62,7 +62,7 @@ public abstract class AbstractXSLTInterceptor extends AbstractPhaseInterceptor<M
if (after != null) {
addAfter(after.getName());
}
-
+
try {
InputStream xsltStream = ClassLoaderUtils.getResourceAsStream(xsltPath, this.getClass());
if (xsltStream == null) {
@@ -78,7 +78,7 @@ public abstract class AbstractXSLTInterceptor extends AbstractPhaseInterceptor<M
throw new IllegalArgumentException(
String.format("Cannot create XSLT template from path: %s",
xsltPath), e);
- }
+ }
}
public void setContextPropertyName(String propertyName) {
@@ -86,10 +86,10 @@ public abstract class AbstractXSLTInterceptor extends AbstractPhaseInterceptor<M
}
protected boolean checkContextProperty(Message message) {
- return contextPropertyName != null
+ return contextPropertyName != null
&& !MessageUtils.getContextualBoolean(message, contextPropertyName, false);
}
-
+
protected Templates getXSLTTemplate() {
return xsltTemplate;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/feature/transform/XSLTFeature.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/feature/transform/XSLTFeature.java b/core/src/main/java/org/apache/cxf/feature/transform/XSLTFeature.java
index 511a61c..f09d47b 100644
--- a/core/src/main/java/org/apache/cxf/feature/transform/XSLTFeature.java
+++ b/core/src/main/java/org/apache/cxf/feature/transform/XSLTFeature.java
@@ -24,28 +24,28 @@ import org.apache.cxf.feature.AbstractFeature;
import org.apache.cxf.interceptor.InterceptorProvider;
/**
- * This class defines a feature is used to transform message using XSLT script.
+ * This class defines a feature is used to transform message using XSLT script.
* If this feature is present and inXSLTPath/outXLSTPath are initialised,
- * client and endpoint will transform incoming and outgoing messages correspondingly.
- * Attention: actually the feature breaks streaming
- * (can be fixed in further versions when XSLT engine supports XML stream).
+ * client and endpoint will transform incoming and outgoing messages correspondingly.
+ * Attention: actually the feature breaks streaming
+ * (can be fixed in further versions when XSLT engine supports XML stream).
*/
@NoJSR250Annotations
public class XSLTFeature extends AbstractFeature {
private String inXSLTPath;
private String outXSLTPath;
-
+
@Override
protected void initializeProvider(InterceptorProvider provider, Bus bus) {
if (inXSLTPath != null) {
XSLTInInterceptor in = new XSLTInInterceptor(inXSLTPath);
- provider.getInInterceptors().add(in);
+ provider.getInInterceptors().add(in);
}
-
+
if (outXSLTPath != null) {
XSLTOutInterceptor out = new XSLTOutInterceptor(outXSLTPath);
- provider.getOutInterceptors().add(out);
- provider.getOutFaultInterceptors().add(out);
+ provider.getOutInterceptors().add(out);
+ provider.getOutFaultInterceptors().add(out);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/feature/transform/XSLTInInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/feature/transform/XSLTInInterceptor.java b/core/src/main/java/org/apache/cxf/feature/transform/XSLTInInterceptor.java
index 5430055..7e23d31 100644
--- a/core/src/main/java/org/apache/cxf/feature/transform/XSLTInInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/feature/transform/XSLTInInterceptor.java
@@ -41,7 +41,7 @@ import org.apache.cxf.staxutils.StaxUtils;
* Actually it breaks streaming (can be fixed in further versions when XSLT engine supports XML stream)
*/
public class XSLTInInterceptor extends AbstractXSLTInterceptor {
- private static final Logger LOG = LogUtils.getL7dLogger(XSLTInInterceptor.class);
+ private static final Logger LOG = LogUtils.getL7dLogger(XSLTInInterceptor.class);
public XSLTInInterceptor(String xsltPath) {
super(Phase.POST_STREAM, StaxInInterceptor.class, null, xsltPath);
@@ -100,7 +100,7 @@ public class XSLTInInterceptor extends AbstractXSLTInterceptor {
}
}
}
-
+
protected void transformIS(Message message, InputStream is) {
try {
InputStream transformedIS = XSLTUtils.transform(getXSLTTemplate(), is);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/feature/transform/XSLTOutInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/feature/transform/XSLTOutInterceptor.java b/core/src/main/java/org/apache/cxf/feature/transform/XSLTOutInterceptor.java
index 6044498..1562008 100644
--- a/core/src/main/java/org/apache/cxf/feature/transform/XSLTOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/feature/transform/XSLTOutInterceptor.java
@@ -154,7 +154,7 @@ public class XSLTOutInterceptor extends AbstractXSLTInterceptor {
}
@Override
- public void onFlush(CachedOutputStream wrapper) {
+ public void onFlush(CachedOutputStream wrapper) {
}
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/feature/transform/XSLTUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/feature/transform/XSLTUtils.java b/core/src/main/java/org/apache/cxf/feature/transform/XSLTUtils.java
index 0f495ef..ac37c97 100644
--- a/core/src/main/java/org/apache/cxf/feature/transform/XSLTUtils.java
+++ b/core/src/main/java/org/apache/cxf/feature/transform/XSLTUtils.java
@@ -109,7 +109,7 @@ public final class XSLTUtils {
public static Document transform(Templates xsltTemplate, Document in) {
try {
DOMSource beforeSource = new DOMSource(in);
-
+
Document out = DOMUtils.createDocument();
Transformer trans = xsltTemplate.newTransformer();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/feature/validation/DefaultSchemaValidationTypeProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/feature/validation/DefaultSchemaValidationTypeProvider.java b/core/src/main/java/org/apache/cxf/feature/validation/DefaultSchemaValidationTypeProvider.java
index 1c00d86..8490c56 100644
--- a/core/src/main/java/org/apache/cxf/feature/validation/DefaultSchemaValidationTypeProvider.java
+++ b/core/src/main/java/org/apache/cxf/feature/validation/DefaultSchemaValidationTypeProvider.java
@@ -30,9 +30,9 @@ import org.apache.cxf.service.model.OperationInfo;
* names ignore any namespaces
*/
public class DefaultSchemaValidationTypeProvider implements SchemaValidationTypeProvider {
- private final Map<String, SchemaValidationType> operationMap =
+ private final Map<String, SchemaValidationType> operationMap =
new HashMap<String, SchemaValidationType>();
-
+
public DefaultSchemaValidationTypeProvider(Map<String, SchemaValidationType> operationMap) {
this.operationMap.putAll(operationMap);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/feature/validation/SchemaValidationFeature.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/feature/validation/SchemaValidationFeature.java b/core/src/main/java/org/apache/cxf/feature/validation/SchemaValidationFeature.java
index c314eaf..12ec4d5 100644
--- a/core/src/main/java/org/apache/cxf/feature/validation/SchemaValidationFeature.java
+++ b/core/src/main/java/org/apache/cxf/feature/validation/SchemaValidationFeature.java
@@ -34,19 +34,19 @@ import org.apache.cxf.service.model.BindingOperationInfo;
*/
public class SchemaValidationFeature extends AbstractFeature {
private final SchemaValidationTypeProvider provider;
-
+
public SchemaValidationFeature(final SchemaValidationTypeProvider provider) {
this.provider = provider;
}
-
+
public void initialize(Server server, Bus bus) {
initialise(server.getEndpoint());
}
-
+
public void initialize(Client client, Bus bus) {
initialise(client.getEndpoint());
}
-
+
private void initialise(Endpoint endpoint) {
for (BindingOperationInfo bop : endpoint.getEndpointInfo().getBinding().getOperations()) {
SchemaValidationType type = provider.getSchemaValidationType(bop.getOperationInfo());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/feature/validation/SchemaValidationTypeProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/feature/validation/SchemaValidationTypeProvider.java b/core/src/main/java/org/apache/cxf/feature/validation/SchemaValidationTypeProvider.java
index 1e40825..4688c8d 100644
--- a/core/src/main/java/org/apache/cxf/feature/validation/SchemaValidationTypeProvider.java
+++ b/core/src/main/java/org/apache/cxf/feature/validation/SchemaValidationTypeProvider.java
@@ -23,7 +23,7 @@ import org.apache.cxf.service.model.OperationInfo;
/**
* Returning null from the getSchemaValidationType will be ignored. This generally
- * will mean, it falls back to the service endpoint default, whether configured
+ * will mean, it falls back to the service endpoint default, whether configured
* by @SchemaValidation or a endpoint property.
*/
public interface SchemaValidationTypeProvider {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/headers/Header.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/headers/Header.java b/core/src/main/java/org/apache/cxf/headers/Header.java
index 96edf05..00763ed 100644
--- a/core/src/main/java/org/apache/cxf/headers/Header.java
+++ b/core/src/main/java/org/apache/cxf/headers/Header.java
@@ -23,31 +23,31 @@ import javax.xml.namespace.QName;
import org.apache.cxf.databinding.DataBinding;
public class Header {
- public enum Direction {
- DIRECTION_IN,
- DIRECTION_OUT,
- DIRECTION_INOUT
+ public enum Direction {
+ DIRECTION_IN,
+ DIRECTION_OUT,
+ DIRECTION_INOUT
};
-
+
public static final String HEADER_LIST = Header.class.getName() + ".list";
-
-
+
+
private DataBinding dataBinding;
private QName name;
private Object object;
-
+
private Direction direction = Header.Direction.DIRECTION_OUT;
public Header(QName q, Object o) {
this(q, o, null);
}
-
+
public Header(QName q, Object o, DataBinding b) {
object = o;
name = q;
dataBinding = b;
}
-
+
public DataBinding getDataBinding() {
return dataBinding;
}
@@ -66,13 +66,13 @@ public class Header {
public void setObject(Object object) {
this.object = object;
}
-
+
public void setDirection(Direction hdrDirection) {
this.direction = hdrDirection;
}
-
+
public Direction getDirection() {
return direction;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/headers/HeaderManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/headers/HeaderManager.java b/core/src/main/java/org/apache/cxf/headers/HeaderManager.java
index ac641f1..5d723de 100644
--- a/core/src/main/java/org/apache/cxf/headers/HeaderManager.java
+++ b/core/src/main/java/org/apache/cxf/headers/HeaderManager.java
@@ -19,8 +19,8 @@
package org.apache.cxf.headers;
public interface HeaderManager {
-
+
void registerHeaderProcessor(HeaderProcessor processor);
-
+
HeaderProcessor getHeaderProcessor(String namespace);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/headers/HeaderProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/headers/HeaderProcessor.java b/core/src/main/java/org/apache/cxf/headers/HeaderProcessor.java
index f93a039..e910d09 100644
--- a/core/src/main/java/org/apache/cxf/headers/HeaderProcessor.java
+++ b/core/src/main/java/org/apache/cxf/headers/HeaderProcessor.java
@@ -22,11 +22,11 @@ import org.apache.cxf.databinding.DataBinding;
import org.apache.cxf.interceptor.InterceptorProvider;
public interface HeaderProcessor {
-
+
String getNamespace();
-
+
DataBinding getDataBinding();
-
+
InterceptorProvider getInterceptorProvider();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/helpers/CastUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/helpers/CastUtils.java b/core/src/main/java/org/apache/cxf/helpers/CastUtils.java
index 411b42a..958ef5f 100644
--- a/core/src/main/java/org/apache/cxf/helpers/CastUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/CastUtils.java
@@ -29,11 +29,11 @@ import java.util.Set;
@SuppressWarnings("unchecked")
public final class CastUtils {
-
+
private CastUtils() {
//utility class, never constructed
}
-
+
public static <T, U> Map<T, U> cast(Map<?, ?> p) {
return (Map<T, U>)p;
}
@@ -47,7 +47,7 @@ public final class CastUtils {
public static <T, U> Dictionary<T, U> cast(Dictionary<?, ?> p, Class<T> t, Class<U> u) {
return (Dictionary<T, U>)p;
}
-
+
public static <T> Collection<T> cast(Collection<?> p) {
return (Collection<T>)p;
}
@@ -57,7 +57,7 @@ public final class CastUtils {
public static <T> List<T> cast(List<?> p) {
return (List<T>)p;
}
-
+
public static <T> List<T> cast(List<?> p, Class<T> cls) {
return (List<T>)p;
}
@@ -65,7 +65,7 @@ public final class CastUtils {
public static <T> Iterator<T> cast(Iterator<?> p) {
return (Iterator<T>)p;
}
-
+
public static <T> Iterator<T> cast(Iterator<?> p, Class<T> cls) {
return (Iterator<T>)p;
}
@@ -73,7 +73,7 @@ public final class CastUtils {
public static <T> Enumeration<T> cast(Enumeration<?> p) {
return (Enumeration<T>)p;
}
-
+
public static <T> Enumeration<T> cast(Enumeration<?> p, Class<T> cls) {
return (Enumeration<T>)p;
}
@@ -92,5 +92,5 @@ public final class CastUtils {
return (Map.Entry<T, U>)p;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/helpers/DOMUtils.java
----------------------------------------------------------------------
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 0853716..0c48392 100644
--- a/core/src/main/java/org/apache/cxf/helpers/DOMUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/DOMUtils.java
@@ -78,7 +78,7 @@ public final class DOMUtils {
}
return factory;
}
-
+
/**
* Creates a new Document object
* @throws ParserConfigurationException
@@ -94,10 +94,10 @@ public final class DOMUtils {
}
}
-
+
/**
* This function is much like getAttribute, but returns null, not "", for a nonexistent attribute.
- *
+ *
* @param e
* @param attributeName
*/
@@ -159,7 +159,7 @@ public final class DOMUtils {
b = new StringBuilder(s).append(((Text)n1).getNodeValue());
s = null;
}
- }
+ }
n1 = n1.getNextSibling();
}
if (b != null) {
@@ -170,7 +170,7 @@ public final class DOMUtils {
/**
* Get the first element child.
- *
+ *
* @param parent lookup direct childs
* @param name name of the element. If null return the first element.
*/
@@ -200,7 +200,7 @@ public final class DOMUtils {
return null;
}
-
+
public static boolean hasAttribute(Element element, String value) {
NamedNodeMap attributes = element.getAttributes();
for (int i = 0; i < attributes.getLength(); i++) {
@@ -210,7 +210,7 @@ public final class DOMUtils {
}
}
return false;
- }
+ }
public static String getAttribute(Node element, String attName) {
NamedNodeMap attrs = element.getAttributes();
if (attrs == null) {
@@ -261,7 +261,7 @@ public final class DOMUtils {
/**
* Find the first direct child with a given attribute.
- *
+ *
* @param parent
* @param elemName name of the element, or null for any
* @param attName attribute we're looking for
@@ -305,7 +305,7 @@ public final class DOMUtils {
public static QName getElementQName(Element el) {
return new QName(el.getNamespaceURI(), el.getLocalName());
}
-
+
/**
* Creates a QName object based on the qualified name
* and using the Node as a base to lookup the namespace
@@ -334,17 +334,17 @@ public final class DOMUtils {
return new QName(ns, localName, prefix);
}
-
+
public static QName convertStringToQName(String expandedQName) {
return convertStringToQName(expandedQName, "");
}
-
+
public static QName convertStringToQName(String expandedQName, String prefix) {
int ind1 = expandedQName.indexOf('{');
if (ind1 != 0) {
return new QName(expandedQName);
}
-
+
int ind2 = expandedQName.indexOf('}');
if (ind2 <= ind1 + 1 || ind2 >= expandedQName.length() - 1) {
return null;
@@ -362,8 +362,8 @@ public final class DOMUtils {
}
}
return dropElements;
- }
-
+ }
+
/**
* Get the first direct child with a given type
@@ -392,7 +392,7 @@ public final class DOMUtils {
/**
* Return the first element child with the specified qualified name.
- *
+ *
* @param parent
* @param q
*/
@@ -404,7 +404,7 @@ public final class DOMUtils {
/**
* Return the first element child with the specified qualified name.
- *
+ *
* @param parent
* @param ns
* @param lp
@@ -424,7 +424,7 @@ public final class DOMUtils {
/**
* Return child elements with specified name.
- *
+ *
* @param parent
* @param ns
* @param localName
@@ -442,10 +442,10 @@ public final class DOMUtils {
}
return r;
}
-
+
/**
* Returns all child elements with specified namespace.
- *
+ *
* @param parent the element to search under
* @param ns the namespace to find elements in
* @return all child elements with specified namespace
@@ -466,7 +466,7 @@ public final class DOMUtils {
/**
* Get the first child of the specified type.
- *
+ *
* @param parent
* @param type
*/
@@ -520,7 +520,7 @@ public final class DOMUtils {
return new InputSource(new StringReader(""));
}
}
-
+
public static String getPrefixRecursive(Element el, String ns) {
String prefix = getPrefix(el, ns);
if (prefix == null && el.getParentNode() instanceof Element) {
@@ -544,7 +544,7 @@ public final class DOMUtils {
/**
* Get all prefixes defined, up to the root, for a namespace URI.
- *
+ *
* @param element
* @param namespaceUri
* @param prefixes
@@ -559,7 +559,7 @@ public final class DOMUtils {
/**
* Get all prefixes defined on this element for the specified namespace.
- *
+ *
* @param element
* @param namespaceUri
* @param prefixes
@@ -590,7 +590,7 @@ public final class DOMUtils {
/**
* Starting from a node, find the namespace declaration for a prefix. for a matching namespace
* declaration.
- *
+ *
* @param node search up from here to search for namespace definitions
* @param searchPrefix the prefix we are searching for
* @return the namespace if found.
@@ -623,7 +623,7 @@ public final class DOMUtils {
return null;
}
-
+
public static List<Element> findAllElementsByTagNameNS(Element elem, String nameSpaceURI,
String localName) {
List<Element> ret = new LinkedList<Element>();
@@ -694,7 +694,7 @@ public final class DOMUtils {
* Set a namespace/prefix on an element if it is not set already. First off, it searches for the element
* for the prefix associated with the specified namespace. If the prefix isn't null, then this is
* returned. Otherwise, it creates a new attribute using the namespace/prefix passed as parameters.
- *
+ *
* @param element
* @param namespace
* @param prefix
@@ -711,7 +711,7 @@ public final class DOMUtils {
/**
* Add a namespace prefix definition to an element.
- *
+ *
* @param element
* @param namespaceUri
* @param prefix
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/helpers/FileUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/helpers/FileUtils.java b/core/src/main/java/org/apache/cxf/helpers/FileUtils.java
index 6d9f388..df5c5ed 100644
--- a/core/src/main/java/org/apache/cxf/helpers/FileUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/FileUtils.java
@@ -41,13 +41,13 @@ public final class FileUtils {
private static final int RETRY_SLEEP_MILLIS = 10;
private static File defaultTempDir;
private static Thread shutdownHook;
- private static final char[] ILLEGAL_CHARACTERS
- = {'/', '\n', '\r', '\t', '\0', '\f', '`', '?', '*', '\\', '<', '>', '|', '\"', ':'};
-
+ private static final char[] ILLEGAL_CHARACTERS
+ = {'/', '\n', '\r', '\t', '\0', '\f', '`', '?', '*', '\\', '<', '>', '|', '\"', ':'};
+
private FileUtils() {
-
+
}
-
+
public boolean isValidFileName(String name) {
for (int i = name.length(); i > 0; i--) {
char c = name.charAt(i - 1);
@@ -77,19 +77,19 @@ public final class FileUtils {
&& defaultTempDir.exists()) {
return defaultTempDir;
}
-
+
String s = SystemPropertyAction.getPropertyOrNull(FileUtils.class.getName() + ".TempDirectory");
if (s != null) {
//assume someone outside of us will manage the directory
File f = new File(s);
if (f.mkdirs()) {
- defaultTempDir = f;
+ defaultTempDir = f;
}
}
if (defaultTempDir == null) {
defaultTempDir = createTmpDir(false);
if (shutdownHook != null) {
- Runtime.getRuntime().removeShutdownHook(shutdownHook);
+ Runtime.getRuntime().removeShutdownHook(shutdownHook);
}
shutdownHook = new Thread() {
@Override
@@ -97,24 +97,24 @@ public final class FileUtils {
removeDir(defaultTempDir, true);
}
};
- Runtime.getRuntime().addShutdownHook(shutdownHook);
+ Runtime.getRuntime().addShutdownHook(shutdownHook);
}
return defaultTempDir;
}
-
+
public static synchronized void maybeDeleteDefaultTempDir() {
if (defaultTempDir != null) {
Runtime.getRuntime().gc(); // attempt a garbage collect to close any files
String files[] = defaultTempDir.list();
if (files != null && files.length > 0) {
//there are files in there, we need to attempt some more cleanup
-
+
//HOWEVER, we don't want to just wipe out every file as something may be holding onto
- //the files for a reason. We'll re-run the gc and run the finalizers to see if
+ //the files for a reason. We'll re-run the gc and run the finalizers to see if
//anything gets cleaned up.
Runtime.getRuntime().gc(); // attempt a garbage collect to close any files
- Runtime.getRuntime().runFinalization();
+ Runtime.getRuntime().runFinalization();
Runtime.getRuntime().gc();
files = defaultTempDir.list();
}
@@ -127,7 +127,7 @@ public final class FileUtils {
}
}
}
-
+
public static File createTmpDir() {
return createTmpDir(true);
}
@@ -135,14 +135,14 @@ public final class FileUtils {
String s = SystemPropertyAction.getProperty("java.io.tmpdir");
File checkExists = new File(s);
if (!checkExists.exists() || !checkExists.isDirectory()) {
- throw new RuntimeException("The directory "
- + checkExists.getAbsolutePath()
+ throw new RuntimeException("The directory "
+ + checkExists.getAbsolutePath()
+ " does not exist, please set java.io.tempdir"
+ " to an existing directory");
}
if (!checkExists.canWrite()) {
- throw new RuntimeException("The directory "
- + checkExists.getAbsolutePath()
+ throw new RuntimeException("The directory "
+ + checkExists.getAbsolutePath()
+ " is not writable, please set java.io.tempdir"
+ " to a writable directory");
}
@@ -163,7 +163,7 @@ public final class FileUtils {
File f = new File(checkExists, "cxf-tmp-" + x);
int count = 0;
while (!f.mkdir()) {
-
+
if (count > 10000) {
throw new RuntimeException("Could not create a temporary directory in "
+ s + ", please set java.io.tempdir"
@@ -183,7 +183,7 @@ public final class FileUtils {
removeDir(f2, true);
}
};
- Runtime.getRuntime().addShutdownHook(hook);
+ Runtime.getRuntime().addShutdownHook(hook);
}
return newTmpDir;
}
@@ -272,14 +272,14 @@ public final class FileUtils {
public static File createTempFile(String prefix, String suffix) throws IOException {
return createTempFile(prefix, suffix, null, false);
}
-
+
public static File createTempFile(String prefix, String suffix, File parentDir,
boolean deleteOnExit) throws IOException {
File result = null;
File parent = (parentDir == null)
? getDefaultTempDir()
: parentDir;
-
+
if (suffix == null) {
suffix = ".tmp";
}
@@ -298,7 +298,7 @@ public final class FileUtils {
}
return result;
}
-
+
public static String getStringFromFile(File location) {
InputStream is = null;
String result = null;
@@ -347,8 +347,8 @@ public final class FileUtils {
rtn = ignoreTokens(rtn, "/*", "*/");
return rtn;
}
-
- private static String ignoreTokens(final String contents,
+
+ private static String ignoreTokens(final String contents,
final String startToken, final String endToken) {
String rtn = contents;
int headerIndexStart = rtn.indexOf(startToken);
@@ -371,9 +371,9 @@ public final class FileUtils {
return getFilesRecurse(dir, Pattern.compile(pattern), exclude, false, new ArrayList<>());
}
public static List<File> getFilesRecurse(File dir, final String pattern, File exclude) {
- return getFilesRecurse(dir, Pattern.compile(pattern), exclude, true, new ArrayList<>());
+ return getFilesRecurse(dir, Pattern.compile(pattern), exclude, true, new ArrayList<>());
}
- private static List<File> getFilesRecurse(File dir,
+ private static List<File> getFilesRecurse(File dir,
Pattern pattern,
File exclude, boolean rec,
List<File> fileList) {
@@ -388,7 +388,7 @@ public final class FileUtils {
} else {
Matcher m = pattern.matcher(file.getName());
if (m.matches()) {
- fileList.add(file);
+ fileList.add(file);
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java b/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java
index 796e2fc..94a96ec 100644
--- a/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java
+++ b/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java
@@ -42,17 +42,17 @@ public final class HttpHeaderHelper {
public static final String CLOSE = "close";
public static final String AUTHORIZATION = "Authorization";
private static final String ISO88591 = Charset.forName("ISO-8859-1").name();
-
+
private static Map<String, String> internalHeaders = new HashMap<String, String>();
private static ConcurrentHashMap<String, String> encodings = new ConcurrentHashMap<String, String>();
private static Pattern charsetPattern = Pattern.compile("\"|'");
-
+
static {
internalHeaders.put("Accept-Encoding", "accept-encoding");
internalHeaders.put("Content-Encoding", "content-encoding");
internalHeaders.put("Content-Type", "content-type");
internalHeaders.put("Content-ID", "content-id");
- internalHeaders.put("Content-Transfer-Encoding", "content-transfer-encoding");
+ internalHeaders.put("Content-Transfer-Encoding", "content-transfer-encoding");
internalHeaders.put("Transfer-Encoding", "transfer-encoding");
internalHeaders.put("Connection", "connection");
internalHeaders.put("authorization", "Authorization");
@@ -60,20 +60,20 @@ public final class HttpHeaderHelper {
internalHeaders.put("accept", "Accept");
internalHeaders.put("content-length", "Content-Length");
}
-
+
private HttpHeaderHelper() {
-
+
}
-
+
public static List<String> getHeader(Map<String, List<String>> headerMap, String key) {
return headerMap.get(getHeaderKey(key));
}
-
+
public static String getHeaderKey(final String key) {
String headerKey = internalHeaders.get(key);
return headerKey == null ? key : headerKey;
}
-
+
public static String findCharset(String contentType) {
if (contentType == null) {
return null;
@@ -96,9 +96,9 @@ public final class HttpHeaderHelper {
}
public static String mapCharset(String enc) {
return mapCharset(enc, ISO88591);
- }
-
- //helper to map the charsets that various things send in the http Content-Type header
+ }
+
+ //helper to map the charsets that various things send in the http Content-Type header
//into something that is actually supported by Java and the Stax parsers and such.
public static String mapCharset(String enc, String deflt) {
if (enc == null) {