This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 35ba59c CAMEL-15567: components - Generate source code for creating
endpoint uri via a map of properties
35ba59c is described below
commit 35ba59cbb3a08c6c537ecf1740b7a18e8b2493a3
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Sep 26 10:19:57 2020 +0200
CAMEL-15567: components - Generate source code for creating endpoint uri
via a map of properties
---
.../impl/engine/DefaultUriFactoryResolver.java | 29 ++++------------------
.../camel/impl/MultipleLifecycleStrategyTest.java | 2 +-
.../management/ManagedNonManagedServiceTest.java | 2 +-
...edProducerRouteAddRemoveRegisterAlwaysTest.java | 2 +-
.../management/ManagedRouteAddRemoveTest.java | 2 +-
5 files changed, 9 insertions(+), 28 deletions(-)
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUriFactoryResolver.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUriFactoryResolver.java
index bb20b0f..acfb865 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUriFactoryResolver.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUriFactoryResolver.java
@@ -17,7 +17,6 @@
package org.apache.camel.impl.engine;
import java.io.IOException;
-import java.util.Map;
import java.util.Set;
import org.apache.camel.CamelContext;
@@ -27,8 +26,6 @@ import org.apache.camel.NoFactoryAvailableException;
import org.apache.camel.spi.EndpointUriFactory;
import org.apache.camel.spi.FactoryFinder;
import org.apache.camel.spi.UriFactoryResolver;
-import org.apache.camel.support.LRUCacheFactory;
-import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,12 +34,12 @@ import org.slf4j.LoggerFactory;
* Default assembler resolver that looks for assembler factories in
* <b>META-INF/services/org/apache/camel/urifactory/</b>.
*/
-public class DefaultUriFactoryResolver extends ServiceSupport implements
CamelContextAware, UriFactoryResolver {
+
+public class DefaultUriFactoryResolver implements CamelContextAware,
UriFactoryResolver {
public static final String RESOURCE_PATH =
"META-INF/services/org/apache/camel/urifactory/";
private static final Logger LOG =
LoggerFactory.getLogger(DefaultUriFactoryResolver.class);
- private final Map<String, EndpointUriFactory> cache =
LRUCacheFactory.newLRUSoftCache(1000);
private CamelContext camelContext;
private FactoryFinder factoryFinder;
@@ -62,17 +59,11 @@ public class DefaultUriFactoryResolver extends
ServiceSupport implements CamelCo
return null;
}
- EndpointUriFactory answer = cache.get(name);
- if (answer != null) {
- return answer;
- }
-
// lookup in registry first
Set<EndpointUriFactory> assemblers =
context.getRegistry().findByType(EndpointUriFactory.class);
- answer = assemblers.stream().filter(a ->
a.isEnabled(name)).findFirst().orElse(null);
+ EndpointUriFactory answer = assemblers.stream().filter(a ->
a.isEnabled(name)).findFirst().orElse(null);
if (answer != null) {
answer.setCamelContext(context);
- cache.put(name, answer);
return answer;
}
@@ -88,8 +79,8 @@ public class DefaultUriFactoryResolver extends ServiceSupport
implements CamelCo
}
if (type != null) {
- if (getLog().isDebugEnabled()) {
- getLog().debug("Found EndpointUriFactory: {} via type: {} via:
{}{}", name, type.getName(),
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Found EndpointUriFactory: {} via type: {} via:
{}{}", name, type.getName(),
factoryFinder.getResourcePath(),
name);
}
@@ -98,7 +89,6 @@ public class DefaultUriFactoryResolver extends ServiceSupport
implements CamelCo
if (EndpointUriFactory.class.isAssignableFrom(type)) {
answer = (EndpointUriFactory)
context.getInjector().newInstance(type, false);
answer.setCamelContext(context);
- cache.put(name, answer);
return answer;
} else {
throw new IllegalArgumentException(
@@ -116,13 +106,4 @@ public class DefaultUriFactoryResolver extends
ServiceSupport implements CamelCo
return factoryFinder.findClass(name).orElse(null);
}
- protected Logger getLog() {
- return LOG;
- }
-
- @Override
- protected void doStop() throws Exception {
- cache.clear();
- }
-
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java
b/core/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java
index 44c2dd6..64d17d2 100644
---
a/core/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java
@@ -53,7 +53,7 @@ public class MultipleLifecycleStrategyTest extends
TestSupport {
List<String> expectedEvents = Arrays.asList(
"onServiceAdd", "onServiceAdd", "onServiceAdd",
"onServiceAdd", "onServiceAdd",
"onServiceAdd", "onServiceAdd", "onServiceAdd",
"onServiceAdd", "onServiceAdd",
- "onServiceAdd", "onServiceAdd",
+ "onServiceAdd",
"onContextStart",
"onComponentAdd", "onEndpointAdd", "onComponentRemove",
"onContextStop");
diff --git
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedNonManagedServiceTest.java
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedNonManagedServiceTest.java
index 87948df..0779481 100644
---
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedNonManagedServiceTest.java
+++
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedNonManagedServiceTest.java
@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
public class ManagedNonManagedServiceTest extends ManagementTestSupport {
- private static final int SERVICES = 12;
+ private static final int SERVICES = 11;
@Test
public void testService() throws Exception {
diff --git
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java
index faa9bc7..c88836f 100644
---
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java
+++
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java
@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class ManagedProducerRouteAddRemoveRegisterAlwaysTest extends
ManagementTestSupport {
- private static final int SERVICES = 12;
+ private static final int SERVICES = 11;
@Override
protected CamelContext createCamelContext() throws Exception {
diff --git
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java
index b589ecd..bfef164 100644
---
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java
+++
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java
@@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
*/
public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
- private static final int SERVICES = 12;
+ private static final int SERVICES = 11;
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
