Cleaned Generics problems from Spring implementation files

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@772749 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 7 insertions, 7 deletions

diff --git a/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java b/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
index 48608a4b34..24e78b9291 100644
--- a/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
+++ b/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
@@ -49,7 +49,7 @@ public class SpringImplementation extends ImplementationImpl implements Implemen
     // Mapping of Services to Beans

     private Hashtable<String, SpringBeanElement> serviceMap;

     // Mapping of property names to Java class

-    private Hashtable<String, Class> propertyMap;

+    private Hashtable<String, Class<?>> propertyMap;

     // List of unresolved bean property references

     private Hashtable<String, Reference> unresolvedBeanRef;

 

@@ -58,7 +58,7 @@ public class SpringImplementation extends ImplementationImpl implements Implemen
         this.resource = null;

         setUnresolved(true);

         serviceMap = new Hashtable<String, SpringBeanElement>();

-        propertyMap = new Hashtable<String, Class>();

+        propertyMap = new Hashtable<String, Class<?>>();

         unresolvedBeanRef = new Hashtable<String, Reference>();

     } // end method SpringImplementation

 

@@ -137,7 +137,7 @@ public class SpringImplementation extends ImplementationImpl implements Implemen
      * @param propertyName

      * @param propertyClass

      */

-    public void setPropertyClass(String propertyName, Class propertyClass) {

+    public void setPropertyClass(String propertyName, Class<?> propertyClass) {

         if (propertyName == null || propertyClass == null)

             return;

         propertyMap.put(propertyName, propertyClass);

@@ -149,7 +149,7 @@ public class SpringImplementation extends ImplementationImpl implements Implemen
      * @param propertyName - the property name

      * @return - a Class object for the type of the property

      */

-    public Class getPropertyClass(String propertyName) {

+    public Class<?> getPropertyClass(String propertyName) {

         return propertyMap.get(propertyName);

     } // end method getPropertyClass

     

diff --git a/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java b/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java
index ac913fdee2..6bdafdccd2 100644
--- a/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java
+++ b/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java
@@ -63,7 +63,7 @@ public class SpringImplementationTie {
      * @param name - the Property name

      * @return - a Bean of the specified property, with value set

      */

-    private <B> B getPropertyBean(Class requiredType, String name) {

+    private <B> B getPropertyBean(Class<?> requiredType, String name) {

         B propertyObject = null;

         // Get the component's list of properties

         List<ComponentProperty> props = component.getProperties();

@@ -71,7 +71,7 @@ public class SpringImplementationTie {
             if (prop.getName().equals(name)) {

                 // On finding the property, create a factory for it and create a Bean using

                 // the factory

-                ObjectFactory factory = propertyFactory.createValueFactory(prop, prop.getValue(), requiredType);

+                ObjectFactory<?> factory = propertyFactory.createValueFactory(prop, prop.getValue(), requiredType);

                 propertyObject = (B)factory.getInstance();

             } // end if

         } // end for

@@ -97,7 +97,7 @@ public class SpringImplementationTie {
      * @param requiredType - the required type of the Bean (either a Java class or a Java interface)

      * @return Object - a Bean which matches the requested bean

      */

-    public Object getBean(String name, Class requiredType) {

+    public Object getBean(String name, Class<?> requiredType) {

         System.out.println("Spring parent context - getBean called for name: " + name);

         // The expectation is that the requested Bean is either a reference or a property

         // from the Spring context