GoraComponent tiny fixes

camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedComponentMBean.java

@@ -29,4 +29,7 @@ public interface ManagedComponentMBean {
     @ManagedAttribute(description = "Camel ID")
     String getCamelId();
 
+    @ManagedAttribute(description = "Camel ManagementName")
+    String getCamelManagementName();
+
 }

camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointMBean.java

@@ -23,6 +23,9 @@ public interface ManagedEndpointMBean {
     @ManagedAttribute(description = "Camel ID")
     String getCamelId();
 
+    @ManagedAttribute(description = "Camel ManagementName")
+    String getCamelManagementName();
+
     @ManagedAttribute(description = "Endpoint URI", mask = true)
     String getEndpointUri();
 

camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedErrorHandlerMBean.java

@@ -23,6 +23,9 @@ public interface ManagedErrorHandlerMBean {
     @ManagedAttribute(description = "Camel ID")
     String getCamelId();
 
+    @ManagedAttribute(description = "Camel ManagementName")
+    String getCamelManagementName();
+
     @ManagedAttribute(description = "Does the error handler support redelivery")
     boolean isSupportRedelivery();
 

camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedProcessorMBean.java

@@ -27,6 +27,9 @@ public interface ManagedProcessorMBean extends ManagedPerformanceCounterMBean {
     @ManagedAttribute(description = "Camel ID")
     String getCamelId();
 
+    @ManagedAttribute(description = "Camel ManagementName")
+    String getCamelManagementName();
+
     @ManagedAttribute(description = "Route ID")
     String getRouteId();
 

camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedResourceEndpointMBean.java

@@ -21,6 +21,15 @@
 
 public interface ManagedResourceEndpointMBean {
 
+    @ManagedAttribute(description = "Camel context ID")
+    String getCamelId();
+
+    @ManagedAttribute(description = "Camel ManagementName")
+    String getCamelManagementName();
+
+    @ManagedAttribute(description = "Endpoint service state")
+    String getState();
+
     @ManagedAttribute(description = "Whether the content is cached")
     boolean isContentCache();
 

camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java

@@ -39,6 +39,9 @@ public interface ManagedRouteMBean extends ManagedPerformanceCounterMBean {
     @ManagedAttribute(description = "Camel ID")
     String getCamelId();
 
+    @ManagedAttribute(description = "Camel ManagementName")
+    String getCamelManagementName();
+
     @ManagedAttribute(description = "Tracing")
     Boolean getTracing();
 

camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedServiceMBean.java

@@ -27,6 +27,9 @@ public interface ManagedServiceMBean {
     @ManagedAttribute(description = "Camel ID")
     String getCamelId();
 
+    @ManagedAttribute(description = "Camel ManagementName")
+    String getCamelManagementName();
+
     @ManagedAttribute(description = "Route ID")
     String getRouteId();
 

camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java

@@ -899,6 +899,22 @@ public String toString() {
         };
     }
 
+    /**
+     * Returns the expression for the {@code null} value
+     */
+    public static Expression nullExpression() {
+        return new ExpressionAdapter() {
+            public Object evaluate(Exchange exchange) {
+                return null;
+            }
+
+            @Override
+            public String toString() {
+                return "null";
+            }
+        };
+    }
+
     /**
      * Returns the expression for the exchanges inbound message body converted
      * to the given type.

camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java

@@ -111,6 +111,21 @@ public boolean isContentCacheCleared() {
         return buffer == null;
     }
 
+    @ManagedAttribute(description = "Camel context ID")
+    public String getCamelId() {
+        return getCamelContext().getName();
+    }
+
+    @ManagedAttribute(description = "Camel ManagementName")
+    public String getCamelManagementName() {
+        return getCamelContext().getManagementName();
+    }
+
+    @ManagedAttribute(description = "Endpoint service state")
+    public String getState() {
+        return getStatus().name();
+    }
+
     /**
      * Sets whether to use resource content cache or not - default is <tt>false</tt>.
      *

camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java

@@ -415,11 +415,16 @@ public String browseRangeMessagesAsXml(Integer fromIndex, Integer toIndex, Boole
         return EndpointHelper.browseRangeMessagesAsXml(this, fromIndex, toIndex, includeBody);
     }
 
-    @ManagedAttribute(description = "Camel context name")
+    @ManagedAttribute(description = "Camel context ID")
     public String getCamelId() {
         return getCamelContext().getName();
     }
 
+    @ManagedAttribute(description = "Camel ManagementName")
+    public String getCamelManagementName() {
+        return getCamelContext().getManagementName();
+    }
+
     @ManagedAttribute(description = "Endpoint service state")
     public String getState() {
         return getStatus().name();

camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java

@@ -184,6 +184,11 @@ public String getCamelId() {
         return this.getCamelContext().getName();
     }
 
+    @ManagedAttribute(description = "Camel ManagementName")
+    public String getCamelManagementName() {
+        return this.getCamelContext().getManagementName();
+    }
+
     @ManagedAttribute(description = "Endpoint Uri")
     public String getEndpointUri() {
         return super.getEndpointUri();

camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java

@@ -68,6 +68,11 @@ public String getCamelId() {
         return getCamelContext().getName();
     }
 
+    @ManagedAttribute(description = "Camel ManagementName")
+    public String getCamelManagementName() {
+        return getCamelContext().getManagementName();
+    }
+
     public XsltEndpoint findOrCreateEndpoint(String uri, String newResourceUri) {
         String newUri = uri.replace(resourceUri, newResourceUri);
         LOG.trace("Getting endpoint with URI: {}", newUri);

camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContextNameStrategy.java

@@ -59,6 +59,7 @@ public boolean isFixedName() {
     }
 
     public static int getNextCounter() {
+        // we want to start counting from 1, so increment first
         return CONTEXT_COUNTER.incrementAndGet();
     }
 

camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java

@@ -317,6 +317,8 @@ private Expression createSimpleExpressionDirectly(String expression) {
             return ExpressionBuilder.camelContextNameExpression();
         } else if (ObjectHelper.equal(expression, "routeId")) {
             return ExpressionBuilder.routeIdExpression();
+        } else if (ObjectHelper.equal(expression, "null")) {
+            return ExpressionBuilder.nullExpression();
         }
 
         return null;

camel-core/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java

@@ -64,6 +64,10 @@ public String getCamelId() {
         return component.getCamelContext().getName();
     }
 
+    public String getCamelManagementName() {
+        return component.getCamelContext().getManagementName();
+    }
+
     public Object getInstance() {
         return component;
     }

camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java

@@ -45,6 +45,11 @@ public String getCamelId() {
         return endpoint.getCamelContext().getName();
     }
 
+    @Override
+    public String getCamelManagementName() {
+        return endpoint.getCamelContext().getManagementName();
+    }
+
     @Override
     public String getEndpointUri() {
         return endpoint.getEndpointUri();

camel-core/src/main/java/org/apache/camel/management/mbean/ManagedErrorHandler.java

@@ -61,6 +61,10 @@ public String getCamelId() {
         return routeContext.getCamelContext().getName();
     }
 
+    public String getCamelManagementName() {
+        return routeContext.getCamelContext().getManagementName();
+    }
+
     public boolean isSupportRedelivery() {
         return errorHandler instanceof RedeliveryErrorHandler;
     }

camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java

@@ -93,6 +93,10 @@ public String getCamelId() {
         return context.getName();
     }
 
+    public String getCamelManagementName() {
+        return context.getManagementName();
+    }
+
     public String getRouteId() {
         if (route != null) {
             return route.getId();

camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java

@@ -108,6 +108,10 @@ public String getCamelId() {
         return context.getName();
     }
 
+    public String getCamelManagementName() {
+        return context.getManagementName();
+    }
+
     public Boolean getTracing() {
         return route.getRouteContext().isTracing();
     }
@@ -232,7 +236,7 @@ public void updateRouteFromXml(String xml) throws Exception {
 
     public String dumpRouteStatsAsXml(boolean fullStats, boolean includeProcessors) throws Exception {
         // in this logic we need to calculate the accumulated processing time for the processor in the route
-        // and hence why the logic is a bit more complicated to do this, as we need to caculate that from
+        // and hence why the logic is a bit more complicated to do this, as we need to calculate that from
         // the bottom -> top of the route but this information is valuable for profiling routes
         StringBuilder sb = new StringBuilder();
 

camel-core/src/main/java/org/apache/camel/management/mbean/ManagedService.java

@@ -78,6 +78,10 @@ public String getCamelId() {
         return context.getName();
     }
 
+    public String getCamelManagementName() {
+        return context.getManagementName();
+    }
+
     public String getRouteId() {
         if (route != null) {
             return route.getId();

camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java

@@ -20,7 +20,6 @@
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
 import org.apache.camel.NamedNode;
@@ -35,8 +34,7 @@
 @XmlAccessorType(XmlAccessType.PROPERTY)
 public abstract class OptionalIdentifiedDefinition<T extends OptionalIdentifiedDefinition<T>> implements NamedNode {
     private String id;
-    @XmlTransient
-    private boolean customId;
+    private Boolean customId;
     private DescriptionDefinition description;
 
     /**
@@ -128,11 +126,20 @@ public String idOrCreate(NodeIdFactory factory) {
         return getId();
     }
 
+    public Boolean isCustomId() {
+        return customId;
+    }
+
+    @XmlAttribute
+    public void setCustomId(Boolean customId) {
+        this.customId = customId;
+    }
+
     /**
      * Returns whether a custom id has been assigned
      */
     public boolean hasCustomIdAssigned() {
-        return customId;
+        return customId != null && customId;
     }
 
     /**

camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java

@@ -101,6 +101,10 @@ public void testConstantExpression() throws Exception {
         assertExpression("Hello World", "Hello World");
     }
 
+    public void testNull() throws Exception {
+        assertNull(SimpleLanguage.simple("${null}").evaluate(exchange, Object.class));
+    }
+
     public void testEmptyExpression() throws Exception {
         assertExpression("", "");
         assertExpression(" ", " ");

camel-core/src/test/java/org/apache/camel/model/GenerateXmFromCamelContextlTest.java → camel-core/src/test/java/org/apache/camel/model/GenerateXmFromCamelContextTest.java

@@ -27,9 +27,9 @@
 /**
  * @version 
  */
-public class GenerateXmFromCamelContextlTest extends ContextTestSupport {
+public class GenerateXmFromCamelContextTest extends ContextTestSupport {
 
-    public void testCreateRouteFromCamelCOntext() throws Exception {
+    public void testCreateRouteFromCamelContext() throws Exception {
         List<RouteDefinition> list = context.getRouteDefinitions();
         assertEquals("Size of list " + list, 1, list.size());
         RouteDefinition routeType = list.get(0);

camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteTest.java

@@ -31,6 +31,7 @@ public void testDumpModelAsXml() throws Exception {
         log.info(xml);
 
         assertTrue(xml.contains("<simple>Hello ${body}</simple>"));
+        assertTrue(xml.contains("<to uri=\"mock:result\" customId=\"true\" id=\"myMock\"/>"));
     }
 
     @Override
@@ -40,7 +41,7 @@ protected RouteBuilder createRouteBuilder() throws Exception {
             public void configure() throws Exception {
                 from("direct:start").routeId("myRoute")
                    .transform().simple("Hello ${body}")
-                   .to("mock:result");
+                   .to("mock:result").id("myMock");
             }
         };
     }

camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java

@@ -27,6 +27,8 @@
 import javax.net.ssl.SSLServerSocket;
 import javax.net.ssl.SSLSocket;
 
+import junit.framework.AssertionFailedError;
+
 import org.apache.camel.CamelContext;
 
 public class SSLContextParametersTest extends AbstractJsseParametersTest {
@@ -40,6 +42,12 @@ public void testFilter() {
                           Arrays.asList(new Pattern[0]));
         assertEquals(2, result.size());
         assertStartsWith(result, "TLS");
+        try {
+            assertStartsWith((String[]) null, "TLS");
+            fail("We chould got an exception here!");
+        } catch (AssertionFailedError ex) {
+            assertEquals("Get a wrong message", "The values should not be null", ex.getMessage());
+        }
     }
 
     public void testPropertyPlaceholders() throws Exception {
@@ -752,14 +760,16 @@ protected String[] getDefaultCipherSuiteIncludes(String[] availableCipherSuites)
     }
 
     protected void assertStartsWith(String[] values, String prefix) {
+        assertNotNull("The values should not be null", values);
         for (String value : values) {
-            assertTrue(value.startsWith(prefix));
+            assertTrue(value + " does not start with the prefix " + prefix, value.startsWith(prefix));
         }
     }
 
     protected void assertStartsWith(Collection<String> values, String prefix) {
+        assertNotNull("The values should not be null", values);
         for (String value : values) {
-            assertTrue(value.startsWith(prefix));
+            assertTrue(value + " does not start with the prefix " + prefix, value.startsWith(prefix));
         }
     }
 }