Author: mcombellack
Date: Thu Dec 4 04:42:00 2008
New Revision: 723300
URL: http://svn.apache.org/viewvc?rev=723300&view=rev
Log:
Fixed generics raw type compiler warnings
Modified:
tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaElementImpl.java
tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java
tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
tuscany/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
Modified:
tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java?rev=723300&r1=723299&r2=723300&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
(original)
+++
tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
Thu Dec 4 04:42:00 2008
@@ -100,7 +100,7 @@
@Test
public void testGetAllInterfaces() {
- Set<Class> interfaces =
JavaIntrospectionHelper.getAllInterfaces(Z.class);
+ Set<Class<?>> interfaces =
JavaIntrospectionHelper.getAllInterfaces(Z.class);
assertEquals(2, interfaces.size());
assertTrue(interfaces.contains(W.class));
assertTrue(interfaces.contains(W2.class));
@@ -109,13 +109,13 @@
@Test
public void testGetAllInterfacesObject() {
- Set<Class> interfaces =
JavaIntrospectionHelper.getAllInterfaces(Object.class);
+ Set<Class<?>> interfaces =
JavaIntrospectionHelper.getAllInterfaces(Object.class);
assertEquals(0, interfaces.size());
}
@Test
public void testGetAllInterfacesNoInterfaces() {
- Set<Class> interfaces =
JavaIntrospectionHelper.getAllInterfaces(NoInterface.class);
+ Set<Class<?>> interfaces =
JavaIntrospectionHelper.getAllInterfaces(NoInterface.class);
assertEquals(0, interfaces.size());
}
Modified:
tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaElementImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaElementImpl.java?rev=723300&r1=723299&r2=723300&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaElementImpl.java
(original)
+++
tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaElementImpl.java
Thu Dec 4 04:42:00 2008
@@ -136,7 +136,7 @@
return ((Method)anchor).getAnnotations();
}
if (anchor instanceof Constructor) {
- return ((Constructor)anchor).getParameterAnnotations()[index];
+ return
((Constructor<?>)anchor).getParameterAnnotations()[index];
}
}
return anchor.getAnnotations();
Modified:
tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java?rev=723300&r1=723299&r2=723300&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
(original)
+++
tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
Thu Dec 4 04:42:00 2008
@@ -118,7 +118,7 @@
}
}
- Class superClass = clazz.getSuperclass();
+ Class<?> superClass = clazz.getSuperclass();
if (superClass != null) {
visitSuperClass(superClass, type);
}
Modified:
tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java?rev=723300&r1=723299&r2=723300&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java
(original)
+++
tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java
Thu Dec 4 04:42:00 2008
@@ -287,7 +287,7 @@
return implClass.getSimpleName();
}
- public static boolean isImmutable(Class clazz) {
+ public static boolean isImmutable(Class<?> clazz) {
return String.class == clazz || clazz.isPrimitive()
|| Number.class.isAssignableFrom(clazz)
|| Boolean.class.isAssignableFrom(clazz)
@@ -318,7 +318,7 @@
public static Class<?> getErasure(Type type) {
if (type instanceof Class) {
- return (Class)type;
+ return (Class<?>)type;
} else if (type instanceof GenericArrayType) {
// FIXME: How to deal with the []?
GenericArrayType arrayType = (GenericArrayType)type;
@@ -399,7 +399,7 @@
* Compares a two types, assuming one is a primitive, to determine if the
* other is its object counterpart
*/
- private static boolean primitiveAssignable(Class memberType, Class param) {
+ private static boolean primitiveAssignable(Class<?> memberType, Class<?>
param) {
if (memberType == Integer.class) {
return param == Integer.TYPE;
} else if (memberType == Double.class) {
@@ -490,15 +490,15 @@
* Returns the set of interfaces implemented by the given class and its
* ancestors or a blank set if none
*/
- public static Set<Class> getAllInterfaces(Class clazz) {
- Set<Class> implemented = new HashSet<Class>();
+ public static Set<Class<?>> getAllInterfaces(Class<?> clazz) {
+ Set<Class<?>> implemented = new HashSet<Class<?>>();
getAllInterfaces(clazz, implemented);
return implemented;
}
- private static void getAllInterfaces(Class clazz, Set<Class> implemented) {
- Class[] interfaces = clazz.getInterfaces();
- for (Class interfaze : interfaces) {
+ private static void getAllInterfaces(Class<?> clazz, Set<Class<?>>
implemented) {
+ Class<?>[] interfaces = clazz.getInterfaces();
+ for (Class<?> interfaze : interfaces) {
implemented.add(interfaze);
}
Class<?> superClass = clazz.getSuperclass();
@@ -518,7 +518,7 @@
.startsWith("get"));
}
- private final static Map<Class, String> signatures = new HashMap<Class,
String>();
+ private final static Map<Class<?>, String> signatures = new
HashMap<Class<?>, String>();
static {
signatures.put(boolean.class, "Z");
signatures.put(byte.class, "B");
@@ -549,7 +549,7 @@
return Class.forName(buf.toString(), false,
componentType.getClassLoader());
}
- public static Set<Method> getPrivateMethods(Class clazz) {
+ public static Set<Method> getPrivateMethods(Class<?> clazz) {
Set<Method> methods = new HashSet<Method>();
Method[] declaredMethods = clazz.getDeclaredMethods();
for (final Method declaredMethod : declaredMethods) {
@@ -562,7 +562,7 @@
return methods;
}
- public static Set<Field> getPrivateFields(Class clazz) {
+ public static Set<Field> getPrivateFields(Class<?> clazz) {
Set<Field> fields = new HashSet<Field>();
Field[] declaredFields = clazz.getDeclaredFields();
for (final Field declaredField : declaredFields) {
Modified:
tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java?rev=723300&r1=723299&r2=723300&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
(original)
+++
tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
Thu Dec 4 04:42:00 2008
@@ -98,7 +98,7 @@
* interfaces is remotable, then by default the implementation
offers a single service whose type
* is the implementation class.
*/
- Set<Class> interfaces = getAllInterfaces(clazz);
+ Set<Class<?>> interfaces = getAllInterfaces(clazz);
for (Class<?> i : interfaces) {
if (i.isAnnotationPresent(Remotable.class) ||
i.isAnnotationPresent(WebService.class)) {
addService(type, i);
@@ -360,8 +360,8 @@
}
}
- private static boolean areUnique(Class[] collection) {
- Set<Class> set = new HashSet<Class>(Arrays.asList(collection));
+ private static boolean areUnique(Class<?>[] collection) {
+ Set<Class<?>> set = new HashSet<Class<?>>(Arrays.asList(collection));
return set.size() == collection.length;
}
@@ -371,7 +371,7 @@
*/
private boolean calcPropRefUniqueness(Collection<JavaElementImpl> props,
Collection<JavaElementImpl> refs) {
- Class[] classes = new Class[props.size() + refs.size()];
+ Class<?>[] classes = new Class[props.size() + refs.size()];
int i = 0;
for (JavaElementImpl property : props) {
classes[i] = property.getType();
@@ -530,7 +530,7 @@
}
public boolean areUnique(JavaParameterImpl[] parameters) {
- Set<Class> set = new HashSet<Class>(parameters.length);
+ Set<Class<?>> set = new HashSet<Class<?>>(parameters.length);
for (JavaParameterImpl p : parameters) {
if (!set.add(p.getType())) {
return false;
Modified:
tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java?rev=723300&r1=723299&r2=723300&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
(original)
+++
tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
Thu Dec 4 04:42:00 2008
@@ -66,7 +66,7 @@
org.osoa.sca.annotations.Service annotation =
clazz.getAnnotation(org.osoa.sca.annotations.Service.class);
if (annotation == null) {
// scan interfaces for remotable
- Set<Class> interfaces = getAllInterfaces(clazz);
+ Set<Class<?>> interfaces = getAllInterfaces(clazz);
for (Class<?> interfaze : interfaces) {
if (interfaze.isAnnotationPresent(Remotable.class)
|| interfaze.isAnnotationPresent(WebService.class)
Modified:
tuscany/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java?rev=723300&r1=723299&r2=723300&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
(original)
+++
tuscany/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
Thu Dec 4 04:42:00 2008
@@ -101,7 +101,7 @@
verifyIntents(Service6.class, type);
}
- private void verifyIntents(Class serviceImplClass, JavaImplementation
type) {
+ private void verifyIntents(Class<?> serviceImplClass, JavaImplementation
type) {
if ( !(type instanceof PolicySetAttachPoint) ) {
fail("No Intents on the service ");
}
@@ -134,7 +134,7 @@
for (org.apache.tuscany.sca.assembly.Service service:
type.getServices()) {
serviceMap.put(service.getName(), service);
}
- for (Class interfaceClass : serviceImplClass.getInterfaces()) {
+ for (Class<?> interfaceClass : serviceImplClass.getInterfaces()) {
Requires interfaceIntentAnnotation =
(Requires)interfaceClass.getAnnotation(Requires.class);
org.apache.tuscany.sca.assembly.Service service =
serviceMap.get(interfaceClass.getSimpleName());
if (service == null) {
