You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/11/12 04:31:56 UTC
svn commit: r473859 - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/component/
core/src/main/java/org/apache/tuscany/core/databinding/impl/
core/src/main/java/org/apache/tuscany/core/wire/jdk/
core/src/test/java/org/...
Author: jmarino
Date: Sat Nov 11 19:31:55 2006
New Revision: 473859
URL: http://svn.apache.org/viewvc?view=rev&rev=473859
Log:
checkstyle cleanup
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingInteceptor.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderResourceTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/builder/JavaBuilderPropertyTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/factories/MockComponentFactory.java
incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/model/ServiceContractTestCase.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java?view=diff&rev=473859&r1=473858&r2=473859
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java Sat Nov 11 19:31:55 2006
@@ -87,6 +87,7 @@
map.put(CORRELATION_ID, correlationId);
}
+ @SuppressWarnings("unchecked")
public LinkedList<Object> getCurrentCallbackRoutingChain() {
Map<Object, Object> map = workContext.get();
if (map == null) {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingInteceptor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingInteceptor.java?view=diff&rev=473859&r1=473858&r2=473859
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingInteceptor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingInteceptor.java Sat Nov 11 19:31:55 2006
@@ -27,7 +27,6 @@
import org.apache.tuscany.spi.model.DataType;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.wire.Interceptor;
-import org.apache.tuscany.spi.wire.InvocationRuntimeException;
import org.apache.tuscany.spi.wire.Message;
import org.apache.tuscany.spi.wire.RuntimeWire;
@@ -46,13 +45,13 @@
private Mediator mediator;
public DataBindingInteceptor(RuntimeWire sourceWire, Operation<?> sourceOperation, RuntimeWire targetWire,
- Operation<?> targetOperation) {
+ Operation<?> targetOperation) {
super();
// this.sourceWire = sourceWire;
this.sourceOperation = sourceOperation;
// this.targetWire = targetWire;
this.targetOperation = targetOperation;
- this.compositeComponent = (CompositeComponent) sourceWire.getContainer().getParent();
+ this.compositeComponent = sourceWire.getContainer().getParent();
}
/**
@@ -78,14 +77,14 @@
} else if (result != null) {
// FIXME: Should we fix the Operation model so that getOutputType returns DataType<DataType<T>>?
DataType<DataType> targetType =
- new DataType<DataType>("idl:output", Object.class, targetOperation.getOutputType());
-
+ new DataType<DataType>("idl:output", Object.class, targetOperation.getOutputType());
+
targetType.setMetadata(Operation.class.getName(), targetOperation.getOutputType().getMetadata(
- Operation.class.getName()));
+ Operation.class.getName()));
DataType<DataType> sourceType =
- new DataType<DataType>("idl:output", Object.class, sourceOperation.getOutputType());
+ new DataType<DataType>("idl:output", Object.class, sourceOperation.getOutputType());
sourceType.setMetadata(Operation.class.getName(), sourceOperation.getOutputType().getMetadata(
- Operation.class.getName()));
+ Operation.class.getName()));
result = transform(result, targetType, sourceType);
resultMsg.setBody(result);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.java?view=diff&rev=473859&r1=473858&r2=473859
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.java Sat Nov 11 19:31:55 2006
@@ -118,7 +118,7 @@
}
protected Object getFromAddress() {
- return (contractHasCallback ? fromAddress : null);
+ return contractHasCallback ? fromAddress : null;
}
/**
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java?view=diff&rev=473859&r1=473858&r2=473859
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java Sat Nov 11 19:31:55 2006
@@ -62,6 +62,7 @@
private ComponentDefinition<SystemCompositeImplementation> componentDefinition;
private SystemCompositeImplementation implementation;
+ @SuppressWarnings("unchecked")
public void testBoot1Load() throws LoaderException {
CompositeComponent parent = createNiceMock(CompositeComponent.class);
URL scdl = BootstrapDeployerTestCase.class.getResource("boot1.scdl");
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceTestCase.java?view=diff&rev=473859&r1=473858&r2=473859
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceTestCase.java Sat Nov 11 19:31:55 2006
@@ -20,15 +20,16 @@
import java.lang.reflect.Type;
import java.util.HashMap;
+import java.util.Map;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.spi.wire.OutboundInvocationChain;
import org.apache.tuscany.spi.wire.OutboundWire;
import org.apache.tuscany.spi.wire.TargetInvoker;
-import org.easymock.EasyMock;
import junit.framework.TestCase;
+import org.easymock.EasyMock;
/**
*
@@ -36,17 +37,17 @@
public class CompositeReferenceTestCase extends TestCase {
public void testCreateTargetInvoker() throws Exception {
-
+
MyServiceContract serviceContract = new MyServiceContract();
CompositeReference compositeReference = new CompositeReference("testCompositeReferemce",
- null,
- null,
- serviceContract);
+ null,
+ null,
+ serviceContract);
Operation operation = new Operation<Type>("sayHi", null, null, null, false, null);
OutboundInvocationChain chain = EasyMock.createMock(OutboundInvocationChain.class);
EasyMock.replay(chain);
- HashMap<Operation<?>,OutboundInvocationChain> chains = new HashMap<Operation<?>,OutboundInvocationChain>();
- chains.put(operation,chain);
+ Map<Operation<?>, OutboundInvocationChain> chains = new HashMap<Operation<?>, OutboundInvocationChain>();
+ chains.put(operation, chain);
OutboundWire wire = EasyMock.createMock(OutboundWire.class);
EasyMock.expect(wire.getInvocationChains()).andReturn(chains);
EasyMock.expect(wire.getContainer()).andReturn(null);
@@ -56,20 +57,20 @@
TargetInvoker targetInvoker = compositeReference.createTargetInvoker(serviceContract, operation);
assertNotNull(targetInvoker);
}
-
+
public void testCreateCallbackTargetInvoker() throws Exception {
-
+
MyServiceContract serviceContract = new MyServiceContract();
CompositeReference compositeReference = new CompositeReference("testCompositeReferemce",
- null,
- null,
- serviceContract);
+ null,
+ null,
+ serviceContract);
Operation operation = new Operation<Type>("sayHi", null, null, null, false, null);
TargetInvoker targetInvoker = compositeReference.createCallbackTargetInvoker(serviceContract, operation);
assertNotNull(targetInvoker);
}
-
+
class MyServiceContract extends ServiceContract {
-
+
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCase.java?view=diff&rev=473859&r1=473858&r2=473859
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCase.java Sat Nov 11 19:31:55 2006
@@ -35,6 +35,7 @@
*/
public class JavaComponentBuilderResourceTestCase extends TestCase {
+ @SuppressWarnings("unchecked")
public void testResourceInjection() throws Exception {
ScopeContainer container = EasyMock.createNiceMock(ScopeContainer.class);
ScopeRegistry registry = EasyMock.createMock(ScopeRegistry.class);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderResourceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderResourceTestCase.java?view=diff&rev=473859&r1=473858&r2=473859
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderResourceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderResourceTestCase.java Sat Nov 11 19:31:55 2006
@@ -4,12 +4,15 @@
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.ScopeRegistry;
import org.apache.tuscany.spi.component.SystemAtomicComponent;
+import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.implementation.java.ConstructorDefinition;
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
import org.apache.tuscany.spi.implementation.java.Resource;
import org.apache.tuscany.spi.model.ComponentDefinition;
+import org.apache.tuscany.spi.model.Property;
+import org.apache.tuscany.spi.model.ReferenceDefinition;
import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
+import org.apache.tuscany.spi.model.ServiceDefinition;
import junit.framework.TestCase;
import org.apache.tuscany.core.implementation.system.model.SystemImplementation;
@@ -20,6 +23,7 @@
*/
public class SystemComponentBuilderResourceTestCase extends TestCase {
+ @SuppressWarnings("uncjecked")
public void testResourceInjection() throws Exception {
ScopeContainer container = EasyMock.createNiceMock(ScopeContainer.class);
DeploymentContext ctx = EasyMock.createNiceMock(DeploymentContext.class);
@@ -30,7 +34,8 @@
builder.setScopeRegistry(registry);
ConstructorDefinition<Foo> ctorDef = new ConstructorDefinition<SystemComponentBuilderResourceTestCase.Foo>(
SystemComponentBuilderResourceTestCase.Foo.class.getConstructor());
- PojoComponentType type = new PojoComponentType();
+ PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> type =
+ new PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
Resource resource = new Resource();
resource.setType(String.class);
resource.setName("resource");
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/builder/JavaBuilderPropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/builder/JavaBuilderPropertyTestCase.java?view=diff&rev=473859&r1=473858&r2=473859
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/builder/JavaBuilderPropertyTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/builder/JavaBuilderPropertyTestCase.java Sat Nov 11 19:31:55 2006
@@ -52,6 +52,7 @@
private CompositeComponent parent;
private ScopeRegistry registry;
+ @SuppressWarnings("unchecked")
public void testPropertyHandling() throws Exception {
JavaComponentBuilder builder = new JavaComponentBuilder();
builder.setScopeRegistry(registry);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/factories/MockComponentFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/factories/MockComponentFactory.java?view=diff&rev=473859&r1=473858&r2=473859
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/factories/MockComponentFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/factories/MockComponentFactory.java Sat Nov 11 19:31:55 2006
@@ -30,9 +30,12 @@
import org.apache.tuscany.spi.model.BoundReferenceDefinition;
import org.apache.tuscany.spi.model.BoundServiceDefinition;
import org.apache.tuscany.spi.model.ComponentDefinition;
+import org.apache.tuscany.spi.model.Property;
+import org.apache.tuscany.spi.model.ReferenceDefinition;
import org.apache.tuscany.spi.model.ReferenceTarget;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.model.ServiceContract;
+import org.apache.tuscany.spi.model.ServiceDefinition;
import org.apache.tuscany.core.implementation.system.model.SystemBinding;
import org.apache.tuscany.core.implementation.system.model.SystemImplementation;
@@ -54,7 +57,8 @@
public static ComponentDefinition<SystemImplementation> createSourceWithTargetReference()
throws NoSuchMethodException {
SystemImplementation impl = new SystemImplementation();
- PojoComponentType componentType = new PojoComponentType();
+ PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> componentType =
+ new PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
componentType.setImplementationScope(Scope.MODULE);
componentType
.setConstructorDefinition(
@@ -93,7 +97,8 @@
*/
public static ComponentDefinition<SystemImplementation> createSourceWithTargetAutowire() {
SystemImplementation impl = new SystemImplementation();
- PojoComponentType componentType = new PojoComponentType();
+ PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> componentType =
+ new PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
componentType.setImplementationScope(Scope.MODULE);
JavaMappedReference reference;
try {
Modified: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/model/ServiceContractTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/model/ServiceContractTestCase.java?view=diff&rev=473859&r1=473858&r2=473859
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/model/ServiceContractTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/model/ServiceContractTestCase.java Sat Nov 11 19:31:55 2006
@@ -29,6 +29,7 @@
*/
public class ServiceContractTestCase extends TestCase {
+ @SuppressWarnings("unchecked")
public void testAddOperation() throws Exception {
ServiceContract<Type> contract = new TestContract();
Operation<Type> operation = new Operation<Type>("foo", null, null, null, false, null);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org