CAMEL-6589: Route should have exactly only 1 input.

components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java

@@ -1026,7 +1026,7 @@ public void process(ComponentDefinitionRegistry componentDefinitionRegistry) {
 
             // regular camel routes
             for (RouteDefinition rd : camelContext.adapt(ModelCamelContext.class).getRouteDefinitions()) {
-                findInputComponents(rd.getInputs(), components, languages, dataformats);
+                findInputComponents(rd.getInput(), components, languages, dataformats);
                 findOutputComponents(rd.getOutputs(), components, languages, dataformats);
             }
 
@@ -1036,7 +1036,7 @@ public void process(ComponentDefinitionRegistry componentDefinitionRegistry) {
                     Object o = vd.getToOrRoute();
                     if (o instanceof RouteDefinition) {
                         RouteDefinition route = (RouteDefinition) o;
-                        findInputComponents(route.getInputs(), components, languages, dataformats);
+                        findInputComponents(route.getInput(), components, languages, dataformats);
                         findOutputComponents(route.getOutputs(), components, languages, dataformats);
                     } else if (o instanceof ToDefinition) {
                         findUriComponent(((ToDefinition) o).getUri(), components);
@@ -1108,12 +1108,10 @@ public void process(ComponentDefinitionRegistry componentDefinitionRegistry) {
 
         }
 
-        private void findInputComponents(List<FromDefinition> defs, Set<String> components, Set<String> languages, Set<String> dataformats) {
-            if (defs != null) {
-                for (FromDefinition def : defs) {
-                    findUriComponent(def.getUri(), components);
-                    findSchedulerUriComponent(def.getUri(), components);
-                }
+        private void findInputComponents(FromDefinition from, Set<String> components, Set<String> languages, Set<String> dataformats) {
+            if (from != null) {
+                findUriComponent(from.getUri(), components);
+                findSchedulerUriComponent(from.getUri(), components);
             }
         }
 

components/camel-blueprint/src/test/java/org/apache/camel/blueprint/BlueprintJaxbRestTest.java

@@ -34,11 +34,6 @@ public class BlueprintJaxbRestTest extends TestSupport {
 
     @Test
     public void test() throws Exception {
-        if (isJava16() && isJavaVendor("ibm")) {
-            // does not test well on java6 with ibm
-            return;
-        }
-
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
         dbf.setNamespaceAware(true);
         DocumentBuilder db = dbf.newDocumentBuilder();

components/camel-blueprint/src/test/java/org/apache/camel/blueprint/BlueprintJaxbTest.java

@@ -34,11 +34,6 @@ public class BlueprintJaxbTest extends TestSupport {
 
     @Test
     public void test() throws Exception {
-        if (isJava16() && isJavaVendor("ibm")) {
-            // does not test well on java6 with ibm
-            return;
-        }
-
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
         dbf.setNamespaceAware(true);
         DocumentBuilder db = dbf.newDocumentBuilder();
@@ -62,8 +57,7 @@ public void test() throws Exception {
         assertNotNull(((CamelContextFactoryBean) object).getRoutes());
         assertEquals(1, ((CamelContextFactoryBean) object).getRoutes().size());
         assertNotNull(((CamelContextFactoryBean) object).getRoutes().get(0));
-        assertNotNull(((CamelContextFactoryBean) object).getRoutes().get(0).getInputs());
-        assertEquals(1, ((CamelContextFactoryBean) object).getRoutes().get(0).getInputs().size());
+        assertNotNull(((CamelContextFactoryBean) object).getRoutes().get(0).getInput());
         assertNotNull(((CamelContextFactoryBean) object).getRoutes().get(0).getOutputs());
         assertEquals(1, ((CamelContextFactoryBean) object).getRoutes().get(0).getOutputs().size());
         assertTrue(((CamelContextFactoryBean) object).getCamelPropertyPlaceholder().isCache());

components/camel-cdi/src/test/java/org/apache/camel/cdi/test/XmlRouteContextImportTest.java

@@ -83,10 +83,8 @@ public void verifyRouteContext() {
         assertThat("Route context is incorrect!", routes, hasSize(1));
         RouteDefinition route = routes.get(0);
 
-        assertThat("Route input is incorrect!", route.getInputs(), hasSize(1));
-
         assertThat("Route is incorrect!",
-            route.getInputs().get(0).getEndpointUri(), is(equalTo("direct:inbound")));
+            route.getInput().getEndpointUri(), is(equalTo("direct:inbound")));
     }
 
     @Test

components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInOutInteractiveMain.java

@@ -35,7 +35,7 @@ public class CometdProducerConsumerInOutInteractiveMain {
     private static final String URI = "cometd://127.0.0.1:9091/service/test?baseResource=file:./src/test/resources/webapp&"
             + "timeout=240000&interval=0&maxInterval=30000&multiFrameInterval=1500&jsonCommented=true&logLevel=2";
 
-    private static final String URIS = "cometds://127.0.0.1:9443/service/test?baseResource=file:./src/test/resources/webapp&"
+    private static final String URI2 = "cometds://127.0.0.1:9443/service/test?baseResource=file:./src/test/resources/webapp&"
         + "timeout=240000&interval=0&maxInterval=30000&multiFrameInterval=1500&jsonCommented=true&logLevel=2";
 
     private CamelContext context;
@@ -63,7 +63,14 @@ public void configure() {
                 URI keyStoreUrl = file.toURI();
                 component.setSslKeystore(keyStoreUrl.getPath());
 
-                from(URI, URIS).setExchangePattern(ExchangePattern.InOut).process(new Processor() {
+                from(URI).setExchangePattern(ExchangePattern.InOut).process(new Processor() {
+                    public void process(Exchange exchange) throws Exception {
+                        Message out = new DefaultMessage(exchange.getContext());
+                        out.setBody("reply: " + exchange.getIn().getBody());
+                        exchange.setOut(out);
+                    }
+                });
+                from(URI2).setExchangePattern(ExchangePattern.InOut).process(new Processor() {
                     public void process(Exchange exchange) throws Exception {
                         Message out = new DefaultMessage(exchange.getContext());
                         out.setBody("reply: " + exchange.getIn().getBody());

components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java

@@ -228,23 +228,20 @@ public CamelContextBuilder getCamelContextBuilder() {
 
     protected void annotateKJarRoutes(RoutesDefinition routes, String deploymentId) {
         for (RouteDefinition route : routes.getRoutes()) {
-
-            for (FromDefinition from : route.getInputs()) {
-
-                if (from.getUri().startsWith("jbpm:events") && !from.getUri().contains("deploymentId")) {
-                    StringBuilder uri = new StringBuilder(from.getUri());
-
-                    String[] split = from.getUri().split("\\?");
-                    if (split.length == 1) {
-                        // no query given
-                        uri.append("?");
-                    } else {
-                        // already query params exist
-                        uri.append("&");
-                    }
-                    uri.append("deploymentId=").append(deploymentId);
-                    from.setUri(uri.toString());
+            FromDefinition from = route.getInput();
+            if (from.getUri().startsWith("jbpm:events") && !from.getUri().contains("deploymentId")) {
+                StringBuilder uri = new StringBuilder(from.getUri());
+
+                String[] split = from.getUri().split("\\?");
+                if (split.length == 1) {
+                    // no query given
+                    uri.append("?");
+                } else {
+                    // already query params exist
+                    uri.append("&");
                 }
+                uri.append("deploymentId=").append(deploymentId);
+                from.setUri(uri.toString());
             }
         }
     }

components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/CustomIdIssuesTest.java

@@ -36,7 +36,7 @@ public void testCustomId() {
         assertNotNull(route);
         assertTrue(route.hasCustomIdAssigned());
 
-        FromDefinition from = route.getInputs().get(0);
+        FromDefinition from = route.getInput();
         assertEquals("fromFile", from.getId());
         assertTrue(from.hasCustomIdAssigned());