You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/01/05 21:46:03 UTC
svn commit: r1227822 [3/4] - in /cxf/trunk:
api/src/main/java/org/apache/cxf/databinding/
api/src/main/java/org/apache/cxf/phase/
api/src/main/java/org/apache/cxf/service/
api/src/main/java/org/apache/cxf/ws/addressing/
common/common/src/main/java/org/...
Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java (original)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java Thu Jan 5 20:45:57 2012
@@ -36,7 +36,6 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -213,13 +212,13 @@ public class ReflectionServiceFactoryBea
}
if (retVal == null) {
JAXBDataBinding db = new JAXBDataBinding(getQualifyWrapperSchema());
- Map props = this.getProperties();
+ Map<String, Object> props = this.getProperties();
if (props != null && props.get("jaxb.additionalContextClasses") != null) {
Object o = this.getProperties().get("jaxb.additionalContextClasses");
if (o instanceof Class) {
- o = new Class[] {(Class)o};
+ o = new Class[] {(Class<?>)o};
}
- Class[] extraClass = (Class[])o;
+ Class<?>[] extraClass = (Class[])o;
db.setExtraClass(extraClass);
}
retVal = db;
@@ -743,7 +742,7 @@ public class ReflectionServiceFactoryBea
if (Exchange.class.equals(paramTypes[i])) {
continue;
}
- Class paramType = paramTypes[i];
+ Class<?> paramType = paramTypes[i];
Type genericType = genericTypes[i];
if (!initializeParameter(o, method, i, paramType, genericType)) {
return false;
@@ -751,7 +750,7 @@ public class ReflectionServiceFactoryBea
}
sendEvent(Event.OPERATIONINFO_IN_MESSAGE_SET, origOp, method, origOp.getInput());
// Initialize return type
- Class paramType = method.getReturnType();
+ Class<?> paramType = method.getReturnType();
Type genericType = method.getGenericReturnType();
if (o.hasOutput()
@@ -766,7 +765,7 @@ public class ReflectionServiceFactoryBea
return true;
}
private boolean initializeParameter(OperationInfo o, Method method, int i,
- Class paramType, Type genericType) {
+ Class<?> paramType, Type genericType) {
boolean isIn = isInParam(method, i);
boolean isOut = isOutParam(method, i);
boolean isHeader = isHeader(method, i);
@@ -848,10 +847,10 @@ public class ReflectionServiceFactoryBea
return true;
}
private void setFaultClassInfo(OperationInfo o, Method selected) {
- Class[] types = selected.getExceptionTypes();
+ Class<?>[] types = selected.getExceptionTypes();
for (int i = 0; i < types.length; i++) {
- Class exClass = types[i];
- Class beanClass = getBeanClass(exClass);
+ Class<?> exClass = types[i];
+ Class<?> beanClass = getBeanClass(exClass);
if (beanClass == null) {
continue;
}
@@ -1256,7 +1255,7 @@ public class ReflectionServiceFactoryBea
el = new XmlSchemaElement(schema, false);
// We hope that we can't have parts that different only in namespace.
el.setName(mpi.getName().getLocalPart());
- Map<Class, Boolean> jaxbAnnoMap = getJaxbAnnoMap(mpi);
+ Map<Class<?>, Boolean> jaxbAnnoMap = getJaxbAnnoMap(mpi);
if (mpi.isElement()) {
addImport(schema, mpi.getElementQName().getNamespaceURI());
el.setName(null);
@@ -1365,8 +1364,8 @@ public class ReflectionServiceFactoryBea
}
}
- private Map<Class, Boolean> getJaxbAnnoMap(MessagePartInfo mpi) {
- Map<Class, Boolean> map = new ConcurrentHashMap<Class, Boolean>();
+ private Map<Class<?>, Boolean> getJaxbAnnoMap(MessagePartInfo mpi) {
+ Map<Class<?>, Boolean> map = new ConcurrentHashMap<Class<?>, Boolean>();
Annotation[] anns = getMethodParameterAnnotations(mpi);
if (anns != null) {
@@ -1432,7 +1431,7 @@ public class ReflectionServiceFactoryBea
}
protected void createMessageParts(InterfaceInfo intf, OperationInfo op, Method method) {
- final Class[] paramClasses = method.getParameterTypes();
+ final Class<?>[] paramClasses = method.getParameterTypes();
// Setup the input message
op.setProperty(METHOD, method);
MessageInfo inMsg = op.createMessage(this.getInputMessageName(op, method), MessageInfo.Type.INPUT);
@@ -1557,7 +1556,7 @@ public class ReflectionServiceFactoryBea
}
}
- private void setParameterOrder(Method method, Class[] paramClasses, OperationInfo op) {
+ private void setParameterOrder(Method method, Class<?>[] paramClasses, OperationInfo op) {
if (isRPC(method) || !isWrapped(method)) {
List<String> paramOrdering = new LinkedList<String>();
boolean hasOut = false;
@@ -1584,8 +1583,7 @@ public class ReflectionServiceFactoryBea
protected void createInputWrappedMessageParts(OperationInfo op, Method method, MessageInfo inMsg) {
String partName = null;
- for (Iterator itr = serviceConfigurations.iterator(); itr.hasNext();) {
- AbstractServiceConfiguration c = (AbstractServiceConfiguration)itr.next();
+ for (AbstractServiceConfiguration c : serviceConfigurations) {
partName = c.getRequestWrapperPartName(op, method);
if (partName != null) {
break;
@@ -1596,8 +1594,7 @@ public class ReflectionServiceFactoryBea
}
MessagePartInfo part = inMsg.addMessagePart(partName);
part.setElement(true);
- for (Iterator itr = serviceConfigurations.iterator(); itr.hasNext();) {
- AbstractServiceConfiguration c = (AbstractServiceConfiguration)itr.next();
+ for (AbstractServiceConfiguration c : serviceConfigurations) {
QName q = c.getRequestWrapperName(op, method);
if (q != null) {
part.setElementQName(q);
@@ -1640,8 +1637,7 @@ public class ReflectionServiceFactoryBea
protected void createOutputWrappedMessageParts(OperationInfo op, Method method, MessageInfo outMsg) {
String partName = null;
- for (Iterator itr = serviceConfigurations.iterator(); itr.hasNext();) {
- AbstractServiceConfiguration c = (AbstractServiceConfiguration)itr.next();
+ for (AbstractServiceConfiguration c : serviceConfigurations) {
partName = c.getResponseWrapperPartName(op, method);
if (partName != null) {
break;
@@ -1661,8 +1657,7 @@ public class ReflectionServiceFactoryBea
MessagePartInfo part = outMsg.addMessagePart(partName);
part.setElement(true);
part.setIndex(0);
- for (Iterator itr = serviceConfigurations.iterator(); itr.hasNext();) {
- AbstractServiceConfiguration c = (AbstractServiceConfiguration)itr.next();
+ for (AbstractServiceConfiguration c : serviceConfigurations) {
QName q = c.getResponseWrapperName(op, method);
if (q != null) {
part.setElementQName(q);
@@ -1691,15 +1686,15 @@ public class ReflectionServiceFactoryBea
}
}
- private static Class createArrayClass(GenericArrayType atp) {
+ private static Class<?> createArrayClass(GenericArrayType atp) {
Type tp = ((GenericArrayType)atp).getGenericComponentType();
- Class rawClass = null;
+ Class<?> rawClass = null;
if (tp instanceof Class) {
- rawClass = (Class)tp;
+ rawClass = (Class<?>)tp;
} else if (tp instanceof GenericArrayType) {
rawClass = createArrayClass((GenericArrayType)tp);
} else if (tp instanceof ParameterizedType) {
- rawClass = (Class)((ParameterizedType)tp).getRawType();
+ rawClass = (Class<?>)((ParameterizedType)tp).getRawType();
if (List.class.isAssignableFrom(rawClass)) {
rawClass = getClass((ParameterizedType)tp);
rawClass = Array.newInstance(rawClass, 0).getClass();
@@ -1708,20 +1703,20 @@ public class ReflectionServiceFactoryBea
return Array.newInstance(rawClass, 0).getClass();
}
- private static Class getClass(Type paramType) {
- Class rawClass = null;
+ private static Class<?> getClass(Type paramType) {
+ Class<?> rawClass = null;
if (paramType instanceof Class) {
- rawClass = (Class)paramType;
+ rawClass = (Class<?>)paramType;
} else if (paramType instanceof GenericArrayType) {
rawClass = createArrayClass((GenericArrayType)paramType);
} else if (paramType instanceof ParameterizedType) {
- rawClass = (Class)((ParameterizedType)paramType).getRawType();
+ rawClass = (Class<?>)((ParameterizedType)paramType).getRawType();
}
return rawClass;
}
- protected void initializeParameter(MessagePartInfo part, Class rawClass, Type type) {
+ protected void initializeParameter(MessagePartInfo part, Class<?> rawClass, Type type) {
if (isHolder(rawClass, type)) {
Type c = getHolderType(rawClass, type);
if (c != null) {
@@ -1733,7 +1728,7 @@ public class ReflectionServiceFactoryBea
if (parameterizedTypes == null) {
processParameterizedTypes();
}
- TypeVariable var = (TypeVariable)type;
+ TypeVariable<?> var = (TypeVariable<?>)type;
Map<String, Class<?>> mp = parameterizedTypes.get(var.getGenericDeclaration());
if (mp != null) {
Class<?> c = parameterizedTypes.get(var.getGenericDeclaration()).get(var.getName());
@@ -1922,8 +1917,7 @@ public class ReflectionServiceFactoryBea
}
protected boolean isOutParam(Method method, int j) {
- for (Iterator itr = serviceConfigurations.iterator(); itr.hasNext();) {
- AbstractServiceConfiguration c = (AbstractServiceConfiguration)itr.next();
+ for (AbstractServiceConfiguration c : serviceConfigurations) {
Boolean b = c.isOutParam(method, j);
if (b != null) {
return b.booleanValue();
@@ -1933,8 +1927,7 @@ public class ReflectionServiceFactoryBea
}
protected boolean isInParam(Method method, int j) {
- for (Iterator itr = serviceConfigurations.iterator(); itr.hasNext();) {
- AbstractServiceConfiguration c = (AbstractServiceConfiguration)itr.next();
+ for (AbstractServiceConfiguration c : serviceConfigurations) {
Boolean b = c.isInParam(method, j);
if (b != null) {
return b.booleanValue();
@@ -1944,8 +1937,7 @@ public class ReflectionServiceFactoryBea
}
protected QName getInputMessageName(final OperationInfo op, final Method method) {
- for (Iterator itr = serviceConfigurations.iterator(); itr.hasNext();) {
- AbstractServiceConfiguration c = (AbstractServiceConfiguration)itr.next();
+ for (AbstractServiceConfiguration c : serviceConfigurations) {
QName q = c.getInputMessageName(op, method);
if (q != null) {
return q;
@@ -1955,8 +1947,7 @@ public class ReflectionServiceFactoryBea
}
protected QName createOutputMessageName(final OperationInfo op, final Method method) {
- for (Iterator itr = serviceConfigurations.iterator(); itr.hasNext();) {
- AbstractServiceConfiguration c = (AbstractServiceConfiguration)itr.next();
+ for (AbstractServiceConfiguration c : serviceConfigurations) {
QName q = c.getOutputMessageName(op, method);
if (q != null) {
return q;
@@ -1966,8 +1957,7 @@ public class ReflectionServiceFactoryBea
}
protected boolean hasOutMessage(Method m) {
- for (Iterator itr = serviceConfigurations.iterator(); itr.hasNext();) {
- AbstractServiceConfiguration c = (AbstractServiceConfiguration)itr.next();
+ for (AbstractServiceConfiguration c : serviceConfigurations) {
Boolean b = c.hasOutMessage(m);
if (b != null) {
return b.booleanValue();
@@ -1979,9 +1969,9 @@ public class ReflectionServiceFactoryBea
protected void initializeFaults(final InterfaceInfo service,
final OperationInfo op, final Method method) {
// Set up the fault messages
- final Class[] exceptionClasses = method.getExceptionTypes();
+ final Class<?>[] exceptionClasses = method.getExceptionTypes();
for (int i = 0; i < exceptionClasses.length; i++) {
- Class exClazz = exceptionClasses[i];
+ Class<?> exClazz = exceptionClasses[i];
// Ignore XFireFaults because they don't need to be declared
if (Fault.class.isAssignableFrom(exClazz)
@@ -2003,14 +1993,14 @@ public class ReflectionServiceFactoryBea
getService().getOutFaultInterceptors().add(new FaultOutInterceptor());
}
- protected FaultInfo addFault(final InterfaceInfo service, final OperationInfo op, Class exClass) {
- Class beanClass = getBeanClass(exClass);
+ protected FaultInfo addFault(final InterfaceInfo service, final OperationInfo op,
+ Class<?> exClass) {
+ Class<?> beanClass = getBeanClass(exClass);
if (beanClass == null) {
return null;
}
String faultMsgName = null;
- for (Iterator itr = serviceConfigurations.iterator(); itr.hasNext();) {
- AbstractServiceConfiguration c = (AbstractServiceConfiguration)itr.next();
+ for (AbstractServiceConfiguration c : serviceConfigurations) {
faultMsgName = c.getFaultMessageName(op, exClass, beanClass);
if (faultMsgName != null) {
break;
@@ -2064,9 +2054,9 @@ public class ReflectionServiceFactoryBea
return exClass;
}
- protected QName getFaultName(InterfaceInfo service, OperationInfo o, Class exClass, Class beanClass) {
- for (Iterator itr = serviceConfigurations.iterator(); itr.hasNext();) {
- AbstractServiceConfiguration c = (AbstractServiceConfiguration)itr.next();
+ protected QName getFaultName(InterfaceInfo service, OperationInfo o,
+ Class<?> exClass, Class<?> beanClass) {
+ for (AbstractServiceConfiguration c : serviceConfigurations) {
QName q = c.getFaultName(service, o, exClass, beanClass);
if (q != null) {
return q;
@@ -2076,8 +2066,7 @@ public class ReflectionServiceFactoryBea
}
protected String getAction(OperationInfo op, Method method) {
- for (Iterator itr = serviceConfigurations.iterator(); itr.hasNext();) {
- AbstractServiceConfiguration c = (AbstractServiceConfiguration)itr.next();
+ for (AbstractServiceConfiguration c : serviceConfigurations) {
String s = c.getAction(op, method);
if (s != null) {
return s;
@@ -2087,8 +2076,7 @@ public class ReflectionServiceFactoryBea
}
public boolean isHeader(Method method, int j) {
- for (Iterator itr = serviceConfigurations.iterator(); itr.hasNext();) {
- AbstractServiceConfiguration c = (AbstractServiceConfiguration)itr.next();
+ for (AbstractServiceConfiguration c : serviceConfigurations) {
Boolean b = c.isHeader(method, j);
if (b != null) {
return b.booleanValue();
@@ -2108,8 +2096,7 @@ public class ReflectionServiceFactoryBea
* @param method
*/
protected QName getOperationName(InterfaceInfo service, Method method) {
- for (Iterator itr = serviceConfigurations.iterator(); itr.hasNext();) {
- AbstractServiceConfiguration c = (AbstractServiceConfiguration)itr.next();
+ for (AbstractServiceConfiguration c : serviceConfigurations) {
QName s = c.getOperationName(service, method);
if (s != null) {
return s;
@@ -2119,8 +2106,7 @@ public class ReflectionServiceFactoryBea
}
protected boolean isAsync(final Method method) {
- for (Iterator itr = serviceConfigurations.iterator(); itr.hasNext();) {
- AbstractServiceConfiguration c = (AbstractServiceConfiguration)itr.next();
+ for (AbstractServiceConfiguration c : serviceConfigurations) {
Boolean b = c.isAsync(method);
if (b != null) {
return b.booleanValue();
@@ -2138,8 +2124,7 @@ public class ReflectionServiceFactoryBea
return getInParameterName(op, method, paramNumber);
}
- for (Iterator itr = serviceConfigurations.iterator(); itr.hasNext();) {
- AbstractServiceConfiguration c = (AbstractServiceConfiguration)itr.next();
+ for (AbstractServiceConfiguration c : serviceConfigurations) {
QName q = c.getInPartName(op, method, paramNumber);
if (q != null) {
return q;
@@ -2153,8 +2138,7 @@ public class ReflectionServiceFactoryBea
if (paramNumber == -1) {
return null;
}
- for (Iterator itr = serviceConfigurations.iterator(); itr.hasNext();) {
- AbstractServiceConfiguration c = (AbstractServiceConfiguration)itr.next();
+ for (AbstractServiceConfiguration c : serviceConfigurations) {
QName q = c.getInParameterName(op, method, paramNumber);
if (q != null) {
return q;
@@ -2164,8 +2148,7 @@ public class ReflectionServiceFactoryBea
}
protected QName getOutParameterName(final OperationInfo op, final Method method, final int paramNumber) {
- for (Iterator itr = serviceConfigurations.iterator(); itr.hasNext();) {
- AbstractServiceConfiguration c = (AbstractServiceConfiguration)itr.next();
+ for (AbstractServiceConfiguration c : serviceConfigurations) {
QName q = c.getOutParameterName(op, method, paramNumber);
if (q != null) {
return q;
@@ -2179,8 +2162,7 @@ public class ReflectionServiceFactoryBea
return getOutParameterName(op, method, paramNumber);
}
- for (Iterator itr = serviceConfigurations.iterator(); itr.hasNext();) {
- AbstractServiceConfiguration c = (AbstractServiceConfiguration)itr.next();
+ for (AbstractServiceConfiguration c : serviceConfigurations) {
QName q = c.getOutPartName(op, method, paramNumber);
if (q != null) {
return q;
@@ -2189,9 +2171,9 @@ public class ReflectionServiceFactoryBea
throw new IllegalStateException("ServiceConfiguration must provide a value!");
}
- protected Class getResponseWrapper(Method selected) {
+ protected Class<?> getResponseWrapper(Method selected) {
for (AbstractServiceConfiguration c : serviceConfigurations) {
- Class cls = c.getResponseWrapper(selected);
+ Class<?> cls = c.getResponseWrapper(selected);
if (cls != null) {
return cls;
}
@@ -2209,9 +2191,9 @@ public class ReflectionServiceFactoryBea
return null;
}
- protected Class getRequestWrapper(Method selected) {
+ protected Class<?> getRequestWrapper(Method selected) {
for (AbstractServiceConfiguration c : serviceConfigurations) {
- Class cls = c.getRequestWrapper(selected);
+ Class<?> cls = c.getRequestWrapper(selected);
if (cls != null) {
return cls;
}
@@ -2295,17 +2277,17 @@ public class ReflectionServiceFactoryBea
processTypes(serviceClass.getSuperclass(), serviceClass.getGenericSuperclass());
}
}
- protected void processTypes(Class sc, Type tp) {
+ protected void processTypes(Class<?> sc, Type tp) {
if (tp instanceof ParameterizedType) {
ParameterizedType ptp = (ParameterizedType)tp;
- Type c = (Class)ptp.getRawType();
+ Type c = (Class<?>)ptp.getRawType();
Map<String, Class<?>> m = new HashMap<String, Class<?>>();
parameterizedTypes.put(c, m);
for (int x = 0; x < ptp.getActualTypeArguments().length; x++) {
Type t = ptp.getActualTypeArguments()[x];
TypeVariable<?> tv = sc.getTypeParameters()[x];
if (t instanceof Class) {
- m.put(tv.getName(), (Class)t);
+ m.put(tv.getName(), (Class<?>)t);
}
}
}
Modified: cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/PersistOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/PersistOutInterceptor.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/PersistOutInterceptor.java (original)
+++ cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/PersistOutInterceptor.java Thu Jan 5 20:45:57 2012
@@ -129,7 +129,7 @@ public class PersistOutInterceptor exten
} else if (entry.getKey().equals(org.apache.cxf.message.Message.PROTOCOL_HEADERS)) {
if (entry.getValue() instanceof Map) {
- List userAgents = (List)((Map)entry.getValue()).get("user-agent");
+ List<?> userAgents = (List<?>)((Map<?, ?>)entry.getValue()).get("user-agent");
if (userAgents != null && !userAgents.isEmpty()) {
exchange.setUserAgent(userAgents.get(0).toString());
}
Modified: cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/utils/ManagementConsole.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/utils/ManagementConsole.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/utils/ManagementConsole.java (original)
+++ cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/utils/ManagementConsole.java Thu Jan 5 20:45:57 2012
@@ -115,8 +115,8 @@ public final class ManagementConsole {
try {
queryEndpointName = getEndpointObjectName();
Set<ObjectName> endpointNames = CastUtils.cast(mbsc.queryNames(queryEndpointName, null));
- // now get the ObjectName with the busId
- Iterator it = endpointNames.iterator();
+ // now get the ObjectName with the busId
+ Iterator<ObjectName> it = endpointNames.iterator();
if (it.hasNext()) {
// only deal with the first endpoint object which retrun from the list.
Modified: cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java (original)
+++ cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java Thu Jan 5 20:45:57 2012
@@ -79,9 +79,9 @@ public class InstrumentationManagerTest
assertNotNull("MBeanServer should be available.", mbs);
ObjectName name = new ObjectName(ManagementConstants.DEFAULT_DOMAIN_NAME
+ ":type=WorkQueues,*");
- Set s = mbs.queryNames(name, null);
+ Set<ObjectName> s = mbs.queryNames(name, null);
assertEquals(2, s.size());
- Iterator it = s.iterator();
+ Iterator<ObjectName> it = s.iterator();
while (it.hasNext()) {
ObjectName n = (ObjectName)it.next();
Long result =
Modified: cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java (original)
+++ cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java Thu Jan 5 20:45:57 2012
@@ -112,7 +112,7 @@ public class BusRegistrationTest extends
assertEquals("There should be one MBeanServer", mbs, mbs2);
// check both server and client bus can be found from this server
- Set s;
+ Set<ObjectName> s;
ObjectName serverName = getObjectName(serverBus);
s = mbs.queryNames(serverName, null);
assertTrue("sever-side bus should be found", s.size() == 1);
Modified: cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java Thu Jan 5 20:45:57 2012
@@ -159,7 +159,7 @@ public class JettyHTTPServerEngineBeanDe
}
@Override
- protected Class getBeanClass(Element arg0) {
+ protected Class<?> getBeanClass(Element arg0) {
return SpringJettyHTTPServerEngine.class;
}
Modified: cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java Thu Jan 5 20:45:57 2012
@@ -135,7 +135,7 @@ public class JettyHTTPServerEngineFactor
}
@Override
- protected Class getBeanClass(Element arg0) {
+ protected Class<?> getBeanClass(Element arg0) {
return SpringJettyHTTPServerEngineFactory.class;
}
Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpAuthSupplierBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpAuthSupplierBeanDefinitionParser.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpAuthSupplierBeanDefinitionParser.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpAuthSupplierBeanDefinitionParser.java Thu Jan 5 20:45:57 2012
@@ -32,7 +32,7 @@ public class HttpAuthSupplierBeanDefinit
return "org.apache.cxf.transports.http.configuration";
}
@Override
- protected Class getBeanClass(Element arg0) {
+ protected Class<?> getBeanClass(Element arg0) {
return HttpAuthSupplier.class;
}
Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java Thu Jan 5 20:45:57 2012
@@ -186,7 +186,7 @@ public class HttpConduitBeanDefinitionPa
}
@Override
- protected Class getBeanClass(Element arg0) {
+ protected Class<?> getBeanClass(Element arg0) {
return HTTPConduit.class;
}
Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpDestinationBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpDestinationBeanDefinitionParser.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpDestinationBeanDefinitionParser.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpDestinationBeanDefinitionParser.java Thu Jan 5 20:45:57 2012
@@ -52,7 +52,7 @@ public class HttpDestinationBeanDefiniti
}
@Override
- protected Class getBeanClass(Element arg0) {
+ protected Class<?> getBeanClass(Element arg0) {
return AbstractHTTPDestination.class;
}
Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/MessageTrustDeciderBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/MessageTrustDeciderBeanDefinitionParser.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/MessageTrustDeciderBeanDefinitionParser.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/MessageTrustDeciderBeanDefinitionParser.java Thu Jan 5 20:45:57 2012
@@ -34,7 +34,7 @@ public class MessageTrustDeciderBeanDefi
}
@Override
- protected Class getBeanClass(Element arg0) {
+ protected Class<?> getBeanClass(Element arg0) {
return MessageTrustDecider.class;
}
Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java Thu Jan 5 20:45:57 2012
@@ -212,7 +212,7 @@ public class HttpsURLConnectionFactory {
//need to see if we can create one - mostly the weblogic case. The
//weblogic SSLSocketFactory has a protected constructor that can take
//a JSSE SSLSocketFactory so we'll try and use that
- Constructor c = getSSLSocketFactory.getReturnType()
+ Constructor<?> c = getSSLSocketFactory.getReturnType()
.getDeclaredConstructor(SSLSocketFactory.class);
c.setAccessible(true);
setSSLSocketFactory.invoke(connection, c.newInstance(socketFactory));
Modified: cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSConduitBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSConduitBeanDefinitionParser.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSConduitBeanDefinitionParser.java (original)
+++ cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSConduitBeanDefinitionParser.java Thu Jan 5 20:45:57 2012
@@ -62,7 +62,7 @@ public class JMSConduitBeanDefinitionPar
}
@Override
- protected Class getBeanClass(Element arg0) {
+ protected Class<?> getBeanClass(Element arg0) {
return JMSConduit.class;
}
}
Modified: cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSDestinationBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSDestinationBeanDefinitionParser.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSDestinationBeanDefinitionParser.java (original)
+++ cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSDestinationBeanDefinitionParser.java Thu Jan 5 20:45:57 2012
@@ -60,7 +60,7 @@ public class JMSDestinationBeanDefinitio
}
@Override
- protected Class getBeanClass(Element arg0) {
+ protected Class<?> getBeanClass(Element arg0) {
return JMSDestination.class;
}
Modified: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/spring/AddressingBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/spring/AddressingBeanDefinitionParser.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/spring/AddressingBeanDefinitionParser.java (original)
+++ cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/spring/AddressingBeanDefinitionParser.java Thu Jan 5 20:45:57 2012
@@ -26,7 +26,7 @@ import org.apache.cxf.ws.addressing.WSAd
public class AddressingBeanDefinitionParser extends AbstractBeanDefinitionParser {
@Override
- protected Class getBeanClass(Element arg0) {
+ protected Class<?> getBeanClass(Element arg0) {
return WSAddressingFeature.class;
}
}
Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/ExternalAttachmentProviderBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/ExternalAttachmentProviderBeanDefinitionParser.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/ExternalAttachmentProviderBeanDefinitionParser.java (original)
+++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/ExternalAttachmentProviderBeanDefinitionParser.java Thu Jan 5 20:45:57 2012
@@ -26,7 +26,7 @@ import org.apache.cxf.ws.policy.attachme
public class ExternalAttachmentProviderBeanDefinitionParser extends AbstractBeanDefinitionParser {
@Override
- protected Class getBeanClass(Element el) {
+ protected Class<?> getBeanClass(Element el) {
return ExternalAttachmentProvider.class;
}
Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/PolicyEngineBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/PolicyEngineBeanDefinitionParser.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/PolicyEngineBeanDefinitionParser.java (original)
+++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/PolicyEngineBeanDefinitionParser.java Thu Jan 5 20:45:57 2012
@@ -48,7 +48,7 @@ public class PolicyEngineBeanDefinitionP
}
@Override
- protected Class getBeanClass(Element el) {
+ protected Class<?> getBeanClass(Element el) {
return PolicyEngineConfig.class;
}
Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/PolicyFeatureBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/PolicyFeatureBeanDefinitionParser.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/PolicyFeatureBeanDefinitionParser.java (original)
+++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/PolicyFeatureBeanDefinitionParser.java Thu Jan 5 20:45:57 2012
@@ -61,7 +61,7 @@ public class PolicyFeatureBeanDefinition
}
@Override
- protected Class getBeanClass(Element el) {
+ protected Class<?> getBeanClass(Element el) {
return WSPolicyFeature.class;
}
Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder.java Thu Jan 5 20:45:57 2012
@@ -65,21 +65,21 @@ public interface EncoderDecoder {
*
* @return class
*/
- Class getCreateSequenceType();
+ Class<?> getCreateSequenceType();
/**
* Get the class used for the CreateSequenceResponseType.
*
* @return class
*/
- Class getCreateSequenceResponseType();
+ Class<?> getCreateSequenceResponseType();
/**
* Get the class used for the TerminateSequenceType.
*
* @return class
*/
- Class getTerminateSequenceType();
+ Class<?> getTerminateSequenceType();
/**
* Builds an element containing WS-RM headers. This adds the appropriate WS-RM and WS-A namespace
Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder10AImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder10AImpl.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder10AImpl.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder10AImpl.java Thu Jan 5 20:45:57 2012
@@ -74,22 +74,22 @@ public final class EncoderDecoder10AImpl
return RM10Constants.INSTANCE;
}
- public Class getCreateSequenceType() {
+ public Class<?> getCreateSequenceType() {
return org.apache.cxf.ws.rm.v200502wsa15.CreateSequenceType.class;
}
- public Class getCreateSequenceResponseType() {
+ public Class<?> getCreateSequenceResponseType() {
return org.apache.cxf.ws.rm.v200502wsa15.CreateSequenceResponseType.class;
}
- public Class getTerminateSequenceType() {
+ public Class<?> getTerminateSequenceType() {
return org.apache.cxf.ws.rm.v200502wsa15.TerminateSequenceType.class;
}
private static JAXBContext getContext() throws JAXBException {
synchronized (EncoderDecoder10AImpl.class) {
if (jaxbContext == null) {
- Class clas = RMUtils.getWSRM200502WSA200508Factory().getClass();
+ Class<?> clas = RMUtils.getWSRM200502WSA200508Factory().getClass();
jaxbContext = JAXBContext.newInstance(PackageUtils.getPackageName(clas),
clas.getClassLoader());
}
@@ -118,7 +118,8 @@ public final class EncoderDecoder10AImpl
if (rmps.isLastMessage()) {
toseq.setLastMessage(new org.apache.cxf.ws.rm.v200502wsa15.SequenceType.LastMessage());
}
- JAXBElement element = RMUtils.getWSRM200502WSA200508Factory().createSequence(toseq);
+ JAXBElement<org.apache.cxf.ws.rm.v200502wsa15.SequenceType> element
+ = RMUtils.getWSRM200502WSA200508Factory().createSequence(toseq);
marshaller.marshal(element, header);
}
Collection<SequenceAcknowledgement> acks = rmps.getAcks();
Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder10Impl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder10Impl.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder10Impl.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder10Impl.java Thu Jan 5 20:45:57 2012
@@ -74,22 +74,22 @@ public final class EncoderDecoder10Impl
return RM10Constants.INSTANCE;
}
- public Class getCreateSequenceType() {
+ public Class<?> getCreateSequenceType() {
return org.apache.cxf.ws.rm.v200502.CreateSequenceType.class;
}
- public Class getCreateSequenceResponseType() {
+ public Class<?> getCreateSequenceResponseType() {
return org.apache.cxf.ws.rm.v200502.CreateSequenceResponseType.class;
}
- public Class getTerminateSequenceType() {
+ public Class<?> getTerminateSequenceType() {
return org.apache.cxf.ws.rm.v200502.TerminateSequenceType.class;
}
private static JAXBContext getContext() throws JAXBException {
synchronized (EncoderDecoder10Impl.class) {
if (jaxbContext == null) {
- Class clas = RMUtils.getWSRM200502Factory().getClass();
+ Class<?> clas = RMUtils.getWSRM200502Factory().getClass();
jaxbContext = JAXBContext.newInstance(PackageUtils.getPackageName(clas),
clas.getClassLoader());
}
@@ -118,7 +118,8 @@ public final class EncoderDecoder10Impl
if (rmps.isLastMessage()) {
toseq.setLastMessage(new org.apache.cxf.ws.rm.v200502.SequenceType.LastMessage());
}
- JAXBElement element = RMUtils.getWSRM200502Factory().createSequence(toseq);
+ JAXBElement<org.apache.cxf.ws.rm.v200502.SequenceType> element
+ = RMUtils.getWSRM200502Factory().createSequence(toseq);
marshaller.marshal(element, header);
}
Collection<SequenceAcknowledgement> acks = rmps.getAcks();
Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder11Impl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder11Impl.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder11Impl.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder11Impl.java Thu Jan 5 20:45:57 2012
@@ -75,22 +75,22 @@ public final class EncoderDecoder11Impl
return RM11Constants.INSTANCE;
}
- public Class getCreateSequenceType() {
+ public Class<?> getCreateSequenceType() {
return org.apache.cxf.ws.rm.v200702.CreateSequenceType.class;
}
- public Class getCreateSequenceResponseType() {
+ public Class<?> getCreateSequenceResponseType() {
return org.apache.cxf.ws.rm.v200702.CreateSequenceResponseType.class;
}
- public Class getTerminateSequenceType() {
+ public Class<?> getTerminateSequenceType() {
return org.apache.cxf.ws.rm.v200702.TerminateSequenceType.class;
}
private static JAXBContext getContext() throws JAXBException {
synchronized (EncoderDecoder11Impl.class) {
if (jaxbContext == null) {
- Class clas = RMUtils.getWSRMFactory().getClass();
+ Class<?> clas = RMUtils.getWSRMFactory().getClass();
jaxbContext = JAXBContext.newInstance(PackageUtils.getPackageName(clas),
clas.getClassLoader());
}
@@ -115,7 +115,7 @@ public final class EncoderDecoder11Impl
SequenceType seq = rmps.getSequence();
if (null != seq) {
LOG.log(Level.FINE, "encoding sequence into RM header");
- JAXBElement element = RMUtils.getWSRMFactory().createSequence(seq);
+ JAXBElement<SequenceType> element = RMUtils.getWSRMFactory().createSequence(seq);
marshaller.marshal(element, header);
}
Collection<SequenceAcknowledgement> acks = rmps.getAcks();
Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMEndpoint.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMEndpoint.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMEndpoint.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMEndpoint.java Thu Jan 5 20:45:57 2012
@@ -55,21 +55,21 @@ public class ManagedRMEndpoint implement
{"sequenceId", "currentMessageNumber", "expires", "lastMessage", "queuedMessageCount",
"target"};
private static final String[] SOURCE_SEQUENCE_DESCRIPTIONS = SOURCE_SEQUENCE_NAMES;
- private static final OpenType[] SOURCE_SEQUENCE_TYPES =
+ private static final OpenType<?>[] SOURCE_SEQUENCE_TYPES =
{SimpleType.STRING, SimpleType.LONG, SimpleType.DATE, SimpleType.BOOLEAN, SimpleType.INTEGER,
SimpleType.STRING};
private static final String[] DESTINATION_SEQUENCE_NAMES =
{"sequenceId", "lastMessageNumber", "correlationId", "ackTo"};
private static final String[] DESTINATION_SEQUENCE_DESCRIPTIONS = DESTINATION_SEQUENCE_NAMES;
- private static final OpenType[] DESTINATION_SEQUENCE_TYPES =
+ private static final OpenType<?>[] DESTINATION_SEQUENCE_TYPES =
{SimpleType.STRING, SimpleType.LONG, SimpleType.STRING,
SimpleType.STRING};
private static final String[] RETRANSMISSION_STATUS_NAMES =
{"messageNumber", "resends", "previous", "next", "nextInterval", "backOff", "pending", "suspended"};
private static final String[] RETRANSMISSION_STATUS_DESCRIPTIONS = RETRANSMISSION_STATUS_NAMES;
- private static final OpenType[] RETRANSMISSION_STATUS_TYPES =
+ private static final OpenType<?>[] RETRANSMISSION_STATUS_TYPES =
{SimpleType.LONG, SimpleType.INTEGER, SimpleType.DATE, SimpleType.DATE, SimpleType.LONG, SimpleType.LONG,
SimpleType.BOOLEAN, SimpleType.BOOLEAN};
Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java Thu Jan 5 20:45:57 2012
@@ -288,7 +288,7 @@ public class RMEndpoint {
service = new WrappedService(applicationEndpoint.getService(), serviceQName, si);
DataBinding dataBinding = null;
- Class create = protocol.getCodec().getCreateSequenceType();
+ Class<?> create = protocol.getCodec().getCreateSequenceType();
try {
JAXBContext ctx =
JAXBContext.newInstance(PackageUtils.getPackageName(create), create.getClassLoader());
Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java Thu Jan 5 20:45:57 2012
@@ -125,7 +125,7 @@ public class RMOutInterceptor extends Ab
synchronized (source) {
SourceSequence seq = null;
if (isLastMessage) {
- Map<?, ?> invocationContext = (Map)msg.get(Message.INVOCATION_CONTEXT);
+ Map<?, ?> invocationContext = (Map<?, ?>)msg.get(Message.INVOCATION_CONTEXT);
seq = (SourceSequence)invocationContext.get(SourceSequence.class.getName());
} else {
seq = getManager().getSequence(inSeqId, msg, maps);
Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Servant.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Servant.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Servant.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Servant.java Thu Jan 5 20:45:57 2012
@@ -246,7 +246,7 @@ public class Servant implements Invoker
}
Object getParameter(Message message) {
- List resList = null;
+ List<?> resList = null;
// assert message == message.getExchange().getInMessage();
if (message != null) {
Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java Thu Jan 5 20:45:57 2012
@@ -45,6 +45,7 @@ public class RMBPHandler implements Name
return null;
}
+ @SuppressWarnings("rawtypes")
public Set<Class> getManagedClasses() {
return null;
}
Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/spring/RMFeatureBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/spring/RMFeatureBeanDefinitionParser.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/spring/RMFeatureBeanDefinitionParser.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/spring/RMFeatureBeanDefinitionParser.java Thu Jan 5 20:45:57 2012
@@ -63,7 +63,7 @@ public class RMFeatureBeanDefinitionPars
}
@Override
- protected Class getBeanClass(Element element) {
+ protected Class<?> getBeanClass(Element element) {
return RMFeature.class;
}
Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/spring/RMManagerBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/spring/RMManagerBeanDefinitionParser.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/spring/RMManagerBeanDefinitionParser.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/spring/RMManagerBeanDefinitionParser.java Thu Jan 5 20:45:57 2012
@@ -77,7 +77,7 @@ public class RMManagerBeanDefinitionPars
}
@Override
- protected Class getBeanClass(Element element) {
+ protected Class<?> getBeanClass(Element element) {
return RMManager.class;
}
Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/spring/RMTxStoreBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/spring/RMTxStoreBeanDefinitionParser.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/spring/RMTxStoreBeanDefinitionParser.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/spring/RMTxStoreBeanDefinitionParser.java Thu Jan 5 20:45:57 2012
@@ -26,7 +26,7 @@ import org.apache.cxf.ws.rm.persistence.
public class RMTxStoreBeanDefinitionParser extends AbstractBeanDefinitionParser {
@Override
- protected Class getBeanClass(Element element) {
+ protected Class<?> getBeanClass(Element element) {
return RMTxStore.class;
}
Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java (original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java Thu Jan 5 20:45:57 2012
@@ -129,7 +129,7 @@ public class DispatchClientServerTest ex
BusFactory.getDefaultBus().getInInterceptors().add(new LoggingInInterceptor());
}
- private void waitForFuture(Future fd) throws Exception {
+ private void waitForFuture(Future<?> fd) throws Exception {
int count = 0;
while (!fd.isDone()) {
++count;
@@ -162,7 +162,7 @@ public class DispatchClientServerTest ex
+ TestUtil.getPortNumber("fake-port")
+ "/SOAPDispatchService/SoapDispatchPort");
- DispatchImpl dispImpl = (DispatchImpl)disp;
+ DispatchImpl<?> dispImpl = (DispatchImpl<?>)disp;
HTTPConduit cond = (HTTPConduit)dispImpl.getClient().getConduit();
cond.getClient().setConnectionTimeout(500);
@@ -297,7 +297,7 @@ public class DispatchClientServerTest ex
SOAPMessage soapReqMsg2 = MessageFactory.newInstance().createMessage(null, is2);
assertNotNull(soapReqMsg2);
- Response response = disp.invokeAsync(soapReqMsg2);
+ Response<?> response = disp.invokeAsync(soapReqMsg2);
SOAPMessage soapResMsg2 = (SOAPMessage)response.get();
assertNotNull(soapResMsg2);
String expected2 = "Hello TestSOAPInputMessage2";
@@ -309,7 +309,7 @@ public class DispatchClientServerTest ex
SOAPMessage soapReqMsg3 = MessageFactory.newInstance().createMessage(null, is3);
assertNotNull(soapReqMsg3);
TestSOAPMessageHandler tsmh = new TestSOAPMessageHandler();
- Future f = disp.invokeAsync(soapReqMsg3, tsmh);
+ Future<?> f = disp.invokeAsync(soapReqMsg3, tsmh);
assertNotNull(f);
waitForFuture(f);
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java Thu Jan 5 20:45:57 2012
@@ -287,7 +287,7 @@ public class WSSecurityClientTest extend
"POST"
);
if (decoupled) {
- HTTPConduit cond = (HTTPConduit)((DispatchImpl)dispatcher).getClient().getConduit();
+ HTTPConduit cond = (HTTPConduit)((DispatchImpl<?>)dispatcher).getClient().getConduit();
cond.getClient().setDecoupledEndpoint("http://localhost:" + DEC_PORT + "/decoupled");
}
return dispatcher;
Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ProtocolVariationsTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ProtocolVariationsTest.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ProtocolVariationsTest.java (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ProtocolVariationsTest.java Thu Jan 5 20:45:57 2012
@@ -334,7 +334,7 @@ public class ProtocolVariationsTest exte
ClientProxy.getClient(greeter).getConduit().close();
}
if (dispatch != null) {
- ((DispatchImpl)dispatch).getClient().getConduit().close();
+ ((DispatchImpl<?>)dispatch).getClient().getConduit().close();
}
greeterBus.shutdown(true);
greeter = null;
Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java Thu Jan 5 20:45:57 2012
@@ -1461,7 +1461,7 @@ public class SequenceTest extends Abstra
dispatch.getRequestContext().put(BindingProvider.SOAPACTION_USE_PROPERTY, Boolean.FALSE);
if (useDecoupledEndpoint) {
- initDecoupledEndpoint(((DispatchImpl)dispatch).getClient());
+ initDecoupledEndpoint(((DispatchImpl<?>)dispatch).getClient());
}
}
@@ -1509,7 +1509,7 @@ public class SequenceTest extends Abstra
ClientProxy.getClient(greeter).getConduit().close();
}
if (dispatch != null) {
- ((DispatchImpl)dispatch).getClient().getConduit().close();
+ ((DispatchImpl<?>)dispatch).getClient().getConduit().close();
}
greeterBus.shutdown(true);
greeter = null;
Modified: cxf/trunk/testutils/src/main/java/org/apache/cxf/customer/book/BookServiceImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/src/main/java/org/apache/cxf/customer/book/BookServiceImpl.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/testutils/src/main/java/org/apache/cxf/customer/book/BookServiceImpl.java (original)
+++ cxf/trunk/testutils/src/main/java/org/apache/cxf/customer/book/BookServiceImpl.java Thu Jan 5 20:45:57 2012
@@ -20,7 +20,6 @@
package org.apache.cxf.customer.book;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import javax.jws.WebService;
@@ -29,19 +28,16 @@ import javax.jws.WebService;
@WebService(endpointInterface = "org.apache.cxf.customer.book.BookService")
public class BookServiceImpl implements BookService {
long currentId = 1;
- Map books = new HashMap();
+ Map<Long, Book> books = new HashMap<Long, Book>();
- @SuppressWarnings("unchecked")
public BookServiceImpl() {
Book book = createBook();
System.out.println("Enregistre Book de id " + book.getId());
books.put(book.getId(), book);
}
- @SuppressWarnings("unchecked")
public Books getBooks() {
- for (Iterator iter = books.entrySet().iterator(); iter.hasNext();) {
- Map.Entry me = (Map.Entry)iter.next();
+ for (Map.Entry<Long, Book> me : books.entrySet()) {
System.out.println("getBooks -> " + me.getKey() + " : " + me.getValue());
}
Books b = new Books();
@@ -50,8 +46,7 @@ public class BookServiceImpl implements
}
public Book getBook(GetBook getBook) throws BookNotFoundFault {
- for (Iterator iter = books.entrySet().iterator(); iter.hasNext();) {
- Map.Entry me = (Map.Entry)iter.next();
+ for (Map.Entry<Long, Book> me : books.entrySet()) {
System.out.println("getBook -> " + me.getKey() + " : "
+ ((Book)me.getValue()).getName() + ", " + ((Book)me.getValue()).getId());
}
@@ -67,8 +62,7 @@ public class BookServiceImpl implements
}
public Book getAnotherBook(GetAnotherBook getAnotherBook) throws BookNotFoundFault {
- for (Iterator iter = books.entrySet().iterator(); iter.hasNext();) {
- Map.Entry me = (Map.Entry)iter.next();
+ for (Map.Entry<Long, Book> me : books.entrySet()) {
System.out.println("getBook -> " + me.getKey() + " : "
+ ((Book)me.getValue()).getName() + ", " + ((Book)me.getValue()).getId());
}
@@ -83,23 +77,19 @@ public class BookServiceImpl implements
return b;
}
- @SuppressWarnings("unchecked")
public void updateBook(Book b) {
books.put(b.getId(), b);
- for (Iterator iter = books.entrySet().iterator(); iter.hasNext();) {
- Map.Entry me = (Map.Entry)iter.next();
+ for (Map.Entry<Long, Book> me : books.entrySet()) {
System.out.println("updateBook -> " + me.getKey() + " : " + me.getValue());
}
}
- @SuppressWarnings("unchecked")
public long addBook(Book b) {
long id = ++currentId;
System.out.println("addBook : " + b.getName());
b.setId(id);
books.put(id, b);
- for (Iterator iter = books.entrySet().iterator(); iter.hasNext();) {
- Map.Entry me = (Map.Entry)iter.next();
+ for (Map.Entry<Long, Book> me : books.entrySet()) {
System.out.println("addBook -> " + me.getKey() + " : "
+ ((Book)me.getValue()).getName() + ", " + ((Book)me.getValue()).getId());
}
@@ -109,8 +99,7 @@ public class BookServiceImpl implements
public void deleteBook(long id) {
books.remove(id);
- for (Iterator iter = books.entrySet().iterator(); iter.hasNext();) {
- Map.Entry me = (Map.Entry)iter.next();
+ for (Map.Entry<Long, Book> me : books.entrySet()) {
System.out.println("deleteBook -> " + me.getKey() + " : " + me.getValue());
}
}
Modified: cxf/trunk/testutils/src/main/java/org/apache/cxf/customer/book/BookServiceWrappedImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/src/main/java/org/apache/cxf/customer/book/BookServiceWrappedImpl.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/testutils/src/main/java/org/apache/cxf/customer/book/BookServiceWrappedImpl.java (original)
+++ cxf/trunk/testutils/src/main/java/org/apache/cxf/customer/book/BookServiceWrappedImpl.java Thu Jan 5 20:45:57 2012
@@ -20,7 +20,6 @@
package org.apache.cxf.customer.book;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import javax.jws.WebService;
@@ -29,9 +28,8 @@ import javax.jws.WebService;
@WebService(endpointInterface = "org.apache.cxf.customer.book.BookService")
public class BookServiceWrappedImpl implements BookServiceWrapped {
long currentId = 1;
- Map books = new HashMap();
+ Map<Long, Book> books = new HashMap<Long, Book>();
- @SuppressWarnings("unchecked")
public BookServiceWrappedImpl() {
Book book = createBook();
System.out.println("Register the Book's id " + book.getId());
@@ -39,8 +37,7 @@ public class BookServiceWrappedImpl impl
}
public Book getBook(long bookid) throws BookNotFoundFault {
- for (Iterator iter = books.entrySet().iterator(); iter.hasNext();) {
- Map.Entry me = (Map.Entry)iter.next();
+ for (Map.Entry<Long, Book> me : books.entrySet()) {
System.out.println("getBook -> " + me.getKey() + " : "
+ ((Book)me.getValue()).getName() + ", " + ((Book)me.getValue()).getId());
}
Modified: cxf/trunk/testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java (original)
+++ cxf/trunk/testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java Thu Jan 5 20:45:57 2012
@@ -115,7 +115,7 @@ public class ControlImpl implements Cont
public void setFaultLocation(FaultLocation fl) {
List<Interceptor<? extends Message>> interceptors = greeterBus.getInInterceptors();
FaultThrowingInterceptor fi = null;
- for (Interceptor i : interceptors) {
+ for (Interceptor<? extends Message> i : interceptors) {
if (i instanceof FaultThrowingInterceptor) {
interceptors.remove(i);
LOG.fine("Removed existing FaultThrowingInterceptor");
Modified: cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java (original)
+++ cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java Thu Jan 5 20:45:57 2012
@@ -48,10 +48,10 @@ public class EmbeddedJMSBrokerLauncher e
}
Definition def = bus.getExtension(WSDLManager.class)
.getDefinition(wsdlLocation);
- Map map = def.getAllServices();
+ Map<?, ?> map = def.getAllServices();
for (Object o : map.values()) {
Service service = (Service)o;
- Map ports = service.getPorts();
+ Map<?, ?> ports = service.getPorts();
for (Object p : ports.values()) {
Port port = (Port)p;
List<?> l = port.getExtensibilityElements();
@@ -70,7 +70,7 @@ public class EmbeddedJMSBrokerLauncher e
try {
Field f = e.getClass().getDeclaredField("jmsNamingProperty");
f.setAccessible(true);
- List<?> props = (List)f.get(e);
+ List<?> props = (List<?>)f.get(e);
for (Object prop : props) {
f = prop.getClass().getDeclaredField("name");
f.setAccessible(true);
Modified: cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/BaseGreeterImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/BaseGreeterImpl.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/BaseGreeterImpl.java (original)
+++ cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/BaseGreeterImpl.java Thu Jan 5 20:45:57 2012
@@ -157,19 +157,14 @@ public class BaseGreeterImpl implements
/*not called */
}
- public Future<?> testDocLitFaultAsync(String faultType, AsyncHandler ah) {
+ public Future<?> testDocLitFaultAsync(String faultType,
+ AsyncHandler<org.apache.hello_world_soap_http.types.TestDocLitFaultResponse> ah) {
invocationCount++;
System.err.println("In testDocLitFaultAsync 2");
return null;
/*not called */
}
- public Future<?> testDocLitBareAsync(String bare, AsyncHandler ah) {
- invocationCount++;
- return null;
- /* not called */
- }
-
public Response<BareDocumentResponse> testDocLitBareAsync(String bare) {
invocationCount++;
return null;
Modified: cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotation.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotation.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotation.java (original)
+++ cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotation.java Thu Jan 5 20:45:57 2012
@@ -26,7 +26,7 @@ import java.util.Set;
public final class JAnnotation {
- private Class type;
+ private Class<?> type;
private List<JAnnotationElement> elements = new ArrayList<JAnnotationElement>();
private Set<String> imports = new HashSet<String>();
@@ -34,7 +34,7 @@ public final class JAnnotation {
// empty
}
- public JAnnotation(Class t) {
+ public JAnnotation(Class<?> t) {
setType(t);
}
@@ -76,11 +76,11 @@ public final class JAnnotation {
return null;
}
- public Class getType() {
+ public Class<?> getType() {
return type;
}
- public void setType(final Class newType) {
+ public void setType(final Class<?> newType) {
this.type = newType;
imports.add(type.getName());
}
Modified: cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaType.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaType.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaType.java (original)
+++ cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaType.java Thu Jan 5 20:45:57 2012
@@ -142,8 +142,8 @@ public class JavaType {
return "null";
}
- private boolean hasDefaultConstructor(Class clz) {
- Constructor[] cons = clz.getConstructors();
+ private boolean hasDefaultConstructor(Class<?> clz) {
+ Constructor<?>[] cons = clz.getConstructors();
if (cons.length == 0) {
return false;
} else {
Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java (original)
+++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java Thu Jan 5 20:45:57 2012
@@ -236,7 +236,7 @@ public final class ProcessorUtil {
}
if (!primitiveType && dataBinding == null) {
- Class holderClass = JAXBUtils.holderClass(xmlTypeName.getLocalPart());
+ Class<?> holderClass = JAXBUtils.holderClass(xmlTypeName.getLocalPart());
jtype = holderClass == null ? null : holderClass.getName();
if (jtype == null) {
jtype = JAXBUtils.builtInTypeToJavaType(xmlTypeName.getLocalPart());
Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlJavaTypeAdapterAnnotator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlJavaTypeAdapterAnnotator.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlJavaTypeAdapterAnnotator.java (original)
+++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlJavaTypeAdapterAnnotator.java Thu Jan 5 20:45:57 2012
@@ -31,9 +31,10 @@ import org.apache.cxf.tools.common.model
public class XmlJavaTypeAdapterAnnotator implements Annotator {
private JavaInterface jf;
- private Class<? extends XmlAdapter> adapter;
+ private Class<? extends XmlAdapter<?, ?>> adapter;
- public XmlJavaTypeAdapterAnnotator(JavaInterface intf, Class<? extends XmlAdapter> adapter) {
+ public XmlJavaTypeAdapterAnnotator(JavaInterface intf,
+ Class<? extends XmlAdapter<?, ?>> adapter) {
this.jf = intf;
this.adapter = adapter;
}
Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilder.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilder.java (original)
+++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilder.java Thu Jan 5 20:45:57 2012
@@ -98,7 +98,7 @@ public class JAXWSDefinitionBuilder exte
registerJAXWSBinding(registry, BindingOperation.class);
}
- private void registerJAXWSBinding(ExtensionRegistry registry, Class clz) {
+ private void registerJAXWSBinding(ExtensionRegistry registry, Class<?> clz) {
registry.registerSerializer(clz, ToolConstants.JAXWS_BINDINGS, new JAXWSBindingSerializer());
registry.registerDeserializer(clz, ToolConstants.JAXWS_BINDINGS, new JAXWSBindingDeserializer());
registry.mapExtensionTypes(clz, ToolConstants.JAXWS_BINDINGS, JAXWSBinding.class);
@@ -143,12 +143,12 @@ public class JAXWSDefinitionBuilder exte
}
private boolean isRPCEncoded(Definition def) {
- Iterator ite1 = def.getBindings().values().iterator();
+ Iterator<?> ite1 = def.getBindings().values().iterator();
while (ite1.hasNext()) {
Binding binding = (Binding)ite1.next();
String bindingStyle = SOAPBindingUtil.getBindingStyle(binding);
- Iterator ite2 = binding.getBindingOperations().iterator();
+ Iterator<?> ite2 = binding.getBindingOperations().iterator();
while (ite2.hasNext()) {
BindingOperation bop = (BindingOperation)ite2.next();
String bopStyle = SOAPBindingUtil.getSOAPOperationStyle(bop);
Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java (original)
+++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java Thu Jan 5 20:45:57 2012
@@ -82,11 +82,11 @@ public class JAXWSProfileTest extends As
assertNotNull(processor);
assertTrue(processor instanceof WSDLToJavaProcessor);
- AbstractWSDLBuilder builder = profile.getWSDLBuilder();
+ AbstractWSDLBuilder<?> builder = profile.getWSDLBuilder();
assertNotNull(builder);
assertTrue(builder instanceof JAXWSDefinitionBuilder);
- Class container = profile.getContainerClass();
+ Class<?> container = profile.getContainerClass();
assertEquals(container, JAXWSContainer.class);
assertEquals("/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-toolspec.xml", profile.getToolspec());
}
Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlSeeAlsoAnnotatorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlSeeAlsoAnnotatorTest.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlSeeAlsoAnnotatorTest.java (original)
+++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlSeeAlsoAnnotatorTest.java Thu Jan 5 20:45:57 2012
@@ -38,7 +38,7 @@ public class XmlSeeAlsoAnnotatorTest ext
collector.getTypesPackages().add(ObjectFactory.class.getPackage().getName());
intf.annotate(new XmlSeeAlsoAnnotator(collector));
- Iterator iter = intf.getImports();
+ Iterator<String> iter = intf.getImports();
assertEquals("javax.xml.bind.annotation.XmlSeeAlso", iter.next());
assertEquals("@XmlSeeAlso({" + ObjectFactory.class.getName() + ".class})",
Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java (original)
+++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java Thu Jan 5 20:45:57 2012
@@ -55,8 +55,8 @@ public class JAXWSDefinitionBuilderTest
builder.customize();
Definition customizedDef = builder.getWSDLModel();
- List defExtensionList = customizedDef.getExtensibilityElements();
- Iterator ite = defExtensionList.iterator();
+ List<?> defExtensionList = customizedDef.getExtensibilityElements();
+ Iterator<?> ite = defExtensionList.iterator();
while (ite.hasNext()) {
ExtensibilityElement extElement = (ExtensibilityElement)ite.next();
@@ -68,15 +68,15 @@ public class JAXWSDefinitionBuilderTest
PortType portType = customizedDef.getPortType(new QName("http://apache.org/hello_world_soap_http",
"Greeter"));
- List portTypeList = portType.getExtensibilityElements();
+ List<?> portTypeList = portType.getExtensibilityElements();
JAXWSBinding binding = (JAXWSBinding)portTypeList.get(0);
assertEquals("Customized enable EnableWrapperStyle name does not been parsered", true, binding
.isEnableWrapperStyle());
- List opList = portType.getOperations();
+ List<?> opList = portType.getOperations();
Operation operation = (Operation)opList.get(0);
- List extList = operation.getExtensibilityElements();
+ List<?> extList = operation.getExtensibilityElements();
binding = (JAXWSBinding)extList.get(0);
assertEquals("Customized method name does not parsered", "echoMeOneWay", binding.getMethodName());
@@ -103,8 +103,8 @@ public class JAXWSDefinitionBuilderTest
builder.customize();
Definition customizedDef = builder.getWSDLModel();
- List defExtensionList = customizedDef.getExtensibilityElements();
- Iterator ite = defExtensionList.iterator();
+ List<?> defExtensionList = customizedDef.getExtensibilityElements();
+ Iterator<?> ite = defExtensionList.iterator();
while (ite.hasNext()) {
ExtensibilityElement extElement = (ExtensibilityElement)ite.next();
@@ -116,15 +116,15 @@ public class JAXWSDefinitionBuilderTest
PortType portType = customizedDef.getPortType(new QName("http://apache.org/hello_world_soap_http",
"Greeter"));
- List portTypeList = portType.getExtensibilityElements();
+ List<?> portTypeList = portType.getExtensibilityElements();
JAXWSBinding binding = (JAXWSBinding)portTypeList.get(0);
assertEquals("Customized enable EnableWrapperStyle name does not been parsered", true, binding
.isEnableWrapperStyle());
- List opList = portType.getOperations();
+ List<?> opList = portType.getOperations();
Operation operation = (Operation)opList.get(0);
- List extList = operation.getExtensibilityElements();
+ List<?> extList = operation.getExtensibilityElements();
binding = (JAXWSBinding)extList.get(0);
assertEquals("Customized method name does not parsered", "echoMeOneWay", binding.getMethodName());