Author: jmarino
Date: Fri Oct 6 19:09:58 2006
New Revision: 453837
URL: http://svn.apache.org/viewvc?view=rev&rev=453837
Log:
cleanup generics usage; fix cast warnings; removal of @SuppressWarnings from
class declarations
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/StringParserPropertyFactory.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/property/PropertyObjectFactoryImpl.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/property/SimplePropertyObjectFactoryTestCase.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/StringParserPropertyFactory.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/StringParserPropertyFactory.java?view=diff&rev=453837&r1=453836&r2=453837
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/StringParserPropertyFactory.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/StringParserPropertyFactory.java
Fri Oct 6 19:09:58 2006
@@ -39,15 +39,15 @@
*
* @version $Rev$ $Date$
*/
[EMAIL PROTECTED]("unchecked")
public class StringParserPropertyFactory implements PropertyObjectFactory {
public <T> ObjectFactory<T> createObjectFactory(Property<T> property,
PropertyValue<T> value)
throws LoaderException {
String text = value.getValue().getDocumentElement().getTextContent();
- return new SingletonObjectFactory(createInstance(text,
property.getJavaType()));
+ return new SingletonObjectFactory<T>(createInstance(text,
property.getJavaType()));
}
+ @SuppressWarnings("unchecked")
public <T> T createInstance(String text, Class<T> type) throws
LoaderException {
// Class<T> type = property.getJavaType();
assert type != null : "property type is null";
@@ -118,6 +118,7 @@
}
+ @SuppressWarnings("unchecked")
public <T> ObjectFactory<T> createObjectFactory(String text, Property<T>
property)
throws XMLStreamException, LoaderException {
Class<T> type = property.getJavaType();
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/property/PropertyObjectFactoryImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/property/PropertyObjectFactoryImpl.java?view=diff&rev=453837&r1=453836&r2=453837
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/property/PropertyObjectFactoryImpl.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/property/PropertyObjectFactoryImpl.java
Fri Oct 6 19:09:58 2006
@@ -55,12 +55,11 @@
this.mediator = mediator;
}
- @SuppressWarnings("unchecked")
public <T> ObjectFactory<T> createObjectFactory(Property<T> property,
PropertyValue<T> value) {
if (mediator == null) {
- return new SimplePropertyObjectFactory(property, value.getValue());
+ return new SimplePropertyObjectFactory<T>(property,
value.getValue());
}
- return new ObjectFactoryImpl(property, value);
+ return new ObjectFactoryImpl<T>(property, value);
}
public class ObjectFactoryImpl<P> implements ObjectFactory<P> {
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java?view=diff&rev=453837&r1=453836&r2=453837
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java
Fri Oct 6 19:09:58 2006
@@ -18,25 +18,25 @@
*/
package org.apache.tuscany.core.loader;
+import javax.xml.namespace.QName;
import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
-
-import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import junit.framework.TestCase;
+import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
-import org.apache.tuscany.core.deployer.RootDeploymentContext;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.loader.LoaderRegistry;
import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.spi.model.ServiceDefinition;
+
+import junit.framework.TestCase;
+import org.apache.tuscany.core.deployer.RootDeploymentContext;
import org.easymock.EasyMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
/**
* Verifies loading of a service definition from an XML-based assembly
@@ -47,7 +47,7 @@
private static final QName SERVICE = new QName(XML_NAMESPACE_1_0,
"service");
private static final QName REFERENCE = new QName(XML_NAMESPACE_1_0,
"reference");
private static final QName INTERFACE_JAVA = new QName(XML_NAMESPACE_1_0,
"interface.java");
-
+
private ServiceLoader loader;
private DeploymentContext deploymentContext;
private XMLStreamReader mockReader;
@@ -61,7 +61,7 @@
expect(mockReader.next()).andReturn(END_ELEMENT);
expect(mockReader.getName()).andReturn(SERVICE).anyTimes();
replay(mockReader);
- ServiceDefinition serviceDefinition = loader.load(null,
(XMLStreamReader) mockReader, null);
+ ServiceDefinition serviceDefinition = loader.load(null, mockReader,
null);
assertNotNull(serviceDefinition);
assertEquals(name, serviceDefinition.getName());
}
@@ -83,12 +83,11 @@
expect(mockReader.getName()).andReturn(REFERENCE);
expect(mockReader.next()).andReturn(END_ELEMENT);
expect(mockReader.getName()).andReturn(SERVICE);
-
+
replay(mockReader);
replay(mockRegistry);
-
- ServiceDefinition serviceDefinition =
- loader.load(null, (XMLStreamReader) mockReader, deploymentContext);
+
+ ServiceDefinition serviceDefinition = loader.load(null, mockReader,
deploymentContext);
assertNotNull(serviceDefinition);
assertEquals(name, serviceDefinition.getName());
assertSame(sc, serviceDefinition.getServiceContract());
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/property/SimplePropertyObjectFactoryTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/property/SimplePropertyObjectFactoryTestCase.java?view=diff&rev=453837&r1=453836&r2=453837
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/property/SimplePropertyObjectFactoryTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/property/SimplePropertyObjectFactoryTestCase.java
Fri Oct 6 19:09:58 2006
@@ -31,10 +31,9 @@
/**
* @version $Rev$ $Date$
*/
[EMAIL PROTECTED]("unchecked")
public class SimplePropertyObjectFactoryTestCase extends TestCase {
- private <T> PropertyValue<T> mock(Class<T> cls, String value) {
+ private <T> PropertyValue<T> mock(String value) {
Document document = EasyMock.createMock(Document.class);
Element element = EasyMock.createMock(Element.class);
EasyMock.expect(document.getDocumentElement()).andReturn(element);
@@ -48,7 +47,7 @@
PropertyObjectFactoryImpl factory = new PropertyObjectFactoryImpl();
Property<Integer> property = new Property<Integer>();
property.setJavaType(Integer.class);
- PropertyValue<Integer> propertyValue = mock(Integer.class, "1");
+ PropertyValue<Integer> propertyValue = mock("1");
ObjectFactory<Integer> oFactory =
factory.createObjectFactory(property, propertyValue);
assertEquals(1, oFactory.getInstance().intValue());
}
@@ -57,7 +56,7 @@
PropertyObjectFactoryImpl factory = new PropertyObjectFactoryImpl();
Property<Integer> property = new Property<Integer>();
property.setJavaType(Integer.TYPE);
- PropertyValue<Integer> propertyValue = mock(Integer.TYPE, "1");
+ PropertyValue<Integer> propertyValue = mock("1");
ObjectFactory<Integer> oFactory =
factory.createObjectFactory(property, propertyValue);
assertEquals(1, oFactory.getInstance().intValue());
}
@@ -66,7 +65,7 @@
PropertyObjectFactoryImpl factory = new PropertyObjectFactoryImpl();
Property<String> property = new Property<String>();
property.setJavaType(String.class);
- PropertyValue<String> propertyValue = mock(String.class, "1");
+ PropertyValue<String> propertyValue = mock("1");
ObjectFactory<String> oFactory = factory.createObjectFactory(property,
propertyValue);
assertEquals("1", oFactory.getInstance());
}
@@ -75,7 +74,7 @@
PropertyObjectFactoryImpl factory = new PropertyObjectFactoryImpl();
Property<byte[]> property = new Property<byte[]>();
property.setJavaType(byte[].class);
- PropertyValue<byte[]> propertyValue = mock(byte[].class, "TWFu"); //
BASE64 for "Man"
+ PropertyValue<byte[]> propertyValue = mock("TWFu"); // BASE64 for "Man"
ObjectFactory<byte[]> oFactory = factory.createObjectFactory(property,
propertyValue);
byte[] result = oFactory.getInstance();
byte[] expected = "Man".getBytes();
@@ -91,7 +90,7 @@
PropertyObjectFactoryImpl factory = new PropertyObjectFactoryImpl();
Property<Boolean> property = new Property<Boolean>();
property.setJavaType(Boolean.class);
- PropertyValue<Boolean> propertyValue = mock(Boolean.class, "true");
+ PropertyValue<Boolean> propertyValue = mock("true");
ObjectFactory<Boolean> oFactory =
factory.createObjectFactory(property, propertyValue);
assertTrue(oFactory.getInstance());
}
@@ -100,7 +99,7 @@
PropertyObjectFactoryImpl factory = new PropertyObjectFactoryImpl();
Property<Boolean> property = new Property<Boolean>();
property.setJavaType(Boolean.TYPE);
- PropertyValue<Boolean> propertyValue = mock(Boolean.TYPE, "true");
+ PropertyValue<Boolean> propertyValue = mock("true");
ObjectFactory<Boolean> oFactory =
factory.createObjectFactory(property, propertyValue);
assertTrue(oFactory.getInstance());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
