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 2024/05/30 12:21:00 UTC
(camel) 06/06: CAMEL-20798: Add endpoint service registry
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch sr
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b6ab44c74d6479c6d574d91f930ada825cceb051
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu May 30 14:06:41 2024 +0200
CAMEL-20798: Add endpoint service registry
---
.../main/java/org/apache/camel/CamelContext.java | 1 -
.../java/org/apache/camel/spi/ManagementAgent.java | 4 +--
.../mbean/ManagedEndpointServiceRegistryMBean.java | 4 +--
.../management/mbean/ManagedDynamicRouter.java | 2 +-
.../management/mbean/ManagedEndpointRegistry.java | 2 +-
.../mbean/ManagedEndpointServiceRegistry.java | 30 ++++++++++++++++------
.../camel/management/mbean/ManagedEnricher.java | 2 +-
.../mbean/ManagedExchangeFactoryManager.java | 2 +-
.../management/mbean/ManagedPollEnricher.java | 2 +-
.../management/mbean/ManagedRecipientList.java | 2 +-
.../camel/management/mbean/ManagedRoutingSlip.java | 2 +-
.../mbean/ManagedRuntimeEndpointRegistry.java | 2 +-
.../mbean/ManagedSendDynamicProcessor.java | 2 +-
.../management/mbean/ManagedSendProcessor.java | 2 +-
.../management/mbean/ManagedWireTapProcessor.java | 2 +-
15 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/CamelContext.java b/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
index 78b8564650d..f34b50d5d61 100644
--- a/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
+++ b/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
@@ -29,7 +29,6 @@ import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.DataType;
import org.apache.camel.spi.Debugger;
import org.apache.camel.spi.EndpointRegistry;
-import org.apache.camel.spi.EndpointServiceRegistry;
import org.apache.camel.spi.ExecutorServiceManager;
import org.apache.camel.spi.InflightRepository;
import org.apache.camel.spi.Injector;
diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/ManagementAgent.java b/core/camel-api/src/main/java/org/apache/camel/spi/ManagementAgent.java
index 214d5ddf4d6..3e5c4a2624c 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/ManagementAgent.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/ManagementAgent.java
@@ -230,14 +230,14 @@ public interface ManagementAgent extends Service {
/**
* Whether to remove detected sensitive information (such as passwords) from MBean names and attributes.
* <p/>
- * This option is default <tt>false</tt>.
+ * This option is default <tt>true</tt>.
*/
Boolean getMask();
/**
* Whether to remove detected sensitive information (such as passwords) from MBean names and attributes.
* <p/>
- * This option is default <tt>false</tt>.
+ * This option is default <tt>true</tt>.
*/
void setMask(Boolean sanitize);
diff --git a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointServiceRegistryMBean.java b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointServiceRegistryMBean.java
index a8d34d6d713..61a46db8ae6 100644
--- a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointServiceRegistryMBean.java
+++ b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointServiceRegistryMBean.java
@@ -16,11 +16,11 @@
*/
package org.apache.camel.api.management.mbean;
+import javax.management.openmbean.TabularData;
+
import org.apache.camel.api.management.ManagedAttribute;
import org.apache.camel.api.management.ManagedOperation;
-import javax.management.openmbean.TabularData;
-
public interface ManagedEndpointServiceRegistryMBean extends ManagedServiceMBean {
@ManagedAttribute(description = "Number of endpoint services in the registry")
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDynamicRouter.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDynamicRouter.java
index b608ab3806b..47f95cb00d1 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDynamicRouter.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDynamicRouter.java
@@ -54,7 +54,7 @@ public class ManagedDynamicRouter extends ManagedProcessor implements ManagedDyn
@Override
public void init(ManagementStrategy strategy) {
super.init(strategy);
- sanitize = strategy.getManagementAgent().getMask() != null ? strategy.getManagementAgent().getMask() : false;
+ sanitize = strategy.getManagementAgent().getMask() != null ? strategy.getManagementAgent().getMask() : true;
uri = getDefinition().getExpression().getExpression();
if (sanitize) {
uri = URISupport.sanitizeUri(uri);
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEndpointRegistry.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEndpointRegistry.java
index e08a3cc659f..7f93b0d1db8 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEndpointRegistry.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEndpointRegistry.java
@@ -47,7 +47,7 @@ public class ManagedEndpointRegistry extends ManagedService implements ManagedEn
@Override
public void init(ManagementStrategy strategy) {
super.init(strategy);
- sanitize = strategy.getManagementAgent().getMask() != null ? strategy.getManagementAgent().getMask() : false;
+ sanitize = strategy.getManagementAgent().getMask() != null ? strategy.getManagementAgent().getMask() : true;
}
public EndpointRegistry getEndpointRegistry() {
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEndpointServiceRegistry.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEndpointServiceRegistry.java
index 1ac68682d15..56428490709 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEndpointServiceRegistry.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEndpointServiceRegistry.java
@@ -16,20 +16,23 @@
*/
package org.apache.camel.management.mbean;
-import org.apache.camel.CamelContext;
-import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.api.management.ManagedResource;
-import org.apache.camel.api.management.mbean.CamelOpenMBeanTypes;
-import org.apache.camel.api.management.mbean.ManagedEndpointServiceRegistryMBean;
-import org.apache.camel.spi.EndpointServiceRegistry;
+import java.util.List;
+import java.util.StringJoiner;
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.CompositeDataSupport;
import javax.management.openmbean.CompositeType;
import javax.management.openmbean.TabularData;
import javax.management.openmbean.TabularDataSupport;
-import java.util.List;
-import java.util.StringJoiner;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.api.management.ManagedResource;
+import org.apache.camel.api.management.mbean.CamelOpenMBeanTypes;
+import org.apache.camel.api.management.mbean.ManagedEndpointServiceRegistryMBean;
+import org.apache.camel.spi.EndpointServiceRegistry;
+import org.apache.camel.spi.ManagementStrategy;
+import org.apache.camel.util.URISupport;
/**
*
@@ -38,12 +41,19 @@ import java.util.StringJoiner;
public class ManagedEndpointServiceRegistry extends ManagedService implements ManagedEndpointServiceRegistryMBean {
private final EndpointServiceRegistry registry;
+ private boolean sanitize;
public ManagedEndpointServiceRegistry(CamelContext context, EndpointServiceRegistry registry) {
super(context, registry);
this.registry = registry;
}
+ @Override
+ public void init(ManagementStrategy strategy) {
+ super.init(strategy);
+ sanitize = strategy.getManagementAgent().getMask() != null ? strategy.getManagementAgent().getMask() : true;
+ }
+
public EndpointServiceRegistry getRegistry() {
return registry;
}
@@ -66,6 +76,10 @@ public class ManagedEndpointServiceRegistry extends ManagedService implements Ma
String serviceUrl = entry.getServiceUrl();
String metadata = null;
String endpointUri = entry.getEndpointUri();
+ if (sanitize) {
+ endpointUri = URISupport.sanitizeUri(endpointUri);
+ }
+
long hits = entry.getHits();
String routeId = entry.getRouteId();
var m = entry.getServiceMetadata();
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEnricher.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEnricher.java
index cd7cec862c8..3594ea619b4 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEnricher.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEnricher.java
@@ -49,7 +49,7 @@ public class ManagedEnricher extends ManagedProcessor implements ManagedEnricher
@Override
public void init(ManagementStrategy strategy) {
super.init(strategy);
- sanitize = strategy.getManagementAgent().getMask() != null ? strategy.getManagementAgent().getMask() : false;
+ sanitize = strategy.getManagementAgent().getMask() != null ? strategy.getManagementAgent().getMask() : true;
uri = getDefinition().getExpression().getExpression();
if (sanitize) {
uri = URISupport.sanitizeUri(uri);
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedExchangeFactoryManager.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedExchangeFactoryManager.java
index 8eec7900d25..f223ce26240 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedExchangeFactoryManager.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedExchangeFactoryManager.java
@@ -48,7 +48,7 @@ public class ManagedExchangeFactoryManager extends ManagedService implements Man
@Override
public void init(ManagementStrategy strategy) {
super.init(strategy);
- sanitize = strategy.getManagementAgent().getMask() != null ? strategy.getManagementAgent().getMask() : false;
+ sanitize = strategy.getManagementAgent().getMask() != null ? strategy.getManagementAgent().getMask() : true;
}
@Override
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedPollEnricher.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedPollEnricher.java
index 09d93a1b9d6..ab6b19f602d 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedPollEnricher.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedPollEnricher.java
@@ -49,7 +49,7 @@ public class ManagedPollEnricher extends ManagedProcessor implements ManagedPoll
@Override
public void init(ManagementStrategy strategy) {
super.init(strategy);
- sanitize = strategy.getManagementAgent().getMask() != null ? strategy.getManagementAgent().getMask() : false;
+ sanitize = strategy.getManagementAgent().getMask() != null ? strategy.getManagementAgent().getMask() : true;
uri = getDefinition().getExpression().getExpression();
if (sanitize) {
uri = URISupport.sanitizeUri(uri);
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRecipientList.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRecipientList.java
index cba5a49c6b6..4746b11cd5e 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRecipientList.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRecipientList.java
@@ -49,7 +49,7 @@ public class ManagedRecipientList extends ManagedProcessor implements ManagedRec
@Override
public void init(ManagementStrategy strategy) {
super.init(strategy);
- sanitize = strategy.getManagementAgent().getMask() != null ? strategy.getManagementAgent().getMask() : false;
+ sanitize = strategy.getManagementAgent().getMask() != null ? strategy.getManagementAgent().getMask() : true;
uri = getDefinition().getExpression().getExpression();
if (sanitize) {
uri = URISupport.sanitizeUri(uri);
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRoutingSlip.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRoutingSlip.java
index 9dbc2d84fe1..21e1a25476b 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRoutingSlip.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRoutingSlip.java
@@ -49,7 +49,7 @@ public class ManagedRoutingSlip extends ManagedProcessor implements ManagedRouti
@Override
public void init(ManagementStrategy strategy) {
super.init(strategy);
- sanitize = strategy.getManagementAgent().getMask() != null ? strategy.getManagementAgent().getMask() : false;
+ sanitize = strategy.getManagementAgent().getMask() != null ? strategy.getManagementAgent().getMask() : true;
uri = getDefinition().getExpression().getExpression();
if (sanitize) {
uri = URISupport.sanitizeUri(uri);
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRuntimeEndpointRegistry.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRuntimeEndpointRegistry.java
index b34600ea741..bcb1cce8cce 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRuntimeEndpointRegistry.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRuntimeEndpointRegistry.java
@@ -48,7 +48,7 @@ public class ManagedRuntimeEndpointRegistry extends ManagedService implements Ma
@Override
public void init(ManagementStrategy strategy) {
super.init(strategy);
- sanitize = strategy.getManagementAgent().getMask() != null ? strategy.getManagementAgent().getMask() : false;
+ sanitize = strategy.getManagementAgent().getMask() != null ? strategy.getManagementAgent().getMask() : true;
}
@Override
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSendDynamicProcessor.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSendDynamicProcessor.java
index f3cd46cb9e9..d52c898c7fe 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSendDynamicProcessor.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSendDynamicProcessor.java
@@ -50,7 +50,7 @@ public class ManagedSendDynamicProcessor extends ManagedProcessor implements Man
@Override
public void init(ManagementStrategy strategy) {
super.init(strategy);
- this.sanitize = strategy.getManagementAgent().getMask() != null ? strategy.getManagementAgent().getMask() : false;
+ this.sanitize = strategy.getManagementAgent().getMask() != null ? strategy.getManagementAgent().getMask() : true;
if (sanitize) {
uri = URISupport.sanitizeUri(processor.getUri());
} else {
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSendProcessor.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSendProcessor.java
index 467805c46cf..cc4fa85ef44 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSendProcessor.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSendProcessor.java
@@ -45,7 +45,7 @@ public class ManagedSendProcessor extends ManagedProcessor implements ManagedSen
@Override
public void init(ManagementStrategy strategy) {
super.init(strategy);
- boolean sanitize = strategy.getManagementAgent().getMask() != null ? strategy.getManagementAgent().getMask() : false;
+ boolean sanitize = strategy.getManagementAgent().getMask() != null ? strategy.getManagementAgent().getMask() : true;
if (sanitize) {
destination = URISupport.sanitizeUri(processor.getDestination().getEndpointUri());
} else {
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedWireTapProcessor.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedWireTapProcessor.java
index 11248cc288f..f4033082f2c 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedWireTapProcessor.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedWireTapProcessor.java
@@ -49,7 +49,7 @@ public class ManagedWireTapProcessor extends ManagedProcessor implements Managed
@Override
public void init(ManagementStrategy strategy) {
super.init(strategy);
- sanitize = strategy.getManagementAgent().getMask() != null ? strategy.getManagementAgent().getMask() : false;
+ sanitize = strategy.getManagementAgent().getMask() != null ? strategy.getManagementAgent().getMask() : true;
if (sanitize) {
uri = URISupport.sanitizeUri(processor.getUri());
} else {