This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch mock
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 354e5b483f4c495722b0e30718f9bd9ea90b6f96
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Apr 17 11:29:20 2019 +0200
CAMEL-13421: Remove BeanInvocation from camel-bean
---
.../remoting/MultiArgumentsWithDefaultBinding.java | 32 --------------
.../MultiArgumentsWithDefaultBindingService.java | 38 -----------------
...rgumentsWithDefaultBindingServiceInterface.java | 25 -----------
...DefaultBindingSpringRemotingPojoDirectTest.java | 49 ----------------------
...yMultiArgumentSpringRemotingPojoDirectTest.java | 48 ---------------------
...-arguments-with-default-binding-pojo-direct.xml | 35 ----------------
.../remoting/my-multi-argument-pojo-direct.xml | 35 ----------------
7 files changed, 262 deletions(-)
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MultiArgumentsWithDefaultBinding.java
b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MultiArgumentsWithDefaultBinding.java
deleted file mode 100644
index 5d8e0fc..0000000
---
a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MultiArgumentsWithDefaultBinding.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.camel.spring.remoting;
-
-import java.util.Date;
-
-import org.apache.camel.Produce;
-
-public class MultiArgumentsWithDefaultBinding {
-
- @Produce(uri = "direct:myargs")
- MultiArgumentsWithDefaultBindingServiceInterface
multiArgumentServiceInterface;
-
- public void doSomethingMultiple() {
- multiArgumentServiceInterface.doSomething("Hello World 1", "Hello
World 2", new Date());
- }
-
-}
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MultiArgumentsWithDefaultBindingService.java
b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MultiArgumentsWithDefaultBindingService.java
deleted file mode 100644
index e0a7f39..0000000
---
a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MultiArgumentsWithDefaultBindingService.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.camel.spring.remoting;
-
-import java.util.Date;
-
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertNotNull;
-import static junit.framework.TestCase.assertTrue;
-
-import org.apache.camel.Consume;
-
-public class MultiArgumentsWithDefaultBindingService implements
MultiArgumentsWithDefaultBindingServiceInterface {
-
- @Override
- @Consume(uri = "direct:myargs")
- public void doSomething(String arg1, String arg2, Date arg3) {
- assertEquals("Hello World 1", arg1);
- assertEquals("Hello World 2", arg2);
- assertNotNull(arg3);
- assertTrue(arg3 instanceof Date);
- }
-
-}
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MultiArgumentsWithDefaultBindingServiceInterface.java
b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MultiArgumentsWithDefaultBindingServiceInterface.java
deleted file mode 100644
index 5cb801c..0000000
---
a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MultiArgumentsWithDefaultBindingServiceInterface.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.camel.spring.remoting;
-
-import java.util.Date;
-
-public interface MultiArgumentsWithDefaultBindingServiceInterface {
-
- void doSomething(String arg1, String arg2, Date arg3);
-
-}
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MultiArgumentsWithDefaultBindingSpringRemotingPojoDirectTest.java
b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MultiArgumentsWithDefaultBindingSpringRemotingPojoDirectTest.java
deleted file mode 100644
index 446cff3..0000000
---
a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MultiArgumentsWithDefaultBindingSpringRemotingPojoDirectTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.camel.spring.remoting;
-
-import org.apache.camel.spring.SpringTestSupport;
-import org.junit.Test;
-import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-public class MultiArgumentsWithDefaultBindingSpringRemotingPojoDirectTest
extends SpringTestSupport {
-
- @Override
- protected AbstractXmlApplicationContext createApplicationContext() {
- return new
ClassPathXmlApplicationContext("org/apache/camel/spring/remoting/multi-arguments-with-default-binding-pojo-direct.xml");
- }
-
- @Test
- public void testMultiArgumentPojo() throws Exception {
- try {
- // use the pojo directly to call the injected endpoint and have the
- // original runtime exception thrown
- MultiArgumentsWithDefaultBinding myMultArgumentPojo =
applicationContext.getBean("multiArgumentsPojoDirect",
MultiArgumentsWithDefaultBinding.class);
- myMultArgumentPojo.doSomethingMultiple();
- } catch (RuntimeException e) {
- fail(""
- + "\nShould not have failed with multiple arguments on
POJO @Produce @Consume."
- + "\nValues are incorrect in the consume for
doSomething(String arg1, String arg2, Date arg3)"
- + "\nProduce called with doSomething(\"Hello World 1\",
\"Hello World 2\", new Date())."
- + "\nConsume got something else."
- + "\n" + e.getMessage()
- + "\n");
- }
- }
-
-}
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgumentSpringRemotingPojoDirectTest.java
b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgumentSpringRemotingPojoDirectTest.java
deleted file mode 100644
index ae0c925..0000000
---
a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgumentSpringRemotingPojoDirectTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.camel.spring.remoting;
-
-import org.apache.camel.spring.SpringTestSupport;
-import org.junit.Test;
-import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-public class MyMultiArgumentSpringRemotingPojoDirectTest extends
SpringTestSupport {
-
- @Override
- protected AbstractXmlApplicationContext createApplicationContext() {
- return new
ClassPathXmlApplicationContext("org/apache/camel/spring/remoting/my-multi-argument-pojo-direct.xml");
- }
-
- @Test
- public void testMultiArgumentPojo() throws Exception {
- try {
- // use the pojo directly to call the injected endpoint and have the
- // original runtime exception thrown
- MyMultiArgument myMultArgumentPojo =
applicationContext.getBean("myMultiArgumentPojoDirect", MyMultiArgument.class);
- myMultArgumentPojo.doSomethingMultiple();
- } catch (RuntimeException e) {
- fail(""
- + "\nShould not have failed with multiple arguments on
POJO @Produce @Consume."
- + "\nValues are incorrect in the consume for
doSomething(String arg1, String arg2, Long arg3)"
- + "\nProduce called with doSomething(\"Hello World 1\",
\"Hello World 2\", new Long(\"3\"))."
- + "\nConsume got doSomething(Long(3), null, null)"
- + "\n");
- }
- }
-
-}
diff --git
a/components/camel-spring/src/test/resources/org/apache/camel/spring/remoting/multi-arguments-with-default-binding-pojo-direct.xml
b/components/camel-spring/src/test/resources/org/apache/camel/spring/remoting/multi-arguments-with-default-binding-pojo-direct.xml
deleted file mode 100644
index ddfee1f..0000000
---
a/components/camel-spring/src/test/resources/org/apache/camel/spring/remoting/multi-arguments-with-default-binding-pojo-direct.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
- ">
-
- <bean id="multiArgumentsService"
class="org.apache.camel.spring.remoting.MultiArgumentsWithDefaultBindingService"/>
-
- <bean id="multiArgumentsPojoDirect"
class="org.apache.camel.spring.remoting.MultiArgumentsWithDefaultBinding"/>
-
- <camelContext xmlns="http://camel.apache.org/schema/spring";>
-
- </camelContext>
-
-</beans>
diff --git
a/components/camel-spring/src/test/resources/org/apache/camel/spring/remoting/my-multi-argument-pojo-direct.xml
b/components/camel-spring/src/test/resources/org/apache/camel/spring/remoting/my-multi-argument-pojo-direct.xml
deleted file mode 100644
index 4b58a29..0000000
---
a/components/camel-spring/src/test/resources/org/apache/camel/spring/remoting/my-multi-argument-pojo-direct.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
- ">
-
- <bean id="myMultiArgumentService"
class="org.apache.camel.spring.remoting.MyMultiArgumentService"/>
-
- <bean id="myMultiArgumentPojoDirect"
class="org.apache.camel.spring.remoting.MyMultiArgument"/>
-
- <camelContext xmlns="http://camel.apache.org/schema/spring";>
-
- </camelContext>
-
-</beans>
