You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by am...@apache.org on 2013/07/09 20:23:44 UTC
svn commit: r1501425 - in
/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers:
AbstractPojoConfigurationTypeHandler.java
JaxRSPojoConfigurationTypeHandler.java PojoConfigurationTypeHandler.java
Author: amichai
Date: Tue Jul 9 18:23:44 2013
New Revision: 1501425
URL: http://svn.apache.org/r1501425
Log:
Remove more unused method parameters
Modified:
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/AbstractPojoConfigurationTypeHandler.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSPojoConfigurationTypeHandler.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/AbstractPojoConfigurationTypeHandler.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/AbstractPojoConfigurationTypeHandler.java?rev=1501425&r1=1501424&r2=1501425&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/AbstractPojoConfigurationTypeHandler.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/AbstractPojoConfigurationTypeHandler.java Tue Jul 9 18:23:44 2013
@@ -172,7 +172,7 @@ public abstract class AbstractPojoConfig
return new QName(ns, portName);
}
- protected String getClientAddress(Map<String, Object> sd, Class<?> iClass) {
+ protected String getClientAddress(Map<String, Object> sd) {
return OsgiUtils.getFirstNonEmptyStringProperty(sd, RemoteConstants.ENDPOINT_ID,
Constants.WS_ADDRESS_PROPERTY,
Constants.WS_ADDRESS_PROPERTY_OLD,
@@ -182,7 +182,7 @@ public abstract class AbstractPojoConfig
protected String getServerAddress(Map<String, Object> sd, Class<?> iClass) {
String address;
try {
- address = getClientAddress(sd, iClass);
+ address = getClientAddress(sd);
} catch (RuntimeException e) {
LOG.error(e.getMessage(), e);
return null;
@@ -210,7 +210,7 @@ public abstract class AbstractPojoConfig
addInterceptors(factory, callingContext, sd, Constants.WS_OUT_FAULT_INTERCEPTORS_PROP_KEY);
addInterceptors(factory, callingContext, sd, Constants.WS_IN_FAULT_INTERCEPTORS_PROP_KEY);
addFeatures(factory, callingContext, sd, Constants.WS_FEATURES_PROP_KEY);
- addContextProperties(factory, callingContext, sd, Constants.WS_CONTEXT_PROPS_PROP_KEY);
+ addContextProperties(factory, sd, Constants.WS_CONTEXT_PROPS_PROP_KEY);
}
static void addRsInterceptorsFeaturesProps(AbstractEndpointFactory factory, BundleContext callingContext,
@@ -220,7 +220,7 @@ public abstract class AbstractPojoConfig
addInterceptors(factory, callingContext, sd, Constants.RS_OUT_FAULT_INTERCEPTORS_PROP_KEY);
addInterceptors(factory, callingContext, sd, Constants.RS_IN_FAULT_INTERCEPTORS_PROP_KEY);
addFeatures(factory, callingContext, sd, Constants.RS_FEATURES_PROP_KEY);
- addContextProperties(factory, callingContext, sd, Constants.RS_CONTEXT_PROPS_PROP_KEY);
+ addContextProperties(factory, sd, Constants.RS_CONTEXT_PROPS_PROP_KEY);
}
private static void addInterceptors(AbstractEndpointFactory factory, BundleContext callingContext,
@@ -252,8 +252,7 @@ public abstract class AbstractPojoConfig
}
}
- private static void addContextProperties(AbstractEndpointFactory factory, BundleContext callingContext,
- Map<String, Object> sd, String propName) {
+ private static void addContextProperties(AbstractEndpointFactory factory, Map<String, Object> sd, String propName) {
@SuppressWarnings("unchecked")
Map<String, Object> props = (Map<String, Object>)sd.get(propName);
if (props != null) {
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSPojoConfigurationTypeHandler.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSPojoConfigurationTypeHandler.java?rev=1501425&r1=1501424&r2=1501425&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSPojoConfigurationTypeHandler.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSPojoConfigurationTypeHandler.java Tue Jul 9 18:23:44 2013
@@ -120,7 +120,7 @@ public class JaxRSPojoConfigurationTypeH
if (contextRoot == null) {
address = getServerAddress(sd, iClass);
} else {
- address = getClientAddress(sd, iClass);
+ address = getClientAddress(sd);
if (address == null) {
address = "/";
}
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java?rev=1501425&r1=1501424&r2=1501425&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java Tue Jul 9 18:23:44 2013
@@ -56,7 +56,7 @@ public class PojoConfigurationTypeHandle
public Object createProxy(ServiceReference sref, BundleContext dswContext, BundleContext callingContext,
Class<?> iClass, EndpointDescription endpoint) throws IntentUnsatisfiedException {
Map<String, Object> sd = endpoint.getProperties();
- String address = getClientAddress(sd, iClass);
+ String address = getClientAddress(sd);
if (address == null) {
LOG.warn("Remote address is unavailable");
// TODO: fire Event
@@ -123,7 +123,7 @@ public class PojoConfigurationTypeHandle
}
private String getPojoAddress(Map<String, Object> sd, Class<?> iClass) {
- String address = getClientAddress(sd, iClass);
+ String address = getClientAddress(sd);
if (address != null) {
return address;
}