From 37133c34c8d53f1825c6dee7d45f0ecb02cc5569 Mon Sep 17 00:00:00 2001 From: slaws Date: Thu, 1 Sep 2011 10:33:47 +0000 Subject: TUSCANY-3916 - Turn on distributed matching tests and add an test where the service interface contains operation arguments that cannot be converted to XML using JAXB. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1163990 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca/itest/interfaces/CallbackInterface.java | 2 + .../interfaces/CallbackMissmatchInterface.java | 2 + .../sca/itest/interfaces/ClientComponent.java | 2 + .../sca/itest/interfaces/ClientComponentImpl.java | 11 ++- .../itest/interfaces/LocalClientComponentImpl.java | 5 ++ .../interfaces/NonJAXBClientComponentImpl.java | 92 ++++++++++++++++++++++ .../itest/interfaces/NonJAXBParameterObject.java | 51 ++++++++++++ .../itest/interfaces/NonJAXBServiceComponent.java | 41 ++++++++++ .../interfaces/NonJAXBServiceComponentImpl.java | 60 ++++++++++++++ .../ServiceCallbackMissmatchComponentImpl.java | 2 +- .../sca/itest/interfaces/ServiceComponent.java | 2 + .../sca/itest/interfaces/ServiceComponentImpl.java | 12 ++- .../interfaces/ServiceMissmatchComponent.java | 4 + .../interfaces/ServiceMissmatchComponentImpl.java | 12 ++- .../MatchNonJAXBDistributedClient.composite | 29 +++++++ .../MatchNonJAXBDistributedService.composite | 27 +++++++ 16 files changed, 345 insertions(+), 9 deletions(-) create mode 100644 sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/NonJAXBClientComponentImpl.java create mode 100644 sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/NonJAXBParameterObject.java create mode 100644 sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/NonJAXBServiceComponent.java create mode 100644 sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/NonJAXBServiceComponentImpl.java create mode 100644 sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MatchNonJAXBDistributedClient.composite create mode 100644 sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MatchNonJAXBDistributedService.composite (limited to 'sca-java-2.x/trunk/testing/itest/interface-matching/src/main') diff --git a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/CallbackInterface.java b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/CallbackInterface.java index df736810b2..4db5531aca 100644 --- a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/CallbackInterface.java +++ b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/CallbackInterface.java @@ -27,6 +27,8 @@ import org.oasisopen.sca.annotation.Remotable; public interface CallbackInterface { void callbackMethod(String str); + + void callbackMethod1(String str); void modifyParameter(ParameterObject po); diff --git a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/CallbackMissmatchInterface.java b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/CallbackMissmatchInterface.java index c0f2aa2593..9d9362f4d5 100644 --- a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/CallbackMissmatchInterface.java +++ b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/CallbackMissmatchInterface.java @@ -27,6 +27,8 @@ import org.oasisopen.sca.annotation.Remotable; public interface CallbackMissmatchInterface { void callbackMethod(ParameterObject po); + + void callbackMethod1(ParameterObject po, String str); void modifyParameter(ParameterObject po); diff --git a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ClientComponent.java b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ClientComponent.java index 898e3f3fa4..ac5c2c5817 100644 --- a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ClientComponent.java +++ b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ClientComponent.java @@ -25,6 +25,8 @@ import org.oasisopen.sca.annotation.OneWay; * itest for interface: local,method-overloading */ public interface ClientComponent { + + String foo(ParameterObject po); String foo1(ParameterObject po); diff --git a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ClientComponentImpl.java b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ClientComponentImpl.java index 46f22594a1..4a414f870f 100644 --- a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ClientComponentImpl.java +++ b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ClientComponentImpl.java @@ -29,10 +29,15 @@ public class ClientComponentImpl implements ClientComponent, CallbackInterface { protected ServiceComponent aCallBackService; private static String callbackValue; private static String onewayValue; + + public String foo(ParameterObject po) { + po.field1 = "AComponent"; + return aCallBackService.foo("AComponent"); + } public String foo1(ParameterObject po) { po.field1 = "AComponent"; - return aCallBackService.foo("AComponent"); + return aCallBackService.foo1("AComponent"); } public String foo2(String str) throws Exception { @@ -54,6 +59,10 @@ public class ClientComponentImpl implements ClientComponent, CallbackInterface { public void callbackMethod(String str) { callbackValue = str; } + + public void callbackMethod1(String str) { + callbackValue = str; + } public void callModifyParameter() { this.aCallBackService.modifyParameter(); diff --git a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java index 014782a04a..9a8ad9ed8d 100644 --- a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java +++ b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java @@ -30,6 +30,11 @@ public class LocalClientComponentImpl implements ClientComponent, LocalCallbackI private static String callbackValue; private static String onewayValue; + public String foo(ParameterObject po) { + po.field1 = "AComponent"; + return aCallBackService.foo("AComponent"); + } + public String foo1(ParameterObject po) { po.field1 = "AComponent"; return aCallBackService.foo("AComponent"); diff --git a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/NonJAXBClientComponentImpl.java b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/NonJAXBClientComponentImpl.java new file mode 100644 index 0000000000..f3048a9098 --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/NonJAXBClientComponentImpl.java @@ -0,0 +1,92 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.itest.interfaces; + +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; + +@Service(ClientComponent.class) +public class NonJAXBClientComponentImpl implements ClientComponent, CallbackInterface { + + @Reference + protected NonJAXBServiceComponent aCallBackService; + private static String callbackValue; + private static String onewayValue; + + public String foo(ParameterObject po) { + po.field1 = "AComponent"; + return aCallBackService.foo("AComponent"); + } + + public String foo1(ParameterObject po) { + NonJAXBParameterObject nonJAXBPO = new NonJAXBParameterObject(po.field1); + return aCallBackService.foo1(nonJAXBPO); + } + + public String foo2(String str) throws Exception { + return str + "AComponent"; + } + + public String foo3(String str, int i) { + return str + "AComponent" + i; + } + + public String foo4(int i, String str) throws Exception { + return str + "AComponent" + i; + } + + public void callback(String str) { + aCallBackService.callback(str); + } + + public void callbackMethod(String str) { + callbackValue = str; + } + + public void callbackMethod1(String str) { + callbackValue = str; + } + + public void callModifyParameter() { + this.aCallBackService.modifyParameter(); + } + + public String getCallbackValue() { + return callbackValue; + } + + public void onewayMethod(String str) { + onewayValue = str; + try { + Thread.sleep(200); + } catch (Exception e) { + //do nothing + } + } + + public String getOnewayValue() { + return onewayValue; + } + + public void modifyParameter(ParameterObject po) { + po.field1 = "AComponent"; + } + +} diff --git a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/NonJAXBParameterObject.java b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/NonJAXBParameterObject.java new file mode 100644 index 0000000000..8acef311a9 --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/NonJAXBParameterObject.java @@ -0,0 +1,51 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.itest.interfaces; + +import java.io.Serializable; + +/** + * + * A bean that cannont be converted to/from XML using JAXB as there is no + * default constructor + * + */ +public class NonJAXBParameterObject implements Serializable { + private static final long serialVersionUID = 1L; + public String field1; + + + public NonJAXBParameterObject(String field1) { + this.field1 = field1; + } + + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (o instanceof NonJAXBParameterObject) { + NonJAXBParameterObject other = (NonJAXBParameterObject)o; + if (field1 != null) { + return field1.equals(other.field1); + } + } + return false; + } +} diff --git a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/NonJAXBServiceComponent.java b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/NonJAXBServiceComponent.java new file mode 100644 index 0000000000..d097394721 --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/NonJAXBServiceComponent.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.tuscany.sca.itest.interfaces; + +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Remotable; + +/** + * Local be-directional callBackService + */ +@Remotable +@Callback(CallbackInterface.class) +public interface NonJAXBServiceComponent { + + String foo(String str); + + String foo1(NonJAXBParameterObject po); + + void callback(String str); + + void modifyParameter(); + + ParameterObject getPO(); + +} diff --git a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/NonJAXBServiceComponentImpl.java b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/NonJAXBServiceComponentImpl.java new file mode 100644 index 0000000000..d50feafd0e --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/NonJAXBServiceComponentImpl.java @@ -0,0 +1,60 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.tuscany.sca.itest.interfaces; + +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; + +@Service(NonJAXBServiceComponent.class) +public class NonJAXBServiceComponentImpl implements NonJAXBServiceComponent { + + @Callback + protected CallbackInterface callback; + +/* + @Reference + protected ServiceComponent chainedCallbackReference; +*/ + private static ParameterObject po; + + public String foo(String str) { + return str; + } + + public String foo1(NonJAXBParameterObject po){ + return po.field1; + } + + public void callback(String str) { + callback.callbackMethod(str); + } + + public void modifyParameter() { + po = new ParameterObject("CallBack"); + callback.modifyParameter(po); + } + + + + public ParameterObject getPO() { + return po; + } + +} diff --git a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceCallbackMissmatchComponentImpl.java b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceCallbackMissmatchComponentImpl.java index da85659372..4dbfd55535 100644 --- a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceCallbackMissmatchComponentImpl.java +++ b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceCallbackMissmatchComponentImpl.java @@ -30,7 +30,7 @@ public class ServiceCallbackMissmatchComponentImpl implements ServiceCallbackMis private static ParameterObject po; public void callback(String str) { - callback.callbackMethod(po); + callback.callbackMethod1(po, str); } public void modifyParameter() { diff --git a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceComponent.java b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceComponent.java index 25a9d6e923..355db43089 100644 --- a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceComponent.java +++ b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceComponent.java @@ -29,6 +29,8 @@ import org.oasisopen.sca.annotation.Remotable; public interface ServiceComponent { String foo(String str); + + String foo1(String str); void callback(String str); diff --git a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceComponentImpl.java b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceComponentImpl.java index 0bf2ad3e63..0538739b99 100644 --- a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceComponentImpl.java +++ b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceComponentImpl.java @@ -34,6 +34,14 @@ public class ServiceComponentImpl implements ServiceComponent { */ private static ParameterObject po; + public String foo(String str) { + return str; + } + + public String foo1(String str){ + return str; + } + public void callback(String str) { callback.callbackMethod(str); } @@ -43,9 +51,7 @@ public class ServiceComponentImpl implements ServiceComponent { callback.modifyParameter(po); } - public String foo(String str) { - return str; - } + public ParameterObject getPO() { return po; diff --git a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceMissmatchComponent.java b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceMissmatchComponent.java index 336f85d90f..ecafb20c2e 100644 --- a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceMissmatchComponent.java +++ b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceMissmatchComponent.java @@ -28,7 +28,11 @@ import org.oasisopen.sca.annotation.Remotable; @Callback(CallbackInterface.class) public interface ServiceMissmatchComponent { + // infrastructure won't detect difference between String and ParameterObject String foo(ParameterObject po); + + // Infrastructure will detect difference between parameter numbers + String foo1(ParameterObject po, String str); void callback(String str); diff --git a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceMissmatchComponentImpl.java b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceMissmatchComponentImpl.java index d43b7b6f45..713cce6776 100644 --- a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceMissmatchComponentImpl.java +++ b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceMissmatchComponentImpl.java @@ -29,6 +29,14 @@ public class ServiceMissmatchComponentImpl implements ServiceMissmatchComponent private static ParameterObject po; + public String foo(ParameterObject po) { + return po.field1; + } + + public String foo1(ParameterObject po, String str){ + return str; + } + public void callback(String str) { callback.callbackMethod(str); } @@ -38,10 +46,6 @@ public class ServiceMissmatchComponentImpl implements ServiceMissmatchComponent callback.modifyParameter(po); } - public String foo(ParameterObject po) { - return po.field1; - } - public ParameterObject getPO() { return po; } diff --git a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MatchNonJAXBDistributedClient.composite b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MatchNonJAXBDistributedClient.composite new file mode 100644 index 0000000000..4d39fc2ec7 --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MatchNonJAXBDistributedClient.composite @@ -0,0 +1,29 @@ + + + + + + + + + + \ No newline at end of file diff --git a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MatchNonJAXBDistributedService.composite b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MatchNonJAXBDistributedService.composite new file mode 100644 index 0000000000..ffb609daee --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MatchNonJAXBDistributedService.composite @@ -0,0 +1,27 @@ + + + + + + + + \ No newline at end of file -- cgit v1.2.3