You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2012/01/29 17:28:16 UTC
svn commit: r1237327 - in
/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean:
ManagedBrowsableEndpoint.java ManagedEndpoint.java
Author: bvahdat
Date: Sun Jan 29 16:28:15 2012
New Revision: 1237327
URL: http://svn.apache.org/viewvc?rev=1237327&view=rev
Log:
CAMEL-4938: Polished by overriding getEndpoint() & getInstance() methods which make use of covariant return types (work in progress).
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBrowsableEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBrowsableEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBrowsableEndpoint.java?rev=1237327&r1=1237326&r2=1237327&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBrowsableEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBrowsableEndpoint.java Sun Jan 29 16:28:15 2012
@@ -26,28 +26,33 @@ import org.apache.camel.spi.BrowsableEnd
import org.apache.camel.util.MessageHelper;
/**
- * @version
+ * @version
*/
@ManagedResource(description = "Managed BrowsableEndpoint")
public class ManagedBrowsableEndpoint extends ManagedEndpoint implements ManagedBrowsableEndpointMBean {
- private BrowsableEndpoint endpoint;
-
public ManagedBrowsableEndpoint(BrowsableEndpoint endpoint) {
super(endpoint);
- this.endpoint = endpoint;
}
+ @Override
public BrowsableEndpoint getEndpoint() {
- return endpoint;
+ return (BrowsableEndpoint) super.getEndpoint();
+ }
+
+ @Override
+ public BrowsableEndpoint getInstance() {
+ return getEndpoint();
}
+ @Override
public long queueSize() {
- return endpoint.getExchanges().size();
+ return getEndpoint().getExchanges().size();
}
+ @Override
public String browseExchange(Integer index) {
- List<Exchange> exchanges = endpoint.getExchanges();
+ List<Exchange> exchanges = getEndpoint().getExchanges();
if (index >= exchanges.size()) {
return null;
@@ -60,8 +65,9 @@ public class ManagedBrowsableEndpoint ex
return exchange.toString();
}
+ @Override
public String browseMessageBody(Integer index) {
- List<Exchange> exchanges = endpoint.getExchanges();
+ List<Exchange> exchanges = getEndpoint().getExchanges();
if (index >= exchanges.size()) {
return null;
@@ -82,12 +88,14 @@ public class ManagedBrowsableEndpoint ex
return body;
}
+ @Override
public String browseMessageAsXml(Integer index) {
return browseMessageAsXml(index, true);
}
+ @Override
public String browseMessageAsXml(Integer index, Boolean includeBody) {
- List<Exchange> exchanges = endpoint.getExchanges();
+ List<Exchange> exchanges = getEndpoint().getExchanges();
if (index >= exchanges.size()) {
return null;
@@ -103,10 +111,12 @@ public class ManagedBrowsableEndpoint ex
return xml;
}
+ @Override
public String browseAllMessagesAsXml(Boolean includeBody) {
return browseRangeMessagesAsXml(0, Integer.MAX_VALUE, includeBody);
}
+ @Override
public String browseRangeMessagesAsXml(Integer fromIndex, Integer toIndex, Boolean includeBody) {
if (fromIndex == null) {
fromIndex = 0;
@@ -118,7 +128,7 @@ public class ManagedBrowsableEndpoint ex
throw new IllegalArgumentException("From index cannot be larger than to index, was: " + fromIndex + " > " + toIndex);
}
- List<Exchange> exchanges = endpoint.getExchanges();
+ List<Exchange> exchanges = getEndpoint().getExchanges();
if (exchanges.size() == 0) {
return null;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java?rev=1237327&r1=1237326&r2=1237327&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java Sun Jan 29 16:28:15 2012
@@ -40,18 +40,22 @@ public class ManagedEndpoint implements
return endpoint;
}
+ @Override
public String getCamelId() {
return endpoint.getCamelContext().getName();
}
+ @Override
public String getEndpointUri() {
return endpoint.getEndpointUri();
}
+ @Override
public boolean isSingleton() {
return endpoint.isSingleton();
}
+ @Override
public String getState() {
// must use String type to be sure remote JMX can read the attribute without requiring Camel classes.
if (endpoint instanceof StatefulService) {
@@ -67,7 +71,9 @@ public class ManagedEndpoint implements
return ServiceStatus.Started.name();
}
- public Object getInstance() {
+ @Override
+ public Endpoint getInstance() {
return endpoint;
}
+
}