You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ch...@apache.org on 2007/08/07 20:36:08 UTC
svn commit: r563607 [2/12] - in /activemq/camel/trunk/camel-core/src:
main/java/org/apache/camel/ main/java/org/apache/camel/builder/
main/java/org/apache/camel/builder/xml/
main/java/org/apache/camel/component/bean/
main/java/org/apache/camel/componen...
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchLanguageException.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchLanguageException.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchLanguageException.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchLanguageException.java Tue Aug 7 11:35:48 2007
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,15 +17,16 @@
package org.apache.camel;
/**
- * A runtime exception thrown if an attempt is made to resolve an unknown language definition.
- *
+ * A runtime exception thrown if an attempt is made to resolve an unknown
+ * language definition.
+ *
* @see org.apache.camel.CamelContext#resolveLanguage(String)
- *
+ *
* @version $Revision$
*/
public class NoSuchLanguageException extends RuntimeCamelException {
- private static final long serialVersionUID = -8721487431101572630L;
- private final String language;
+ private static final long serialVersionUID = -8721487431101572630L;
+ private final String language;
public NoSuchLanguageException(String language) {
super("No language could be found for: " + language);
@@ -36,4 +36,4 @@
public String getLanguage() {
return language;
}
-}
\ No newline at end of file
+}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchPropertyException.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchPropertyException.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchPropertyException.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchPropertyException.java Tue Aug 7 11:35:48 2007
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,22 +16,23 @@
*/
package org.apache.camel;
-import org.apache.camel.util.ExchangeHelper;
/**
- * An exception caused when a mandatory property is not available on a message {@link Exchange}
- *
+ * An exception caused when a mandatory property is not available on a message
+ * {@link Exchange}
+ *
* @see ExchangeHelper#getMandatoryProperty(Exchange, String, Class)
- *
+ *
* @version $Revision$
*/
public class NoSuchPropertyException extends CamelExchangeException {
- private static final long serialVersionUID = -8721487431101572630L;
+ private static final long serialVersionUID = -8721487431101572630L;
private final String propertyName;
private final Class<?> type;
public NoSuchPropertyException(Exchange exchange, String propertyName, Class<?> type) {
- super("No '"+ propertyName + "' property available of type: " + type.getName() + reason(exchange, propertyName), exchange);
+ super("No '" + propertyName + "' property available of type: " + type.getName()
+ + reason(exchange, propertyName), exchange);
this.propertyName = propertyName;
this.type = type;
}
@@ -56,4 +56,4 @@
}
return " but has value: " + value + " of type: " + value.getClass().getName();
}
-}
\ No newline at end of file
+}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java Tue Aug 7 11:35:48 2007
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,7 +18,7 @@
/**
* An exception thrown if a value could not be converted to the required type
- *
+ *
* @version $Revision$
*/
public class NoTypeConversionAvailableException extends RuntimeCamelException {
@@ -27,14 +26,15 @@
private final Class type;
public NoTypeConversionAvailableException(Object value, Class type) {
- super("No converter available to convert value: " + value + " to the required type: " + type.getName());
+ super("No converter available to convert value: " + value + " to the required type: "
+ + type.getName());
this.value = value;
this.type = type;
}
/**
* Returns the value which could not be converted
- *
+ *
* @return the value that could not be converted
*/
public Object getValue() {
@@ -43,7 +43,7 @@
/**
* Returns the required type
- *
+ *
* @return the required type
*/
public Class getType() {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/PollingConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/PollingConsumer.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/PollingConsumer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/PollingConsumer.java Tue Aug 7 11:35:48 2007
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,37 +17,40 @@
package org.apache.camel;
/**
- * Represents a <a href="http://activemq.apache.org/camel/polling-consumer.html">Polling Consumer</a> where the caller
- * polls for messages when it is ready.
+ * Represents a <a
+ * href="http://activemq.apache.org/camel/polling-consumer.html">Polling
+ * Consumer</a> where the caller polls for messages when it is ready.
*
* @version $Revision: 1.1 $
*/
public interface PollingConsumer<E extends Exchange> extends Consumer<E> {
-
+
/**
- * Waits until a message is available and then returns it. Warning that this method
- * could block indefinitely if no messages are available.
- *
+ * Waits until a message is available and then returns it. Warning that this
+ * method could block indefinitely if no messages are available.
+ *
* @return the message exchange received.
*/
E receive();
/**
- * Attempts to receive a message exchange immediately without waiting
- * and returning null if a message exchange is not available yet.
- *
- * @return the message exchange if one is immediately available otherwise null
+ * Attempts to receive a message exchange immediately without waiting and
+ * returning null if a message exchange is not available yet.
+ *
+ * @return the message exchange if one is immediately available otherwise
+ * null
*/
E receiveNoWait();
/**
- * Attempts to receive a message exchange, waiting up to the given timeout to expire
- * if a message is not yet available
- *
- * @param timeout the amount of time in milliseconds to wait for a message before timing out and
- * returning null
- *
- * @return the message exchange if one iwas available within the timeout period, or null if the timeout expired
+ * Attempts to receive a message exchange, waiting up to the given timeout
+ * to expire if a message is not yet available
+ *
+ * @param timeout the amount of time in milliseconds to wait for a message
+ * before timing out and returning null
+ *
+ * @return the message exchange if one iwas available within the timeout
+ * period, or null if the timeout expired
*/
E receive(long timeout);
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Predicate.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Predicate.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Predicate.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Predicate.java Tue Aug 7 11:35:48 2007
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -17,31 +17,32 @@
package org.apache.camel;
/**
- * Evaluates a binary <a href="http://activemq.apache.org/camel/predicate.html">predicate</a>
- * on the message exchange to support things like
- * <a href="http://activemq.apache.org/camel/scripting-languages.html">scripting languages</a>,
- * <a href="http://activemq.apache.org/camel/xquery.html">XQuery</a>
- * or <a href="http://activemq.apache.org/camel/sql.html">SQL</a> as well
- * as any arbitrary Java expression.
- *
+ * Evaluates a binary <a
+ * href="http://activemq.apache.org/camel/predicate.html">predicate</a> on the
+ * message exchange to support things like <a
+ * href="http://activemq.apache.org/camel/scripting-languages.html">scripting
+ * languages</a>, <a href="http://activemq.apache.org/camel/xquery.html">XQuery</a>
+ * or <a href="http://activemq.apache.org/camel/sql.html">SQL</a> as well as
+ * any arbitrary Java expression.
+ *
* @version $Revision$
*/
public interface Predicate<E> {
/**
- * Evaluates the predicate on the message exchange and returns true
- * if this exchange matches the predicate
- *
+ * Evaluates the predicate on the message exchange and returns true if this
+ * exchange matches the predicate
+ *
* @param exchange the message exchange
* @return true if the predicate matches
*/
boolean matches(E exchange);
/**
- * Allows this predicate to be used nicely in testing to generate
- * a nicely formatted exception and message if this predicate does not
- * match for the given exchange.
- *
+ * Allows this predicate to be used nicely in testing to generate a nicely
+ * formatted exception and message if this predicate does not match for the
+ * given exchange.
+ *
* @param text the description to use in the exception message
* @param exchange the exchange to evaluate the expression on
* @throws AssertionError if the predicate does not match
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Processor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Processor.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Processor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Processor.java Tue Aug 7 11:35:48 2007
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -17,12 +17,13 @@
package org.apache.camel;
/**
- * A <a href="http://activemq.apache.org/camel/processor.html">processor</a>
- * is used to implement the
- * <a href="http://activemq.apache.org/camel/event-driven-consumer.html">Event Driven Consumer</a>
- * and <a href="http://activemq.apache.org/camel/message-transformer.html">Message Transformer</a>
- * patterns and to process message exchanges.
- *
+ * A <a href="http://activemq.apache.org/camel/processor.html">processor</a> is
+ * used to implement the <a
+ * href="http://activemq.apache.org/camel/event-driven-consumer.html">Event
+ * Driven Consumer</a> and <a
+ * href="http://activemq.apache.org/camel/message-transformer.html">Message
+ * Transformer</a> patterns and to process message exchanges.
+ *
* @version $Revision$
*/
public interface Processor {
@@ -30,7 +31,7 @@
/**
* Processes the message exchange
*
- * @throws Exception if an internal processing error has occurred.
+ * @throws Exception if an internal processing error has occurred.
*/
void process(Exchange exchange) throws Exception;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Producer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Producer.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Producer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Producer.java Tue Aug 7 11:35:48 2007
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,8 +17,9 @@
package org.apache.camel;
/**
- * Provides a channel on which clients can create and invoke message exchanges on an {@link Endpoint}
- *
+ * Provides a channel on which clients can create and invoke message exchanges
+ * on an {@link Endpoint}
+ *
* @version $Revision$
*/
public interface Producer<E extends Exchange> extends Processor, Service {
@@ -28,14 +28,14 @@
/**
* Creates a new exchange to send to this endpoint
- *
+ *
* @return a newly created exchange
*/
E createExchange();
/**
- * Creates a new exchange for communicating with this exchange using the given exchange to pre-populate the values
- * of the headers and messages
+ * Creates a new exchange for communicating with this exchange using the
+ * given exchange to pre-populate the values of the headers and messages
*/
E createExchange(E exchange);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ProducerTemplate.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ProducerTemplate.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ProducerTemplate.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ProducerTemplate.java Tue Aug 7 11:35:48 2007
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -23,104 +23,105 @@
*/
public interface ProducerTemplate<E extends Exchange> extends Service {
-
/**
* Sends the exchange to the default endpoint
- *
+ *
* @param exchange the exchange to send
*/
E send(E exchange);
/**
- * Sends an exchange to the default endpoint
- * using a supplied @{link Processor} to populate the exchange
- *
+ * Sends an exchange to the default endpoint using a supplied
+ *
+ * @{link Processor} to populate the exchange
+ *
* @param processor the transformer used to populate the new exchange
*/
E send(Processor processor);
-
/**
* Sends the body to the default endpoint and returns the result content
- *
+ *
* @param body the body to send
* @return the returned message body
*/
Object sendBody(Object body);
-
/**
- * Sends the body to the default endpoint with a specified header and header value
- *
- * @param body the payload send
- * @param header the header name
+ * Sends the body to the default endpoint with a specified header and header
+ * value
+ *
+ * @param body the payload send
+ * @param header the header name
* @param headerValue the header value
* @return the result
*/
Object sendBodyAndHeader(Object body, String header, Object headerValue);
/**
- * Sends the body to the default endpoint with the specified headers and header values
- *
- * @param body the payload send
+ * Sends the body to the default endpoint with the specified headers and
+ * header values
+ *
+ * @param body the payload send
* @return the result
*/
Object sendBodyAndHeaders(Object body, Map<String, Object> headers);
-
-
// Allow sending to arbitrary endpoints
- //-----------------------------------------------------------------------
+ // -----------------------------------------------------------------------
/**
* Sends the exchange to the given endpoint
- *
+ *
* @param endpointUri the endpoint URI to send the exchange to
- * @param exchange the exchange to send
+ * @param exchange the exchange to send
*/
E send(String endpointUri, E exchange);
/**
- * Sends an exchange to an endpoint using a supplied @{link Processor} to populate the exchange
- *
+ * Sends an exchange to an endpoint using a supplied
+ *
+ * @{link Processor} to populate the exchange
+ *
* @param endpointUri the endpoint URI to send the exchange to
- * @param processor the transformer used to populate the new exchange
+ * @param processor the transformer used to populate the new exchange
*/
E send(String endpointUri, Processor processor);
/**
* Sends the exchange to the given endpoint
- *
+ *
* @param endpoint the endpoint to send the exchange to
* @param exchange the exchange to send
*/
E send(Endpoint<E> endpoint, E exchange);
/**
- * Sends an exchange to an endpoint using a supplied @{link Processor} to populate the exchange
- *
- * @param endpoint the endpoint to send the exchange to
+ * Sends an exchange to an endpoint using a supplied
+ *
+ * @{link Processor} to populate the exchange
+ *
+ * @param endpoint the endpoint to send the exchange to
* @param processor the transformer used to populate the new exchange
*/
E send(Endpoint<E> endpoint, Processor processor);
/**
* Send the body to an endpoint
- *
+ *
* @param endpoint
- * @param body = the payload
+ * @param body = the payload
* @return the result
*/
Object sendBody(Endpoint<E> endpoint, Object body);
/**
* Send the body to an endpoint
- *
+ *
* @param endpointUri
- * @param body = the payload
+ * @param body = the payload
* @return the result
*/
Object sendBody(String endpointUri, Object body);
-
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Property.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Property.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Property.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Property.java Tue Aug 7 11:35:48 2007
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,18 +16,18 @@
*/
package org.apache.camel;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
/**
* Marks a parameter as being a property on an {@link Exchange}
- *
+ *
* @version $Revision: 523756 $
*/
@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER})
+@Target({ElementType.PARAMETER })
public @interface Property {
String name();
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ResolveEndpointFailedException.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ResolveEndpointFailedException.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ResolveEndpointFailedException.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ResolveEndpointFailedException.java Tue Aug 7 11:35:48 2007
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Route.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Route.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Route.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Route.java Tue Aug 7 11:35:48 2007
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RuntimeCamelException.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RuntimeCamelException.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RuntimeCamelException.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RuntimeCamelException.java Tue Aug 7 11:35:48 2007
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -20,9 +20,9 @@
* @version $Revision$
*/
public class RuntimeCamelException extends RuntimeException {
- private static final long serialVersionUID = 8046489554418284257L;
+ private static final long serialVersionUID = 8046489554418284257L;
- public RuntimeCamelException() {
+ public RuntimeCamelException() {
}
public RuntimeCamelException(String message) {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RuntimeExpressionException.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RuntimeExpressionException.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RuntimeExpressionException.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RuntimeExpressionException.java Tue Aug 7 11:35:48 2007
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -24,7 +23,7 @@
*/
public class RuntimeExpressionException extends RuntimeCamelException {
- private static final long serialVersionUID = -8417806626073055262L;
+ private static final long serialVersionUID = -8417806626073055262L;
public RuntimeExpressionException(String message) {
super(message);
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RuntimeTransformException.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RuntimeTransformException.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RuntimeTransformException.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RuntimeTransformException.java Tue Aug 7 11:35:48 2007
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -24,7 +23,7 @@
*/
public class RuntimeTransformException extends RuntimeCamelException {
- private static final long serialVersionUID = -8417806626073055262L;
+ private static final long serialVersionUID = -8417806626073055262L;
public RuntimeTransformException(String message) {
super(message);
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Service.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Service.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Service.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Service.java Tue Aug 7 11:35:48 2007
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,21 +18,21 @@
/**
* Represents the core lifecycle API for POJOs which can be started and stopped
- *
+ *
* @version $Revision$
*/
public interface Service {
/**
* Starts the service
- *
+ *
* @throws Exception
*/
void start() throws Exception;
/**
* Stops the service
- *
+ *
* @throws Exception
*/
void stop() throws Exception;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/TypeConverter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/TypeConverter.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/TypeConverter.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/TypeConverter.java Tue Aug 7 11:35:48 2007
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,15 +17,17 @@
package org.apache.camel;
/**
- * A pluggable strategy to be able to convert objects
- * <a href="http://activemq.apache.org/camel/type-converter.html">to different types</a>
- * such as to and from String, InputStream/OutputStream, Reader/Writer, Document, byte[], ByteBuffer etc
- *
+ * A pluggable strategy to be able to convert objects <a
+ * href="http://activemq.apache.org/camel/type-converter.html">to different
+ * types</a> such as to and from String, InputStream/OutputStream,
+ * Reader/Writer, Document, byte[], ByteBuffer etc
+ *
* @version $Revision$
*/
public interface TypeConverter {
/**
* Converts the value to the specified type
+ *
* @param type the requested type
* @param value the value to be converted
* @return the converted value or null if it can not be converted
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ValidationException.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ValidationException.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ValidationException.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ValidationException.java Tue Aug 7 11:35:48 2007
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -18,10 +18,10 @@
/**
* The base class for any validation exception, such as
- * {@link org.apache.camel.processor.validation.SchemaValidationException}
- * so that it is easy to treat all validation errors in a similar way
- * irrespective of the particular validation technology used.
- *
+ * {@link org.apache.camel.processor.validation.SchemaValidationException} so
+ * that it is easy to treat all validation errors in a similar way irrespective
+ * of the particular validation technology used.
+ *
* @version $Revision: $
*/
public class ValidationException extends CamelExchangeException {
@@ -30,4 +30,4 @@
super(message, exchange);
}
-}
\ No newline at end of file
+}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/Builder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/Builder.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/Builder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/Builder.java Tue Aug 7 11:35:48 2007
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,14 +20,20 @@
import org.apache.camel.Expression;
/**
- * A helper class for including portions of the
- * <a href="http://activemq.apache.org/camel/expression.html">expression</a> and
- * <a href="http://activemq.apache.org/camel/predicate.html">predicate</a>
- * <a href="http://activemq.apache.org/camel/dsl.html">Java DSL</a>
- *
+ * A helper class for including portions of the <a
+ * href="http://activemq.apache.org/camel/expression.html">expression</a> and
+ * <a href="http://activemq.apache.org/camel/predicate.html">predicate</a> <a
+ * href="http://activemq.apache.org/camel/dsl.html">Java DSL</a>
+ *
* @version $Revision: 1.1 $
*/
public class Builder {
+
+ /**
+ * Utility classes should not have a public constructor.
+ */
+ private Builder() {
+ }
/**
* Returns a constant expression
@@ -55,15 +60,17 @@
}
/**
- * Returns a predicate and value builder for the inbound message body as a specific type
+ * Returns a predicate and value builder for the inbound message body as a
+ * specific type
*/
public static <E extends Exchange, T> ValueBuilder<E> bodyAs(Class<T> type) {
- Expression<E> expression = ExpressionBuilder.<E, T>bodyExpression(type);
+ Expression<E> expression = ExpressionBuilder.<E, T> bodyExpression(type);
return new ValueBuilder<E>(expression);
}
/**
- * Returns a predicate and value builder for the outbound body on an exchange
+ * Returns a predicate and value builder for the outbound body on an
+ * exchange
*/
public static <E extends Exchange> ValueBuilder<E> outBody() {
Expression<E> expression = ExpressionBuilder.bodyExpression();
@@ -71,14 +78,14 @@
}
/**
- * Returns a predicate and value builder for the outbound message body as a specific type
+ * Returns a predicate and value builder for the outbound message body as a
+ * specific type
*/
public static <E extends Exchange, T> ValueBuilder<E> outBody(Class<T> type) {
- Expression<E> expression = ExpressionBuilder.<E, T>bodyExpression(type);
+ Expression<E> expression = ExpressionBuilder.<E, T> bodyExpression(type);
return new ValueBuilder<E>(expression);
}
-
/**
* Returns an expression for the given system property
*/
@@ -89,7 +96,8 @@
/**
* Returns an expression for the given system property
*/
- public static <E extends Exchange> ValueBuilder<E> systemProperty(final String name, final String defaultValue) {
- return new ValueBuilder<E>(ExpressionBuilder.<E>systemProperty(name, defaultValue));
+ public static <E extends Exchange> ValueBuilder<E> systemProperty(final String name,
+ final String defaultValue) {
+ return new ValueBuilder<E>(ExpressionBuilder.<E> systemProperty(name, defaultValue));
}
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java Tue Aug 7 11:35:48 2007
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -16,6 +16,9 @@
*/
package org.apache.camel.builder;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.NoSuchEndpointException;
@@ -24,13 +27,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import java.util.ArrayList;
-import java.util.List;
-
/**
- * Base class for implementation inheritance for different clauses in the
- * <a href="http://activemq.apache.org/camel/dsl.html">Java DSL</a>
- *
+ * Base class for implementation inheritance for different clauses in the <a
+ * href="http://activemq.apache.org/camel/dsl.html">Java DSL</a>
+ *
* @version $Revision: $
*/
public abstract class BuilderSupport {
@@ -51,7 +51,7 @@
}
// Builder methods
- //-------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
/**
* Returns a value builder for the given header
@@ -68,21 +68,24 @@
}
/**
- * Returns a predicate and value builder for the inbound message body as a specific type
+ * Returns a predicate and value builder for the inbound message body as a
+ * specific type
*/
public <T> ValueBuilder bodyAs(Class<T> type) {
return Builder.bodyAs(type);
}
/**
- * Returns a predicate and value builder for the outbound body on an exchange
+ * Returns a predicate and value builder for the outbound body on an
+ * exchange
*/
public ValueBuilder outBody() {
return Builder.outBody();
}
/**
- * Returns a predicate and value builder for the outbound message body as a specific type
+ * Returns a predicate and value builder for the outbound message body as a
+ * specific type
*/
public <T> ValueBuilder outBody(Class<T> type) {
return Builder.outBody(type);
@@ -104,7 +107,7 @@
/**
* Resolves the given URI to an endpoint
- *
+ *
* @throws NoSuchEndpointException if the endpoint URI could not be resolved
*/
public Endpoint endpoint(String uri) throws NoSuchEndpointException {
@@ -120,7 +123,7 @@
/**
* Resolves the list of URIs into a list of {@link Endpoint} instances
- *
+ *
* @throws NoSuchEndpointException if an endpoint URI could not be resolved
*/
public List<Endpoint> endpoints(String... uris) throws NoSuchEndpointException {
@@ -190,7 +193,7 @@
}
// Properties
- //-------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
public CamelContext getContext() {
return context;
}
@@ -209,8 +212,7 @@
protected ErrorHandlerBuilder createErrorHandlerBuilder() {
if (isInheritErrorHandler()) {
return new DeadLetterChannelBuilder();
- }
- else {
+ } else {
return new NoErrorHandlerBuilder();
}
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ConstantProcessorBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ConstantProcessorBuilder.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ConstantProcessorBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ConstantProcessorBuilder.java Tue Aug 7 11:35:48 2007
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java Tue Aug 7 11:35:48 2007
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -28,8 +27,10 @@
import org.apache.commons.logging.LogFactory;
/**
- * A builder of a <a href="http://activemq.apache.org/camel/dead-letter-channel.html">Dead Letter Channel</a>
- *
+ * A builder of a <a
+ * href="http://activemq.apache.org/camel/dead-letter-channel.html">Dead Letter
+ * Channel</a>
+ *
* @version $Revision$
*/
public class DeadLetterChannelBuilder implements ErrorHandlerBuilder {
@@ -63,7 +64,7 @@
}
// Builder methods
- //-------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
public DeadLetterChannelBuilder backOffMultiplier(double backOffMultiplier) {
getRedeliveryPolicy().backOffMultiplier(backOffMultiplier);
return this;
@@ -133,7 +134,7 @@
}
// Properties
- //-------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
public RedeliveryPolicy getRedeliveryPolicy() {
return redeliveryPolicy;
}
@@ -179,14 +180,16 @@
public Expression getDefaultDeadLetterEndpointExpression() {
if (defaultDeadLetterEndpointExpression == null) {
- defaultDeadLetterEndpointExpression = ExpressionBuilder.constantExpression(getDefaultDeadLetterEndpointUri());
+ defaultDeadLetterEndpointExpression = ExpressionBuilder
+ .constantExpression(getDefaultDeadLetterEndpointUri());
}
return defaultDeadLetterEndpointExpression;
}
/**
- * Sets the expression used to decide the dead letter channel endpoint for an exchange
- * if no factory is provided via {@link #setDeadLetterFactory(ProcessorFactory)}
+ * Sets the expression used to decide the dead letter channel endpoint for
+ * an exchange if no factory is provided via
+ * {@link #setDeadLetterFactory(ProcessorFactory)}
*/
public void setDefaultDeadLetterEndpointExpression(Expression defaultDeadLetterEndpointExpression) {
this.defaultDeadLetterEndpointExpression = defaultDeadLetterEndpointExpression;
@@ -197,10 +200,12 @@
}
/**
- * Sets the default dead letter endpoint URI used if no factory is provided via {@link #setDeadLetterFactory(ProcessorFactory)}
- * and no expression is provided via {@link #setDefaultDeadLetterEndpointExpression(Expression)}
- *
- * @param defaultDeadLetterEndpointUri the default URI if no deadletter factory or expression is provided
+ * Sets the default dead letter endpoint URI used if no factory is provided
+ * via {@link #setDeadLetterFactory(ProcessorFactory)} and no expression is
+ * provided via {@link #setDefaultDeadLetterEndpointExpression(Expression)}
+ *
+ * @param defaultDeadLetterEndpointUri the default URI if no deadletter
+ * factory or expression is provided
*/
public void setDefaultDeadLetterEndpointUri(String defaultDeadLetterEndpointUri) {
this.defaultDeadLetterEndpointUri = defaultDeadLetterEndpointUri;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java Tue Aug 7 11:35:48 2007
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java Tue Aug 7 11:35:48 2007
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -16,15 +16,15 @@
*/
package org.apache.camel.builder;
-import org.apache.camel.Exchange;
-import org.apache.camel.Expression;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.StringTokenizer;
import java.util.regex.Pattern;
+import org.apache.camel.Exchange;
+import org.apache.camel.Expression;
+
/**
* @version $Revision: $
*/
@@ -32,8 +32,14 @@
/**
+ * Utility classes should not have a public constructor.
+ */
+ private ExpressionBuilder() {
+ }
+
+ /**
* Returns an expression for the header value with the given name
- *
+ *
* @param headerName the name of the header the expression will return
* @return an expression object which will return the header value
*/
@@ -48,7 +54,6 @@
return header;
}
-
@Override
public String toString() {
return "header(" + headerName + ")";
@@ -58,7 +63,7 @@
/**
* Returns an expression for the out header value with the given name
- *
+ *
* @param headerName the name of the header the expression will return
* @return an expression object which will return the header value
*/
@@ -73,7 +78,6 @@
return header;
}
-
@Override
public String toString() {
return "outHeader(" + headerName + ")";
@@ -83,7 +87,7 @@
/**
* Returns an expression for the property value with the given name
- *
+ *
* @param propertyName the name of the property the expression will return
* @return an expression object which will return the property value
*/
@@ -102,8 +106,9 @@
/**
* Returns an expression for a system property value with the given name
- *
- * @param propertyName the name of the system property the expression will return
+ *
+ * @param propertyName the name of the system property the expression will
+ * return
* @return an expression object which will return the system property value
*/
public static <E extends Exchange> Expression<E> systemPropertyExpression(final String propertyName) {
@@ -112,11 +117,13 @@
/**
* Returns an expression for a system property value with the given name
- *
- * @param propertyName the name of the system property the expression will return
+ *
+ * @param propertyName the name of the system property the expression will
+ * return
* @return an expression object which will return the system property value
*/
- public static <E extends Exchange> Expression<E> systemPropertyExpression(final String propertyName, final String defaultValue) {
+ public static <E extends Exchange> Expression<E> systemPropertyExpression(final String propertyName,
+ final String defaultValue) {
return new Expression<E>() {
public Object evaluate(E exchange) {
return System.getProperty(propertyName, defaultValue);
@@ -131,7 +138,7 @@
/**
* Returns an expression for the contant value
- *
+ *
* @param value the value the expression will return
* @return an expression object which will return the constant value
*/
@@ -164,9 +171,9 @@
};
}
-
/**
- * Returns the expression for the exchanges inbound message body converted to the given type
+ * Returns the expression for the exchanges inbound message body converted
+ * to the given type
*/
public static <E extends Exchange, T> Expression<E> bodyExpression(final Class<T> type) {
return new Expression<E>() {
@@ -230,7 +237,8 @@
}
/**
- * Returns an expression which converts the given expression to the given type
+ * Returns an expression which converts the given expression to the given
+ * type
*/
public static <E extends Exchange> Expression<E> convertTo(final Expression expression, final Class type) {
return new Expression<E>() {
@@ -247,9 +255,11 @@
}
/**
- * Returns a tokenize expression which will tokenize the string with the given token
+ * Returns a tokenize expression which will tokenize the string with the
+ * given token
*/
- public static <E extends Exchange> Expression<E> tokenizeExpression(final Expression<E> expression, final String token) {
+ public static <E extends Exchange> Expression<E> tokenizeExpression(final Expression<E> expression,
+ final String token) {
return new Expression<E>() {
public Object evaluate(E exchange) {
String text = evaluateStringExpression(expression, exchange);
@@ -272,9 +282,11 @@
}
/**
- * Returns a tokenize expression which will tokenize the string with the given regex
+ * Returns a tokenize expression which will tokenize the string with the
+ * given regex
*/
- public static <E extends Exchange> Expression<E> regexTokenize(final Expression<E> expression, String regexTokenizer) {
+ public static <E extends Exchange> Expression<E> regexTokenize(final Expression<E> expression,
+ String regexTokenizer) {
final Pattern pattern = Pattern.compile(regexTokenizer);
return new Expression<E>() {
public Object evaluate(E exchange) {
@@ -293,9 +305,11 @@
}
/**
- * Transforms the expression into a String then performs the regex replaceAll to transform the String and return the result
+ * Transforms the expression into a String then performs the regex
+ * replaceAll to transform the String and return the result
*/
- public static <E extends Exchange> Expression<E> regexReplaceAll(final Expression<E> expression, String regex, final String replacement) {
+ public static <E extends Exchange> Expression<E> regexReplaceAll(final Expression<E> expression,
+ String regex, final String replacement) {
final Pattern pattern = Pattern.compile(regex);
return new Expression<E>() {
public Object evaluate(E exchange) {
@@ -314,15 +328,17 @@
}
/**
- * Transforms the expression into a String then performs the regex replaceAll to transform the String and return the result
+ * Transforms the expression into a String then performs the regex
+ * replaceAll to transform the String and return the result
*/
- public static <E extends Exchange> Expression<E> regexReplaceAll(final Expression<E> expression, String regex, final Expression<E> replacementExpression) {
+ public static <E extends Exchange> Expression<E> regexReplaceAll(final Expression<E> expression,
+ String regex,
+ final Expression<E> replacementExpression) {
final Pattern pattern = Pattern.compile(regex);
return new Expression<E>() {
public Object evaluate(E exchange) {
String text = evaluateStringExpression(expression, exchange);
String replacement = evaluateStringExpression(replacementExpression, exchange);
- ;
if (text == null || replacement == null) {
return null;
}
@@ -336,11 +352,11 @@
};
}
-
/**
* Appends the String evaluations of the two expressions together
*/
- public static <E extends Exchange> Expression<E> append(final Expression<E> left, final Expression<E> right) {
+ public static <E extends Exchange> Expression<E> append(final Expression<E> left,
+ final Expression<E> right) {
return new Expression<E>() {
public Object evaluate(E exchange) {
return evaluateStringExpression(left, exchange) + evaluateStringExpression(right, exchange);
@@ -354,11 +370,13 @@
}
/**
- * Evaluates the expression on the given exchange and returns the String representation
- *
+ * Evaluates the expression on the given exchange and returns the String
+ * representation
+ *
* @param expression the expression to evaluate
- * @param exchange the exchange to use to evaluate the expression
- * @return the String representation of the expression or null if it could not be evaluated
+ * @param exchange the exchange to use to evaluate the expression
+ * @return the String representation of the expression or null if it could
+ * not be evaluated
*/
public static <E extends Exchange> String evaluateStringExpression(Expression<E> expression, E exchange) {
Object value = expression.evaluate(exchange);
@@ -375,7 +393,8 @@
/**
* Returns an expression for the given system property
*/
- public static <E extends Exchange> Expression<E> systemProperty(final String name, final String defaultValue) {
+ public static <E extends Exchange> Expression<E> systemProperty(final String name,
+ final String defaultValue) {
return new Expression<E>() {
public Object evaluate(E exchange) {
return System.getProperty(name, defaultValue);
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java Tue Aug 7 11:35:48 2007
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java Tue Aug 7 11:35:48 2007
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java Tue Aug 7 11:35:48 2007
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -16,26 +16,33 @@
*/
package org.apache.camel.builder;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Predicate;
import org.apache.camel.impl.BinaryPredicateSupport;
import org.apache.camel.impl.PredicateSupport;
import org.apache.camel.util.ObjectHelper;
+
import static org.apache.camel.util.ObjectHelper.compare;
import static org.apache.camel.util.ObjectHelper.notNull;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
/**
* A helper class for working with predicates
- *
+ *
* @version $Revision: 520261 $
*/
public class PredicateBuilder {
/**
+ * Utility classes should not have a public constructor.
+ */
+ private PredicateBuilder() {
+ }
+
+ /**
* Converts the given expression into an {@link Predicate}
*/
public static <E extends Exchange> Predicate<E> toPredicate(final Expression<E> expression) {
@@ -53,12 +60,12 @@
}
/**
- * Evaluate the value as a predicate which attempts to convert the value to a boolean
- * otherwise true is returned if the value is not null
+ * Evaluate the value as a predicate which attempts to convert the value to
+ * a boolean otherwise true is returned if the value is not null
*/
public static boolean evaluateValuePredicate(Object value) {
if (value instanceof Boolean) {
- Boolean aBoolean = (Boolean) value;
+ Boolean aBoolean = (Boolean)value;
return aBoolean.booleanValue();
}
return value != null;
@@ -100,7 +107,8 @@
};
}
- public static <E extends Exchange> Predicate<E> isEqualTo(final Expression<E> left, final Expression<E> right) {
+ public static <E extends Exchange> Predicate<E> isEqualTo(final Expression<E> left,
+ final Expression<E> right) {
return new BinaryPredicateSupport<E>(left, right) {
protected boolean matches(E exchange, Object leftValue, Object rightValue) {
@@ -113,7 +121,8 @@
};
}
- public static <E extends Exchange> Predicate<E> isNotEqualTo(final Expression<E> left, final Expression<E> right) {
+ public static <E extends Exchange> Predicate<E> isNotEqualTo(final Expression<E> left,
+ final Expression<E> right) {
return new BinaryPredicateSupport<E>(left, right) {
protected boolean matches(E exchange, Object leftValue, Object rightValue) {
@@ -126,7 +135,8 @@
};
}
- public static <E extends Exchange> Predicate<E> isLessThan(final Expression<E> left, final Expression<E> right) {
+ public static <E extends Exchange> Predicate<E> isLessThan(final Expression<E> left,
+ final Expression<E> right) {
return new BinaryPredicateSupport<E>(left, right) {
protected boolean matches(E exchange, Object leftValue, Object rightValue) {
@@ -139,7 +149,8 @@
};
}
- public static <E extends Exchange> Predicate<E> isLessThanOrEqualTo(final Expression<E> left, final Expression<E> right) {
+ public static <E extends Exchange> Predicate<E> isLessThanOrEqualTo(final Expression<E> left,
+ final Expression<E> right) {
return new BinaryPredicateSupport<E>(left, right) {
protected boolean matches(E exchange, Object leftValue, Object rightValue) {
@@ -152,7 +163,8 @@
};
}
- public static <E extends Exchange> Predicate<E> isGreaterThan(final Expression<E> left, final Expression<E> right) {
+ public static <E extends Exchange> Predicate<E> isGreaterThan(final Expression<E> left,
+ final Expression<E> right) {
return new BinaryPredicateSupport<E>(left, right) {
protected boolean matches(E exchange, Object leftValue, Object rightValue) {
@@ -165,7 +177,8 @@
};
}
- public static <E extends Exchange> Predicate<E> isGreaterThanOrEqualTo(final Expression<E> left, final Expression<E> right) {
+ public static <E extends Exchange> Predicate<E> isGreaterThanOrEqualTo(final Expression<E> left,
+ final Expression<E> right) {
return new BinaryPredicateSupport<E>(left, right) {
protected boolean matches(E exchange, Object leftValue, Object rightValue) {
@@ -178,7 +191,8 @@
};
}
- public static <E extends Exchange> Predicate<E> contains(final Expression<E> left, final Expression<E> right) {
+ public static <E extends Exchange> Predicate<E> contains(final Expression<E> left,
+ final Expression<E> right) {
return new BinaryPredicateSupport<E>(left, right) {
protected boolean matches(E exchange, Object leftValue, Object rightValue) {
@@ -192,14 +206,15 @@
}
public static <E extends Exchange> Predicate<E> isNull(final Expression<E> expression) {
- return isEqualTo(expression, ExpressionBuilder.<E>constantExpression(null));
+ return isEqualTo(expression, ExpressionBuilder.<E> constantExpression(null));
}
public static <E extends Exchange> Predicate<E> isNotNull(final Expression<E> expression) {
- return isNotEqualTo(expression, ExpressionBuilder.<E>constantExpression(null));
+ return isNotEqualTo(expression, ExpressionBuilder.<E> constantExpression(null));
}
- public static <E extends Exchange> Predicate<E> isInstanceOf(final Expression<E> expression, final Class type) {
+ public static <E extends Exchange> Predicate<E> isInstanceOf(final Expression<E> expression,
+ final Class type) {
notNull(expression, "expression");
notNull(type, "type");
@@ -216,17 +231,18 @@
@Override
protected String assertionFailureMessage(E exchange) {
- return super.assertionFailureMessage(exchange) + " for <" + expression.evaluate(exchange) + ">";
+ return super.assertionFailureMessage(exchange) + " for <" + expression.evaluate(exchange)
+ + ">";
}
};
}
-
/**
- * Returns a predicate which is true if the expression matches the given regular expression
- *
+ * Returns a predicate which is true if the expression matches the given
+ * regular expression
+ *
* @param expression the expression to evaluate
- * @param regex the regular expression to match against
+ * @param regex the regular expression to match against
* @return a new predicate
*/
public static <E extends Exchange> Predicate<E> regex(final Expression<E> expression, final String regex) {
@@ -234,13 +250,15 @@
}
/**
- * Returns a predicate which is true if the expression matches the given regular expression
- *
+ * Returns a predicate which is true if the expression matches the given
+ * regular expression
+ *
* @param expression the expression to evaluate
- * @param pattern the regular expression to match against
+ * @param pattern the regular expression to match against
* @return a new predicate
*/
- public static <E extends Exchange> Predicate<E> regex(final Expression<E> expression, final Pattern pattern) {
+ public static <E extends Exchange> Predicate<E> regex(final Expression<E> expression,
+ final Pattern pattern) {
notNull(expression, "expression");
notNull(pattern, "pattern");
@@ -261,7 +279,8 @@
@Override
protected String assertionFailureMessage(E exchange) {
- return super.assertionFailureMessage(exchange) + " for <" + expression.evaluate(exchange) + ">";
+ return super.assertionFailureMessage(exchange) + " for <" + expression.evaluate(exchange)
+ + ">";
}
};
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateFactory.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateFactory.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateFactory.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateFactory.java Tue Aug 7 11:35:48 2007
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -32,5 +31,5 @@
*
* @return the newly created expression object
*/
- public Predicate<E> createPredicate();
+ Predicate<E> createPredicate();
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorBuilder.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorBuilder.java Tue Aug 7 11:35:48 2007
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -27,6 +26,12 @@
* @version $Revision: 1.1 $
*/
public class ProcessorBuilder {
+
+ /**
+ * Utility classes should not have a public constructor.
+ */
+ private ProcessorBuilder() {
+ }
/**
* Creates a processor which sets the body of the IN message to the value of the expression
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorFactory.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorFactory.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorFactory.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorFactory.java Tue Aug 7 11:35:48 2007
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -25,6 +25,6 @@
*/
public interface ProcessorFactory {
- public Processor createProcessor() throws Exception;
+ Processor createProcessor() throws Exception;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java Tue Aug 7 11:35:48 2007
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -16,22 +16,24 @@
*/
package org.apache.camel.builder;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.Route;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.model.RoutesType;
import org.apache.camel.model.RouteType;
+import org.apache.camel.model.RoutesType;
import org.apache.camel.processor.DelegateProcessor;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
-
/**
- * A <a href="http://activemq.apache.org/camel/dsl.html">Java DSL</a>
- * which is used to build {@link Route} instances in a @{link CamelContext} for smart routing.
- *
+ * A <a href="http://activemq.apache.org/camel/dsl.html">Java DSL</a> which is
+ * used to build {@link Route} instances in a
+ *
+ * @{link CamelContext} for smart routing.
+ *
* @version $Revision$
*/
public abstract class RouteBuilder extends BuilderSupport {
@@ -52,20 +54,19 @@
*/
public abstract void configure() throws Exception;
-
public RouteType from(String uri) {
return routeCollection.from(uri);
}
-
public RouteType from(Endpoint endpoint) {
return routeCollection.from(endpoint);
}
/**
* Installs the given error handler builder
- *
- * @param errorHandlerBuilder the error handler to be used by default for all child routes
+ *
+ * @param errorHandlerBuilder the error handler to be used by default for
+ * all child routes
* @return the current builder with the error handler configured
*/
public RouteBuilder errorHandler(ErrorHandlerBuilder errorHandlerBuilder) {
@@ -74,9 +75,11 @@
}
/**
- * Configures whether or not the error handler is inherited by every processing node (or just the top most one)
- *
- * @param value the flag as to whether error handlers should be inherited or not
+ * Configures whether or not the error handler is inherited by every
+ * processing node (or just the top most one)
+ *
+ * @param value the flag as to whether error handlers should be inherited or
+ * not
* @return the current builder
*/
public RouteBuilder inheritErrorHandler(boolean value) {
@@ -90,7 +93,7 @@
}
// Properties
- //-----------------------------------------------------------------------
+ // -----------------------------------------------------------------------
public CamelContext getContext() {
CamelContext context = super.getContext();
if (context == null) {
@@ -108,9 +111,8 @@
return routes;
}
-
// Implementation methods
- //-----------------------------------------------------------------------
+ // -----------------------------------------------------------------------
protected void checkInitialized() throws Exception {
if (initalized.compareAndSet(false, true)) {
configure();
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java?view=diff&rev=563607&r1=563606&r2=563607
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java Tue Aug 7 11:35:48 2007
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -22,7 +22,7 @@
/**
* A builder of expressions or predicates based on values.
- *
+ *
* @version $Revision: $
*/
public class ValueBuilder<E extends Exchange> implements Expression<E> {
@@ -46,70 +46,62 @@
}
// Predicate builders
- //-------------------------------------------------------------------------
-
+ // -------------------------------------------------------------------------
public Predicate<E> isNotEqualTo(Object value) {
Expression<E> right = asExpression(value);
return onNewPredicate(PredicateBuilder.isNotEqualTo(expression, right));
}
-
public Predicate<E> isEqualTo(Object value) {
Expression<E> right = asExpression(value);
return onNewPredicate(PredicateBuilder.isEqualTo(expression, right));
}
-
public Predicate<E> isLessThan(Object value) {
Expression<E> right = asExpression(value);
return onNewPredicate(PredicateBuilder.isLessThan(expression, right));
}
-
public Predicate<E> isLessThanOrEqualTo(Object value) {
Expression<E> right = asExpression(value);
return onNewPredicate(PredicateBuilder.isLessThanOrEqualTo(expression, right));
}
-
public Predicate<E> isGreaterThan(Object value) {
Expression<E> right = asExpression(value);
return onNewPredicate(PredicateBuilder.isGreaterThan(expression, right));
}
-
public Predicate<E> isGreaterThanOrEqualTo(Object value) {
Expression<E> right = asExpression(value);
return onNewPredicate(PredicateBuilder.isGreaterThanOrEqualTo(expression, right));
}
-
public Predicate<E> isInstanceOf(Class type) {
return onNewPredicate(PredicateBuilder.isInstanceOf(expression, type));
}
-
public Predicate<E> matchesRegex(String regex) {
return onNewPredicate(PredicateBuilder.regex(expression, regex));
}
-
public Predicate<E> isNull() {
return onNewPredicate(PredicateBuilder.isNull(expression));
}
-
public Predicate<E> isNotNull() {
return onNewPredicate(PredicateBuilder.isNotNull(expression));
}
/**
- * Create a predicate that the left hand expression contains the value of the right hand expression
- *
- * @param value the element which is compared to be contained within this expression
- * @return a predicate which evaluates to true if the given value expression is contained within this
- * expression value
+ * Create a predicate that the left hand expression contains the value of
+ * the right hand expression
+ *
+ * @param value the element which is compared to be contained within this
+ * expression
+ * @return a predicate which evaluates to true if the given value expression
+ * is contained within this expression value
*/
public Predicate<E> contains(Object value) {
@@ -117,12 +109,13 @@
return onNewPredicate(PredicateBuilder.contains(expression, right));
}
-
/**
- * Creates a predicate which is true if this expression matches the given regular expression
- *
+ * Creates a predicate which is true if this expression matches the given
+ * regular expression
+ *
* @param regex the regular expression to match
- * @return a predicate which evaluates to true if the expression matches the regex
+ * @return a predicate which evaluates to true if the expression matches the
+ * regex
*/
public Predicate<E> regex(String regex) {
@@ -130,21 +123,20 @@
}
// Expression builders
- //-------------------------------------------------------------------------
-
+ // -------------------------------------------------------------------------
public ValueBuilder<E> tokenize() {
return tokenize("\n");
}
-
public ValueBuilder<E> tokenize(String token) {
Expression<E> newExp = ExpressionBuilder.tokenizeExpression(expression, token);
return new ValueBuilder<E>(newExp);
}
/**
- * Tokenizes the string conversion of this expression using the given regular expression
+ * Tokenizes the string conversion of this expression using the given
+ * regular expression
*/
public ValueBuilder<E> regexTokenize(String regex) {
@@ -153,7 +145,8 @@
}
/**
- * Replaces all occurrencies of the regular expression with the given replacement
+ * Replaces all occurrencies of the regular expression with the given
+ * replacement
*/
public ValueBuilder<E> regexReplaceAll(String regex, String replacement) {
@@ -162,7 +155,8 @@
}
/**
- * Replaces all occurrencies of the regular expression with the given replacement
+ * Replaces all occurrencies of the regular expression with the given
+ * replacement
*/
public ValueBuilder<E> regexReplaceAll(String regex, Expression<E> replacement) {
@@ -170,10 +164,10 @@
return new ValueBuilder<E>(newExp);
}
-
/**
- * Converts the current value to the given type using the registered type converters
- *
+ * Converts the current value to the given type using the registered type
+ * converters
+ *
* @param type the type to convert the value to
* @return the current builder
*/
@@ -185,7 +179,7 @@
/**
* Converts the current value a String using the registered type converters
- *
+ *
* @return the current builder
*/
@@ -195,7 +189,7 @@
/**
* Appends the string evaluation of this expression with the given value
- *
+ *
* @param value the value or expression to append
* @return the current builder
*/
@@ -205,11 +199,11 @@
}
// Implementation methods
- //-------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
/**
- * A stategy method to allow derived classes to deal with the newly created predicate
- * in different ways
+ * A stategy method to allow derived classes to deal with the newly created
+ * predicate in different ways
*/
protected Predicate<E> onNewPredicate(Predicate<E> predicate) {
return predicate;
@@ -217,9 +211,8 @@
protected Expression<E> asExpression(Object value) {
if (value instanceof Expression) {
- return (Expression<E>) value;
- }
- else {
+ return (Expression<E>)value;
+ } else {
return ExpressionBuilder.constantExpression(value);
}
}