diff options
Diffstat (limited to 'java/sca/modules/implementation-java-runtime/src')
4 files changed, 7 insertions, 7 deletions
diff --git a/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java b/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java index 1849874b8f..6dfa6b132b 100644 --- a/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java +++ b/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java @@ -59,7 +59,7 @@ public class JavaPropertyValueObjectFactory implements PropertyValueFactory { public ObjectFactory createValueFactory(Property property, Object propertyValue, JavaElementImpl javaElement) {
isSimpleType = isSimpleType(property);
Document doc = (Document)propertyValue;
- Class javaType = JavaIntrospectionHelper.getBaseType(javaElement.getType(), javaElement.getGenericType());
+ Class<?> javaType = JavaIntrospectionHelper.getBaseType(javaElement.getType(), javaElement.getGenericType());
Element rootElement = doc.getDocumentElement();
if (property.isMany()) {
if (isSimpleType) {
@@ -148,7 +148,7 @@ public class JavaPropertyValueObjectFactory implements PropertyValueFactory { return false;
}
- private List<String> getSimplePropertyValues(String concatenatedValue, Class javaType) {
+ private List<String> getSimplePropertyValues(String concatenatedValue, Class<?> javaType) {
List<String> propValues = new ArrayList<String>();
StringTokenizer st = null;
if (javaType.getName().equals("java.lang.String")) {
diff --git a/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java b/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java index e3604766a4..ca42c69d4e 100644 --- a/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java +++ b/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java @@ -131,7 +131,7 @@ public class JavaComponentContextProvider { createPropertyValueFactory(configuredProperty, configuredProperty.getValue(), element); instanceFactoryProvider.setObjectFactory(element, propertyObjectFactory); - JavaConstructorImpl constructor = instanceFactoryProvider.getImplementation().getConstructor(); + JavaConstructorImpl<?> constructor = instanceFactoryProvider.getImplementation().getConstructor(); for(JavaElementImpl p: constructor.getParameters()){ if(element.getName().equals(p.getName())) { instanceFactoryProvider.setObjectFactory(p, propertyObjectFactory); @@ -228,7 +228,7 @@ public class JavaComponentContextProvider { factories.add(factory); } instanceFactoryProvider.setObjectFactories(element, factories); - JavaConstructorImpl constructor = instanceFactoryProvider.getImplementation().getConstructor(); + JavaConstructorImpl<?> constructor = instanceFactoryProvider.getImplementation().getConstructor(); for(JavaElementImpl p: constructor.getParameters()){ if(element.getName().equals(p.getName())) { instanceFactoryProvider.setObjectFactories(p, factories); @@ -251,7 +251,7 @@ public class JavaComponentContextProvider { factory = createObjectFactory(element.getType(), wireList.get(0)); } instanceFactoryProvider.setObjectFactory(element, factory); - JavaConstructorImpl constructor = instanceFactoryProvider.getImplementation().getConstructor(); + JavaConstructorImpl<?> constructor = instanceFactoryProvider.getImplementation().getConstructor(); for(JavaElementImpl p: constructor.getParameters()){ if(element.getName().equals(p.getName())) { instanceFactoryProvider.setObjectFactory(p, factory); diff --git a/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java b/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java index 3c483d68e2..09e3591152 100644 --- a/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java +++ b/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java @@ -186,7 +186,7 @@ public class JavaImplementationProvider implements ScopedImplementationProvider componentContextProvider.stop(); } - public InstanceWrapper createInstanceWrapper() { + public InstanceWrapper<?> createInstanceWrapper() { return componentContextProvider.createInstanceWrapper(); } diff --git a/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java b/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java index 9a040886b2..9624865dcc 100644 --- a/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java +++ b/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java @@ -92,7 +92,7 @@ public class JavaIntrospectionHelperTestCase { @Test public void testDefaultConstructor() throws Exception { - Constructor ctr = JavaIntrospectionHelper.getDefaultConstructor(Bean2.class); + Constructor<Bean2> ctr = JavaIntrospectionHelper.getDefaultConstructor(Bean2.class); assertEquals(ctr, Bean2.class.getConstructor()); assertTrue(Bean2.class == ctr.newInstance((Object[]) null).getClass()); } |