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 2007/01/19 00:20:51 UTC
svn commit: r497631 - in /incubator/tuscany/java/sca/kernel/core/src:
main/java/org/apache/tuscany/core/builder/
main/java/org/apache/tuscany/core/databinding/impl/
test/java/org/apache/tuscany/core/builder/
Author: jmarino
Date: Thu Jan 18 15:20:47 2007
New Revision: 497631
URL: http://svn.apache.org/viewvc?view=rev&rev=497631
Log:
fix PMD and checkstyle errors in core
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/PassByValueInterceptor.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java?view=diff&rev=497631&r1=497630&r2=497631
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java Thu Jan 18 15:20:47 2007
@@ -141,7 +141,6 @@
// system services do not need to have their chains processed, return
return;
}
- ServiceContract contract = sourceWire.getServiceContract();
// match outbound to inbound chains
for (OutboundInvocationChain outboundChain : sourceWire.getInvocationChains().values()) {
Operation<?> operation = outboundChain.getOperation();
@@ -151,7 +150,6 @@
}
Operation<?> inboundOperation = inboundChain.getOperation();
boolean isOneWayOperation = operation.isNonBlocking();
- boolean operationHasCallback = contract.getCallbackName() != null;
TargetInvoker invoker;
if (target instanceof Component) {
Component component = (Component) target;
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/PassByValueInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/PassByValueInterceptor.java?view=diff&rev=497631&r1=497630&r2=497631
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/PassByValueInterceptor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/PassByValueInterceptor.java Thu Jan 18 15:20:47 2007
@@ -100,7 +100,9 @@
}
public Object copy(Object arg, DataBinding argDataBinding) {
- if(arg == null) return null;
+ if (arg == null) {
+ return null;
+ }
Object copiedArg;
if (dataBinding != null) {
copiedArg = dataBinding.copy(arg);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java?view=diff&rev=497631&r1=497630&r2=497631
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java Thu Jan 18 15:20:47 2007
@@ -92,7 +92,6 @@
InboundWire inboundWire = new InboundWireImpl();
inboundWire.setContainer(container);
OutboundWire outboundWire = EasyMock.createMock(OutboundWire.class);
- EasyMock.expect(outboundWire.getServiceContract()).andReturn(contract);
outboundWire.getInvocationChains();
EasyMock.expectLastCall().andReturn(Collections.emptyMap()).atLeastOnce();
outboundWire.getTargetCallbackInvocationChains();
@@ -113,7 +112,6 @@
InboundWire inboundWire = new InboundWireImpl();
inboundWire.setContainer(container);
OutboundWire outboundWire = EasyMock.createMock(OutboundWire.class);
- EasyMock.expect(outboundWire.getServiceContract()).andReturn(contract);
EasyMock.expect(outboundWire.getContainer()).andReturn(container).atLeastOnce();
outboundWire.getInvocationChains();
EasyMock.expectLastCall().andReturn(Collections.emptyMap()).atLeastOnce();
@@ -132,7 +130,6 @@
InboundWire inboundWire = new InboundWireImpl();
inboundWire.setContainer(container);
OutboundWire outboundWire = EasyMock.createMock(OutboundWire.class);
- EasyMock.expect(outboundWire.getServiceContract()).andReturn(contract);
outboundWire.getInvocationChains();
EasyMock.expectLastCall().andReturn(Collections.emptyMap()).atLeastOnce();
outboundWire.getTargetCallbackInvocationChains();
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org