You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/11/08 09:33:06 UTC
[2/2] camel git commit: CAMEL-10344: RouteIdFactory - assigning route
ids based on uris
CAMEL-10344: RouteIdFactory - assigning route ids based on uris
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/56078785
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/56078785
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/56078785
Branch: refs/heads/master
Commit: 56078785a36b610d96037db7149f3d6dc8e9e944
Parents: 7e355e0
Author: Tomasz Kopczynski <to...@kopczynski.net.pl>
Authored: Tue Nov 1 19:49:06 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Nov 8 10:30:50 2016 +0100
----------------------------------------------------------------------
.../org/apache/camel/impl/RouteIdFactory.java | 123 +++++++++++++++++++
.../apache/camel/impl/RouteIdFactoryTest.java | 54 ++++++++
2 files changed, 177 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/56078785/camel-core/src/main/java/org/apache/camel/impl/RouteIdFactory.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/RouteIdFactory.java b/camel-core/src/main/java/org/apache/camel/impl/RouteIdFactory.java
new file mode 100644
index 0000000..fda6127
--- /dev/null
+++ b/camel-core/src/main/java/org/apache/camel/impl/RouteIdFactory.java
@@ -0,0 +1,123 @@
+/**
+ * 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.impl;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.camel.NamedNode;
+import org.apache.camel.model.FromDefinition;
+import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.model.rest.RestBindingDefinition;
+import org.apache.camel.spi.NodeIdFactory;
+
+/**
+ * Factory for generating route ids based on uris.
+ * <p>
+ * For direct/seda routes it returns route name (direct:start -> start).
+ * For rest routes it returns its context path.
+ * <p>
+ * When id cannot be generated, falls back to other {@link NodeIdFactory} implementation.
+ * If none is passed in the constructor, then {@link DefaultNodeIdFactory} is used.
+ */
+public class RouteIdFactory implements NodeIdFactory {
+
+ private NodeIdFactory defaultNodeIdFactory;
+
+ public RouteIdFactory() {
+ defaultNodeIdFactory = new DefaultNodeIdFactory();
+ }
+
+ public RouteIdFactory(NodeIdFactory defaultNodeIdFactory) {
+ this.defaultNodeIdFactory = defaultNodeIdFactory;
+ }
+
+ @Override
+ public String createId(NamedNode definition) {
+ if (definition instanceof RouteDefinition) {
+ Optional<String> id = extractId((RouteDefinition) definition);
+
+ if (id.isPresent()) {
+ return id.get();
+ }
+
+ id = extractIdFromRestDefinition((RouteDefinition) definition);
+
+ if (id.isPresent()) {
+ return id.get();
+ }
+ }
+
+ return defaultNodeIdFactory.createId(definition);
+
+ }
+
+ /**
+ * Extract id from direct/seda route.
+ */
+ private Optional<String> extractId(RouteDefinition routeDefinition) {
+ List<FromDefinition> inputs = routeDefinition.getInputs();
+
+ if (inputs == null || inputs.isEmpty()) {
+ return Optional.empty();
+ }
+
+ FromDefinition from = inputs.get(0);
+ String uri = from.getUri();
+
+ int colon = uri.indexOf(':');
+
+ if (colon > 0) {
+ String name = uri.substring(colon + 1);
+
+ int questionMark = name.indexOf("?");
+
+ if (questionMark > 0) {
+ return Optional.of(name.substring(0, questionMark));
+ } else {
+ return Optional.of(name);
+ }
+ }
+
+ return Optional.empty();
+ }
+
+ /**
+ * Extract id from rest route.
+ */
+ private Optional<String> extractIdFromRestDefinition(RouteDefinition route) {
+ if (route.getOutputs().get(0) instanceof RestBindingDefinition) {
+ if (route.getRestDefinition() == null) {
+ return Optional.empty();
+ }
+
+ String path = route.getRestDefinition().getPath();
+
+ if (path == null) {
+ return Optional.empty();
+ }
+
+ if (path.indexOf('/') > 0) {
+ return Optional.of(path.substring(0, path.indexOf('/')));
+ }
+
+ return Optional.of(path);
+ }
+
+ return Optional.empty();
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/56078785/camel-core/src/test/java/org/apache/camel/impl/RouteIdFactoryTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/impl/RouteIdFactoryTest.java b/camel-core/src/test/java/org/apache/camel/impl/RouteIdFactoryTest.java
new file mode 100644
index 0000000..d6ecb71
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/impl/RouteIdFactoryTest.java
@@ -0,0 +1,54 @@
+/**
+ * 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.impl;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.rest.DummyRestConsumerFactory;
+import org.apache.camel.component.rest.DummyRestProcessorFactory;
+
+public class RouteIdFactoryTest extends ContextTestSupport {
+
+ @Override
+ protected JndiRegistry createRegistry() throws Exception {
+ JndiRegistry jndi = super.createRegistry();
+ jndi.bind("dummy-rest", new DummyRestConsumerFactory());
+ jndi.bind("dummy-rest-api", new DummyRestProcessorFactory());
+ return jndi;
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ context.setNodeIdFactory(new RouteIdFactory());
+ from("direct:start1?timeout=30000").to("mock:result");
+ from("direct:start2").to("mock:result");
+ }
+ };
+ }
+
+ public void testDirectRouteIdWithOptions() {
+ assertEquals("start1", context.getRouteDefinitions().get(0).getId());
+ }
+
+ public void testDirectRouteId() {
+ assertEquals("start2", context.getRouteDefinitions().get(1).getId());
+ }
+
+}
\ No newline at end of file