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 2008/12/10 12:51:14 UTC
svn commit: r725058 - in /activemq/camel/trunk:
camel-core/src/main/java/org/apache/camel/builder/xml/
camel-core/src/main/java/org/apache/camel/component/bean/
camel-core/src/main/java/org/apache/camel/component/file/
camel-core/src/main/java/org/apac...
Author: davsclaus
Date: Wed Dec 10 03:51:12 2008
New Revision: 725058
URL: http://svn.apache.org/viewvc?rev=725058&view=rev
Log:
CAMEL-1155: Refactored ObjectHelper to use isEmpty, isNotEmpty for null and empty string tests.
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileProducer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/MainSupport.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/ModelFileGenerator.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/NodeData.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/XmlGraphGenerator.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ObjectHelperTest.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfEndpointUtils.java
activemq/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackComponent.java
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpOperationFailedException.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java?rev=725058&r1=725057&r2=725058&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java Wed Dec 10 03:51:12 2008
@@ -65,7 +65,7 @@
* given expected namespace
*/
public static boolean isMatchingNamespaceOrEmptyNamespace(String namespaceURI, String expectedNamespace) {
- return ObjectHelper.isNullOrBlank(namespaceURI) || namespaceURI.equals(expectedNamespace);
+ return ObjectHelper.isEmpty(namespaceURI) || namespaceURI.equals(expectedNamespace);
}
public Namespaces add(String prefix, String uri) {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java?rev=725058&r1=725057&r2=725058&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java Wed Dec 10 03:51:12 2008
@@ -103,7 +103,7 @@
invocation = beanInfo.createInvocation(methodObject, bean, exchange);
} else {
// we just override the bean's invocation method name here
- if (ObjectHelper.isNotNullAndNonEmpty(method)) {
+ if (ObjectHelper.isNotEmpty(method)) {
prevMethod = in.getHeader(METHOD_NAME, String.class);
in.setHeader(METHOD_NAME, method);
isExplicitMethod = true;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java?rev=725058&r1=725057&r2=725058&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java Wed Dec 10 03:51:12 2008
@@ -25,7 +25,7 @@
import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
import org.apache.camel.util.ObjectHelper;
-import static org.apache.camel.util.ObjectHelper.isNotNullAndNonEmpty;
+import static org.apache.camel.util.ObjectHelper.isNotEmpty;
/**
* The <a href="http://activemq.apache.org/camel/file.html">File Component</a>
@@ -69,7 +69,7 @@
// sort by using file language
String sortBy = getAndRemoveParameter(parameters, "sortBy", String.class);
- if (isNotNullAndNonEmpty(sortBy) && !isReferenceParameter(sortBy)) {
+ if (isNotEmpty(sortBy) && !isReferenceParameter(sortBy)) {
// we support nested sort groups so they should be chained
String[] groups = sortBy.split(";");
Iterator<String> it = ObjectHelper.createIterator(groups);
@@ -94,7 +94,7 @@
boolean ignoreCase = reminder.startsWith("ignoreCase:");
reminder = ignoreCase ? ifStartsWithReturnRemainder("ignoreCase:", reminder) : reminder;
- ObjectHelper.notEmpty(reminder, "sortBy expression");
+ ObjectHelper.notNull(reminder, "sortBy expression");
// recursive add nested sorters
return DefaultFileSorter.sortByFileLanguage(reminder, reverse, ignoreCase, createSortByComparator(it));
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileProducer.java?rev=725058&r1=725057&r2=725058&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileProducer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileProducer.java Wed Dec 10 03:51:12 2008
@@ -58,7 +58,7 @@
File target = createFileName(exchange);
// should we write to a temporary name and then afterwards rename to real target
- boolean writeAsTempAndRename = ObjectHelper.isNotNullAndNonEmpty(endpoint.getTempPrefix());
+ boolean writeAsTempAndRename = ObjectHelper.isNotEmpty(endpoint.getTempPrefix());
File tempTarget = null;
if (writeAsTempAndRename) {
tempTarget = createTempFileName(target);
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java?rev=725058&r1=725057&r2=725058&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java Wed Dec 10 03:51:12 2008
@@ -137,7 +137,7 @@
}
protected synchronized String getVersion() {
- if (ObjectHelper.isNotNullAndNonEmpty(version)) {
+ if (ObjectHelper.isNotEmpty(version)) {
return version;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java?rev=725058&r1=725057&r2=725058&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java Wed Dec 10 03:51:12 2008
@@ -83,7 +83,7 @@
private Expression createAbsoluteTimeDelayExpression(RouteContext routeContext) {
ExpressionType expr = getExpression();
if (expr != null) {
- if (ObjectHelper.isNotNullAndNonEmpty(expr.getExpression())
+ if (ObjectHelper.isNotEmpty(expr.getExpression())
|| expr.getExpressionValue() != null) {
return expr.createExpression(routeContext);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromType.java?rev=725058&r1=725057&r2=725058&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromType.java Wed Dec 10 03:51:12 2008
@@ -23,7 +23,6 @@
import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.ObjectHelper;
@@ -116,7 +115,7 @@
* Returns the endpoint URI or the name of the reference to it
*/
public Object getUriOrRef() {
- if (ObjectHelper.isNullOrBlank(uri)) {
+ if (ObjectHelper.isEmpty(uri)) {
return uri;
} else if (endpoint != null) {
return endpoint.getEndpointUri();
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java?rev=725058&r1=725057&r2=725058&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java Wed Dec 10 03:51:12 2008
@@ -68,7 +68,7 @@
@Override
public Processor createProcessor(RouteContext routeContext) throws Exception {
- ObjectHelper.notEmpty(headerName, "headerName");
+ ObjectHelper.notNull(headerName, "headerName");
Expression expr = getExpression().createExpression(routeContext);
return ProcessorBuilder.setHeader(getHeaderName(), expr);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java?rev=725058&r1=725057&r2=725058&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java Wed Dec 10 03:51:12 2008
@@ -130,7 +130,7 @@
* Returns the endpoint URI or the name of the reference to it
*/
public Object getUriOrRef() {
- if (ObjectHelper.isNullOrBlank(uri)) {
+ if (ObjectHelper.isEmpty(uri)) {
return uri;
} else if (endpoint != null) {
return endpoint.getEndpointUri();
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionType.java?rev=725058&r1=725057&r2=725058&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionType.java Wed Dec 10 03:51:12 2008
@@ -202,7 +202,7 @@
*/
public String getLabel() {
String language = getExpression();
- if (ObjectHelper.isNullOrBlank(language)) {
+ if (ObjectHelper.isEmpty(language)) {
Predicate predicate = getPredicate();
if (predicate != null) {
return predicate.toString();
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java?rev=725058&r1=725057&r2=725058&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java Wed Dec 10 03:51:12 2008
@@ -28,8 +28,8 @@
import org.apache.camel.spi.Language;
import org.apache.camel.spi.Registry;
-import static org.apache.camel.util.ObjectHelper.isNotNullAndNonEmpty;
-import static org.apache.camel.util.ObjectHelper.isNullOrBlank;
+import static org.apache.camel.util.ObjectHelper.isNotEmpty;
+import static org.apache.camel.util.ObjectHelper.isEmpty;
import static org.apache.camel.util.ObjectHelper.notNull;
/**
@@ -209,10 +209,10 @@
*/
public static Endpoint getEndpointInjection(CamelContext camelContext, String uri, String name, String injectionPointName, boolean mandatory) {
Endpoint endpoint = null;
- if (isNotNullAndNonEmpty(uri)) {
+ if (isNotEmpty(uri)) {
endpoint = camelContext.getEndpoint(uri);
} else {
- if (isNullOrBlank(name)) {
+ if (isEmpty(name)) {
name = injectionPointName;
}
if (mandatory) {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/MainSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/MainSupport.java?rev=725058&r1=725057&r2=725058&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/MainSupport.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/MainSupport.java Wed Dec 10 03:51:12 2008
@@ -360,7 +360,7 @@
}
protected void outputRoutesToFile() throws IOException, JAXBException {
- if (ObjectHelper.isNotNullAndNonEmpty(getRoutesOutputFile())) {
+ if (ObjectHelper.isNotEmpty(getRoutesOutputFile())) {
LOG.info("Generating routes as XML in the file named: " + getRoutesOutputFile());
ModelFileGenerator generator = createModelFileGenerator();
generator.marshalRoutesUsingJaxb(getRoutesOutputFile(), getRouteDefinitions());
@@ -371,7 +371,7 @@
protected void generateDot(String name, CamelContext camelContext, int size) throws IOException {
String outputDir = dotOutputDir;
- if (ObjectHelper.isNotNullAndNonEmpty(outputDir)) {
+ if (ObjectHelper.isNotEmpty(outputDir)) {
if (size > 1) {
outputDir += "/" + name;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java?rev=725058&r1=725057&r2=725058&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java Wed Dec 10 03:51:12 2008
@@ -156,23 +156,57 @@
return null;
}
+ /**
+ * Asserts whether the value is <b>not</b> <tt>null</tt> or an empty string.
+ *
+ * @param value the value to test
+ * @param name the key that resolved the value
+ */
public static void notNull(Object value, String name) {
- if (value == null) {
+ if (isEmpty(value)) {
throw new IllegalArgumentException(name + " must be specified");
}
}
+ /**
+ * Asserts whether the value is <b>not</b> <tt>null</tt> or an empty string.
+ *
+ * @param value the value to test
+ * @param on additional description to indicate where this problem occured (appended as toString())
+ * @param name the key that resolved the value
+ */
public static void notNull(Object value, String name, Object on) {
if (on == null) {
notNull(value, name);
- } else if (value == null) {
+ } else if (isEmpty(value)) {
throw new IllegalArgumentException(name + " must be specified on: " + on);
}
}
- public static void notEmpty(String value, String name) {
- if (isNullOrBlank(value)) {
- throw new IllegalArgumentException(name + " must be specified and not empty");
+ /**
+ * Tests whether the value is <tt>null</tt> or an empty string.
+ *
+ * @param value the value, if its a String it will be tested for text length as well
+ * @return true if empty
+ */
+ public static boolean isEmpty(Object value) {
+ return !isNotEmpty(value);
+ }
+
+ /**
+ * Tests whether the value is <b>not</b> <tt>null</tt> or an empty string.
+ *
+ * @param value the value, if its a String it will be tested for text length as well
+ * @return true if <b>not</b> empty
+ */
+ public static boolean isNotEmpty(Object value) {
+ if (value == null) {
+ return false;
+ } else if (value instanceof String) {
+ String text = (String) value;
+ return text.trim().length() > 0;
+ } else {
+ return true;
}
}
@@ -311,14 +345,6 @@
return false;
}
- public static boolean isNotNullAndNonEmpty(String text) {
- return text != null && text.trim().length() > 0;
- }
-
- public static boolean isNullOrBlank(String text) {
- return text == null || text.trim().length() <= 0;
- }
-
/**
* A helper method to access a system property, catching any security
* exceptions
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/ModelFileGenerator.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/ModelFileGenerator.java?rev=725058&r1=725057&r2=725058&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/ModelFileGenerator.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/ModelFileGenerator.java Wed Dec 10 03:51:12 2008
@@ -130,7 +130,7 @@
XmlRootElement annotation = (RoutesType.class).getAnnotation(XmlRootElement.class);
if (annotation != null) {
String elementName = annotation.name();
- if (ObjectHelper.isNotNullAndNonEmpty(elementName)) {
+ if (ObjectHelper.isNotEmpty(elementName)) {
return elementName;
}
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/NodeData.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/NodeData.java?rev=725058&r1=725057&r2=725058&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/NodeData.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/NodeData.java Wed Dec 10 03:51:12 2008
@@ -33,8 +33,8 @@
import org.apache.camel.model.ToType;
import org.apache.camel.model.WhenType;
-import static org.apache.camel.util.ObjectHelper.isNotNullAndNonEmpty;
-import static org.apache.camel.util.ObjectHelper.isNullOrBlank;
+import static org.apache.camel.util.ObjectHelper.isNotEmpty;
+import static org.apache.camel.util.ObjectHelper.isEmpty;
/**
* Represents a node in the EIP diagram tree
@@ -128,7 +128,7 @@
}
// lets auto-default as many values as we can
- if (isNullOrBlank(this.nodeType) && node != null) {
+ if (isEmpty(this.nodeType) && node != null) {
// TODO we could add this to the model?
String name = node.getClass().getName();
int idx = name.lastIndexOf('.');
@@ -141,24 +141,24 @@
this.nodeType = insertSpacesBetweenCamelCase(name);
}
if (this.label == null) {
- if (isNullOrBlank(this.image)) {
+ if (isEmpty(this.image)) {
this.label = this.nodeType;
this.shape = "box";
- } else if (isNotNullAndNonEmpty(this.edgeLabel)) {
+ } else if (isNotEmpty(this.edgeLabel)) {
this.label = "";
} else {
this.label = node.toString();
}
}
- if (isNullOrBlank(this.tooltop)) {
- if (isNotNullAndNonEmpty(this.nodeType)) {
- String description = isNotNullAndNonEmpty(this.edgeLabel) ? this.edgeLabel : this.label;
+ if (isEmpty(this.tooltop)) {
+ if (isNotEmpty(this.nodeType)) {
+ String description = isNotEmpty(this.edgeLabel) ? this.edgeLabel : this.label;
this.tooltop = this.nodeType + ": " + description;
} else {
this.tooltop = this.label;
}
}
- if (isNullOrBlank(this.url) && isNotNullAndNonEmpty(this.nodeType)) {
+ if (isEmpty(this.url) && isNotEmpty(this.nodeType)) {
this.url = "http://activemq.apache.org/camel/" + this.nodeType.toLowerCase().replace(' ', '-')
+ ".html";
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java?rev=725058&r1=725057&r2=725058&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java Wed Dec 10 03:51:12 2008
@@ -29,7 +29,7 @@
import org.apache.camel.model.RouteType;
import org.apache.camel.model.ToType;
-import static org.apache.camel.util.ObjectHelper.isNotNullAndNonEmpty;
+import static org.apache.camel.util.ObjectHelper.isNotEmpty;
/**
* A <a href="http://www.graphviz.org/">DOT</a> file creator plugin which
* creates a DOT file showing the current routes
@@ -118,7 +118,7 @@
writer.println(" [");
String label = fromData.edgeLabel;
- if (isNotNullAndNonEmpty(label)) {
+ if (isNotEmpty(label)) {
writer.println("label = \"" + label + "\"");
}
writer.println("];");
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/XmlGraphGenerator.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/XmlGraphGenerator.java?rev=725058&r1=725057&r2=725058&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/XmlGraphGenerator.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/XmlGraphGenerator.java Wed Dec 10 03:51:12 2008
@@ -25,7 +25,7 @@
import org.apache.camel.model.MulticastType;
import org.apache.camel.model.ProcessorType;
import org.apache.camel.model.RouteType;
-import static org.apache.camel.util.ObjectHelper.isNullOrBlank;
+import static org.apache.camel.util.ObjectHelper.isEmpty;
/**
* @version $Revision$
@@ -118,7 +118,7 @@
writer.print("\" toID=\"");
writer.print(encode(toData.id));
String association = toData.edgeLabel;
- if (isNullOrBlank(association)) {
+ if (isEmpty(association)) {
writer.print("\" association=\"");
writer.print(encode(association));
}
@@ -147,15 +147,15 @@
writer.print(encode(data.id));
writer.print("\" name=\"");
String name = data.label;
- if (isNullOrBlank(name)) {
+ if (isEmpty(name)) {
name = data.tooltop;
}
writer.print(encode(name));
writer.print("\" nodeType=\"");
String nodeType = data.image;
- if (isNullOrBlank(nodeType)) {
+ if (isEmpty(nodeType)) {
nodeType = data.shape;
- if (isNullOrBlank(nodeType)) {
+ if (isEmpty(nodeType)) {
nodeType = "node";
}
}
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ObjectHelperTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ObjectHelperTest.java?rev=725058&r1=725057&r2=725058&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ObjectHelperTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ObjectHelperTest.java Wed Dec 10 03:51:12 2008
@@ -25,6 +25,7 @@
* @version $Revision$
*/
public class ObjectHelperTest extends TestCase {
+
public void testArrayAsIterator() throws Exception {
String[] data = {"a", "b"};
@@ -38,4 +39,24 @@
assertFalse("should not have a next", iter.hasNext());
}
+ public void testIsEmpty() {
+ assertTrue(ObjectHelper.isEmpty(null));
+ assertTrue(ObjectHelper.isEmpty(""));
+ assertTrue(ObjectHelper.isEmpty(" "));
+ assertFalse(ObjectHelper.isEmpty("A"));
+ assertFalse(ObjectHelper.isEmpty(" A"));
+ assertFalse(ObjectHelper.isEmpty(" A "));
+ assertFalse(ObjectHelper.isEmpty(new Object()));
+ }
+
+ public void testIsNotEmpty() {
+ assertFalse(ObjectHelper.isNotEmpty(null));
+ assertFalse(ObjectHelper.isNotEmpty(""));
+ assertFalse(ObjectHelper.isNotEmpty(" "));
+ assertTrue(ObjectHelper.isNotEmpty("A"));
+ assertTrue(ObjectHelper.isNotEmpty(" A"));
+ assertTrue(ObjectHelper.isNotEmpty(" A "));
+ assertTrue(ObjectHelper.isNotEmpty(new Object()));
+ }
+
}
Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java?rev=725058&r1=725057&r2=725058&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java Wed Dec 10 03:51:12 2008
@@ -30,7 +30,7 @@
private static final String DEFAULT_CAMEL_CONTEXT_NAME = "camelContext";
private String getContextId(String contextId) {
- if (ObjectHelper.isNullOrBlank(contextId)) {
+ if (ObjectHelper.isEmpty(contextId)) {
//Set the contextId default value here
return DEFAULT_CAMEL_CONTEXT_NAME;
} else {
Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfEndpointUtils.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfEndpointUtils.java?rev=725058&r1=725057&r2=725058&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfEndpointUtils.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfEndpointUtils.java Wed Dec 10 03:51:12 2008
@@ -244,7 +244,7 @@
}
public static void checkServiceClassName(String className) throws CamelException {
- if (ObjectHelper.isNullOrBlank(className)) {
+ if (ObjectHelper.isEmpty(className)) {
throw new CamelException("serviceClass is required for CXF endpoint configuration");
}
}
Modified: activemq/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackComponent.java?rev=725058&r1=725057&r2=725058&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackComponent.java (original)
+++ activemq/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackComponent.java Wed Dec 10 03:51:12 2008
@@ -50,7 +50,7 @@
if (fixed) {
resource = resolveMandatoryResource(remaining);
} else {
- if (ObjectHelper.isNotNullAndNonEmpty(remaining)) {
+ if (ObjectHelper.isNotEmpty(remaining)) {
resource = getResourceLoader().getResource(remaining);
}
}
Modified: activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpOperationFailedException.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpOperationFailedException.java?rev=725058&r1=725057&r2=725058&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpOperationFailedException.java (original)
+++ activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpOperationFailedException.java Wed Dec 10 03:51:12 2008
@@ -48,7 +48,7 @@
}
public boolean hasRedirectLocation() {
- return ObjectHelper.isNotNullAndNonEmpty(redirectLocation);
+ return ObjectHelper.isNotEmpty(redirectLocation);
}
public String getRedirectLocation() {
Modified: activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java?rev=725058&r1=725057&r2=725058&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java Wed Dec 10 03:51:12 2008
@@ -191,7 +191,7 @@
// lets avoid folks having to explicitly give an ID to a camel
// context
- if (ObjectHelper.isNullOrBlank(contextId)) {
+ if (ObjectHelper.isEmpty(contextId)) {
contextId = "camelContext";
element.setAttribute("id", contextId);
}
@@ -225,7 +225,7 @@
} else if (localName.equals("endpoint")) {
BeanDefinition definition = endpointParser.parse(childElement, parserContext);
String id = childElement.getAttribute("id");
- if (ObjectHelper.isNotNullAndNonEmpty(id)) {
+ if (ObjectHelper.isNotEmpty(id)) {
// TODO we can zap this?
definition.getPropertyValues()
.addPropertyValue("camelContext", new RuntimeBeanReference(contextId));
@@ -238,7 +238,7 @@
if (parser != null) {
BeanDefinition definition = parser.parse(childElement, parserContext);
String id = childElement.getAttribute("id");
- if (ObjectHelper.isNotNullAndNonEmpty(id)) {
+ if (ObjectHelper.isNotEmpty(id)) {
parserContext.registerComponent(new BeanComponentDefinition(definition, id));
if (localName.equals("jmxAgent")) {
builder.addPropertyReference("camelJMXAgent", id);