You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by si...@apache.org on 2012/07/18 22:31:58 UTC
svn commit: r1363100 - in
/commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2:
Catalog.java CatalogFactory.java Chain.java ChainException.java
Command.java Context.java Filter.java
Author: simonetripodi
Date: Wed Jul 18 20:31:57 2012
New Revision: 1363100
URL: http://svn.apache.org/viewvc?rev=1363100&view=rev
Log:
just dropped empty lines, no functional modifications
Modified:
commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/Catalog.java
commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/CatalogFactory.java
commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/Chain.java
commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/ChainException.java
commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/Command.java
commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/Context.java
commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/Filter.java
Modified: commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/Catalog.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/Catalog.java?rev=1363100&r1=1363099&r2=1363100&view=diff
==============================================================================
--- commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/Catalog.java (original)
+++ commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/Catalog.java Wed Jul 18 20:31:57 2012
@@ -16,11 +16,9 @@
*/
package org.apache.commons.chain2;
-
import java.util.Iterator;
import java.util.Map;
-
/**
* <p>A {@link Catalog} is a collection of named {@link Command}s (or
* {@link Chain}s) that can be used to retrieve the set of commands that
@@ -35,17 +33,14 @@ import java.util.Map;
* @author Craig R. McClanahan
* @version $Revision$ $Date$
*/
-
public interface Catalog<K, V, C extends Map<K, V>> {
-
/**
* <p>A default context attribute for storing a default {@link Catalog},
* provided as a convenience only.</p>
*/
String CATALOG_KEY = "org.apache.commons.chain2.CATALOG";
-
/**
* <p>Add a new name and associated {@link Command} or {@link Chain}
* to the set of named commands known to this {@link Catalog},
@@ -57,7 +52,6 @@ public interface Catalog<K, V, C extends
*/
void addCommand(String name, Command<K, V, C> command);
-
/**
* <p>Return the {@link Command} or {@link Chain} associated with the
* specified name, if any; otherwise, return <code>null</code>.</p>
@@ -68,8 +62,6 @@ public interface Catalog<K, V, C extends
*/
Command<K, V, C> getCommand(String name);
-
-
/**
* <p>Return an <code>Iterator</code> over the set of named commands
* known to this {@link Catalog}. If there are no known commands,
@@ -78,6 +70,4 @@ public interface Catalog<K, V, C extends
*/
Iterator<String> getNames();
-
}
-
Modified: commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/CatalogFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/CatalogFactory.java?rev=1363100&r1=1363099&r2=1363100&view=diff
==============================================================================
--- commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/CatalogFactory.java (original)
+++ commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/CatalogFactory.java Wed Jul 18 20:31:57 2012
@@ -41,10 +41,8 @@ import java.util.Map;
* @author Sean Schofield
* @version $Revision$ $Date$
*/
-
public abstract class CatalogFactory<K, V, C extends Map<K, V>> {
-
/**
* <p>Values passed to the <code>getCommand(String)</code> method should
* use this as the delimiter between the "catalog" name and the "command"
@@ -52,10 +50,8 @@ public abstract class CatalogFactory<K,
*/
public static final String DELIMITER = ":";
-
// --------------------------------------------------------- Public Methods
-
/**
* <p>Gets the default instance of Catalog associated with the factory
* (if any); otherwise, return <code>null</code>.</p>
@@ -64,7 +60,6 @@ public abstract class CatalogFactory<K,
*/
public abstract Catalog<K, V, C> getCatalog();
-
/**
* <p>Sets the default instance of Catalog associated with the factory.</p>
*
@@ -72,7 +67,6 @@ public abstract class CatalogFactory<K,
*/
public abstract void setCatalog(Catalog<K, V, C> catalog);
-
/**
* <p>Retrieves a Catalog instance by name (if any); otherwise
* return <code>null</code>.</p>
@@ -82,7 +76,6 @@ public abstract class CatalogFactory<K,
*/
public abstract Catalog<K, V, C> getCatalog(String name);
-
/**
* <p>Adds a named instance of Catalog to the factory (for subsequent
* retrieval later).</p>
@@ -92,7 +85,6 @@ public abstract class CatalogFactory<K,
*/
public abstract void addCatalog(String name, Catalog<K, V, C> catalog);
-
/**
* <p>Return an <code>Iterator</code> over the set of named
* {@link Catalog}s known to this {@link CatalogFactory}.
@@ -101,7 +93,6 @@ public abstract class CatalogFactory<K,
*/
public abstract Iterator<String> getNames();
-
/**
* <p>Return a <code>Command</code> based on the given commandID.</p>
*
@@ -127,7 +118,6 @@ public abstract class CatalogFactory<K,
* @since Chain 1.1
*/
public Command<K, V, C> getCommand(String commandID) {
-
String commandName = commandID;
String catalogName = null;
Catalog<K, V, C> catalog = null;
@@ -162,13 +152,10 @@ public abstract class CatalogFactory<K,
}
return catalog.getCommand(commandName);
-
}
-
// ------------------------------------------------------- Static Variables
-
/**
* <p>The set of registered {@link CatalogFactory} instances,
* keyed by the relevant class loader.</p>
@@ -176,10 +163,8 @@ public abstract class CatalogFactory<K,
private static final Map<ClassLoader, CatalogFactory<?, ?, ? extends Map<?, ?>>> factories =
new HashMap<ClassLoader, CatalogFactory<?, ?, ? extends Map<?, ?>>>();
-
// -------------------------------------------------------- Static Methods
-
/**
* <p>Return the singleton {@link CatalogFactory} instance
* for the relevant <code>ClassLoader</code>. For applications
@@ -194,7 +179,6 @@ public abstract class CatalogFactory<K,
* @return the per-application singleton instance of {@link CatalogFactory}
*/
public static <K, V, C extends Map<K, V>> CatalogFactory<K, V, C> getInstance() {
-
CatalogFactory<?, ?, ? extends Map<?, ?>> factory = null;
ClassLoader cl = getClassLoader();
synchronized (factories) {
@@ -213,7 +197,6 @@ public abstract class CatalogFactory<K,
return result;
}
-
/**
* <p>Clear all references to registered catalogs, as well as to the
* relevant class loader. This method should be called, for example,
@@ -221,30 +204,24 @@ public abstract class CatalogFactory<K,
* service, to allow for garbage collection.</p>
*/
public static void clear() {
-
synchronized (factories) {
factories.remove(getClassLoader());
}
-
}
-
// ------------------------------------------------------- Private Methods
-
/**
* <p>Return the relevant <code>ClassLoader</code> to use as a Map key
* for this request. If there is a thread context class loader, return
* that; otherwise, return the class loader that loaded this class.</p>
*/
private static ClassLoader getClassLoader() {
-
ClassLoader cl = Thread.currentThread().getContextClassLoader();
if (cl == null) {
cl = CatalogFactory.class.getClassLoader();
}
return cl;
-
}
}
Modified: commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/Chain.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/Chain.java?rev=1363100&r1=1363099&r2=1363100&view=diff
==============================================================================
--- commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/Chain.java (original)
+++ commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/Chain.java Wed Jul 18 20:31:57 2012
@@ -18,7 +18,6 @@ package org.apache.commons.chain2;
import java.util.Map;
-
/**
* <p>A {@link Chain} represents a configured list of
* {@link Command}s that will be executed in order to perform processing
@@ -56,10 +55,8 @@ import java.util.Map;
* @author Craig R. McClanahan
* @version $Revision$ $Date$
*/
-
public interface Chain<K, V, C extends Map<K, V>> extends Command<K, V, C> {
-
/**
* <p>Add a {@link Command} to the list of {@link Command}s that will
* be called in turn when this {@link Chain}'s <code>execute()</code>
@@ -76,7 +73,6 @@ public interface Chain<K, V, C extends M
*/
void addCommand(Command<K, V, C> command);
-
/**
* <p>Execute the processing represented by this {@link Chain} according
* to the following algorithm.</p>
@@ -117,5 +113,4 @@ public interface Chain<K, V, C extends M
*/
boolean execute(C context);
-
}
Modified: commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/ChainException.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/ChainException.java?rev=1363100&r1=1363099&r2=1363100&view=diff
==============================================================================
--- commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/ChainException.java (original)
+++ commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/ChainException.java Wed Jul 18 20:31:57 2012
@@ -27,6 +27,7 @@ import java.util.Map;
* @since 2.0
*/
public class ChainException extends RuntimeException {
+
/**
*
*/
@@ -102,4 +103,5 @@ public class ChainException extends Runt
public Command<?, ?, ?> getFailedCommand() {
return failedCommand;
}
+
}
Modified: commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/Command.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/Command.java?rev=1363100&r1=1363099&r2=1363100&view=diff
==============================================================================
--- commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/Command.java (original)
+++ commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/Command.java Wed Jul 18 20:31:57 2012
@@ -18,7 +18,6 @@ package org.apache.commons.chain2;
import java.util.Map;
-
/**
* <p>A {@link Command} encapsulates a unit of processing work to be
* performed, whose purpose is to examine and/or modify the state of a
@@ -82,8 +81,8 @@ import java.util.Map;
* @author Craig R. McClanahan
* @version $Revision$ $Date$
*/
-
public interface Command<K, V, C extends Map<K, V>> {
+
/**
* <p>Commands should return <code>CONTINUE_PROCESSING</code> if the processing
* of the given {@link Context} should be delegated to a subsequent
Modified: commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/Context.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/Context.java?rev=1363100&r1=1363099&r2=1363100&view=diff
==============================================================================
--- commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/Context.java (original)
+++ commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/Context.java Wed Jul 18 20:31:57 2012
@@ -16,10 +16,8 @@
*/
package org.apache.commons.chain2;
-
import java.util.Map;
-
/**
* <p>A {@link Context} represents the state information that is
* accessed and manipulated by the execution of a {@link Command} or a
@@ -61,7 +59,6 @@ import java.util.Map;
* @author Craig R. McClanahan
* @version $Revision$ $Date$
*/
-
public interface Context<K, V> extends Map<K, V> {
/**
Modified: commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/Filter.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/Filter.java?rev=1363100&r1=1363099&r2=1363100&view=diff
==============================================================================
--- commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/Filter.java (original)
+++ commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/Filter.java Wed Jul 18 20:31:57 2012
@@ -18,7 +18,6 @@ package org.apache.commons.chain2;
import java.util.Map;
-
/**
* <p>A {@link Filter} is a specialized {@link Command} that also expects
* the {@link Chain} that is executing it to call the
@@ -46,10 +45,8 @@ import java.util.Map;
* @author Craig R. McClanahan
* @version $Revision$ $Date$
*/
-
public interface Filter<K, V, C extends Map<K, V>> extends Command<K, V, C> {
-
/**
* <p>Execute any cleanup activities, such as releasing resources that
* were acquired during the <code>execute()</code> method of this
@@ -70,5 +67,4 @@ public interface Filter<K, V, C extends
*/
boolean postprocess(C context, Exception exception);
-
}