DNA SVN: r346 - in trunk: dna-repository/src/main/java/org/jboss/dna/repository/federation and 3 other directories.
by dna-commits＠lists.jboss.org
Author: rhauch
Date: 2008-07-09 10:57:28 -0400 (Wed, 09 Jul 2008)
New Revision: 346
Modified:
trunk/dna-repository/src/main/java/org/jboss/dna/repository/RepositoryI18n.java
trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederatedRepository.java
trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederatedRepositoryConfig.java
trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederatedRepositoryConnection.java
trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederationService.java
trunk/dna-repository/src/main/resources/org/jboss/dna/repository/RepositoryI18n.properties
trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederatedRepositoryConnectionTest.java
trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederationServiceTest.java
trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/executor/AbstractCommandExecutor.java
trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/executor/CommandExecutor.java
Log:
DNA-115 - Create federation service
http://jira.jboss.com/jira/browse/DNA-115
Updated the federation service, federated repository and federated repository configuration with more implementation and testing.
Modified: trunk/dna-repository/src/main/java/org/jboss/dna/repository/RepositoryI18n.java
===================================================================
--- trunk/dna-repository/src/main/java/org/jboss/dna/repository/RepositoryI18n.java 2008-07-09 14:54:59 UTC (rev 345)
+++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/RepositoryI18n.java 2008-07-09 14:57:28 UTC (rev 346)
@@ -121,6 +121,7 @@
public static I18n canceledSequencingXmlDocument;
public static I18n warningSequencingXmlDocument;
+ // Federation
public static I18n interruptedWhileConnectingToFederationConfigurationRepository;
public static I18n interruptedWhileUsingFederationConfigurationRepository;
public static I18n interruptedWhileClosingConnectionToFederationConfigurationRepository;
@@ -131,6 +132,7 @@
public static I18n unableToAuthenticateConnectionToFederatedRepository;
public static I18n repositoryHasBeenShutDown;
public static I18n repositoryPathInFederationBindingIsNotAbsolute;
+ public static I18n errorReadingMergePlan;
static {
try {
Modified: trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederatedRepository.java
===================================================================
--- trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederatedRepository.java 2008-07-09 14:54:59 UTC (rev 345)
+++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederatedRepository.java 2008-07-09 14:57:28 UTC (rev 346)
@@ -30,8 +30,10 @@
import net.jcip.annotations.ThreadSafe;
import org.jboss.dna.common.util.ArgCheck;
import org.jboss.dna.repository.RepositoryI18n;
+import org.jboss.dna.repository.federation.impl.FederatingCommandExecutor;
import org.jboss.dna.repository.services.AbstractServiceAdministrator;
import org.jboss.dna.repository.services.ServiceAdministrator;
+import org.jboss.dna.spi.graph.commands.executor.CommandExecutor;
import org.jboss.dna.spi.graph.connection.ExecutionEnvironment;
import org.jboss.dna.spi.graph.connection.RepositoryConnection;
import org.jboss.dna.spi.graph.connection.RepositoryConnectionFactories;
@@ -100,7 +102,7 @@
private final ExecutionEnvironment env;
private final RepositoryConnectionFactories connectionFactories;
private FederatedRepositoryConfig config;
- private final AtomicInteger openConnections = new AtomicInteger(0);
+ private final AtomicInteger openExecutors = new AtomicInteger(0);
private final CountDownLatch shutdownLatch = new CountDownLatch(1);
private final AtomicBoolean shutdownRequested = new AtomicBoolean(false);
private final CopyOnWriteArrayList<RepositorySourceListener> listeners = new CopyOnWriteArrayList<RepositorySourceListener>();
@@ -170,7 +172,7 @@
*/
protected synchronized void shutdownRepository() {
this.shutdownRequested.set(true);
- if (this.openConnections.get() <= 0) shutdownLatch.countDown();
+ if (this.openExecutors.get() <= 0) shutdownLatch.countDown();
}
/**
@@ -194,7 +196,7 @@
* @return true if terminated, or false otherwise
*/
protected boolean isTerminated() {
- return this.openConnections.get() != 0;
+ return this.openExecutors.get() != 0;
}
/**
@@ -273,22 +275,36 @@
}
/**
- * Called by {@link FederatedRepositoryConnection#FederatedRepositoryConnection(FederatedRepository, String)
- * FederatedRepositoryConnection constructor}.
+ * Called by
+ * {@link FederatedRepositoryConnection#execute(ExecutionEnvironment, org.jboss.dna.spi.graph.commands.GraphCommand...)}.
*
- * @param federatedRepositoryConnection
+ * @param env the execution environment in which the executor will be run; may not be null
+ * @param sourceName the name of the {@link RepositorySource} that is making use of this executor; may not be null or empty
+ * @return the executor
*/
- /*package*/void register( FederatedRepositoryConnection federatedRepositoryConnection ) {
- openConnections.incrementAndGet();
+ protected CommandExecutor getExecutor( ExecutionEnvironment env,
+ String sourceName ) {
+ FederatedRepositoryConfig config = this.getConfiguration();
+ return new FederatingCommandExecutor(env, sourceName, config.getCacheRegion(), config.getRegions(),
+ getConnectionFactories());
}
/**
+ * Called by {@link FederatedRepositoryConnection#FederatedRepositoryConnection(FederatedRepository, String)}.
+ *
+ * @param connection the connection being opened
+ */
+ /*package*/void register( FederatedRepositoryConnection connection ) {
+ openExecutors.incrementAndGet();
+ }
+
+ /**
* Called by {@link FederatedRepositoryConnection#close()}.
*
- * @param federatedRepositoryConnection
+ * @param connection the connection being closed
*/
- /*package*/void unregister( FederatedRepositoryConnection federatedRepositoryConnection ) {
- if (openConnections.decrementAndGet() <= 0 && shutdownRequested.get()) {
+ /*package*/void unregister( FederatedRepositoryConnection connection ) {
+ if (openExecutors.decrementAndGet() <= 0 && shutdownRequested.get()) {
// Last connection, so turn out the lights ...
shutdownLatch.countDown();
}
Modified: trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederatedRepositoryConfig.java
===================================================================
--- trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederatedRepositoryConfig.java 2008-07-09 14:54:59 UTC (rev 345)
+++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederatedRepositoryConfig.java 2008-07-09 14:57:28 UTC (rev 346)
@@ -41,6 +41,7 @@
@Immutable
public class FederatedRepositoryConfig {
+ private final FederatedRegion cacheRegion;
private final List<FederatedRegion> regions;
private final Problems problems;
private final String name;
@@ -50,20 +51,27 @@
* Create a federated repository instance, as managed by the supplied {@link FederationService}.
*
* @param repositoryName the name of the repository
+ * @param cacheRegion the region used for the cache; may not be null
* @param regions the federated regions; may not be null
* @param defaultCachePolicy the default cache policy for this repository; may be null
* @throws IllegalArgumentException if the name is null or is blank
*/
public FederatedRepositoryConfig( String repositoryName,
+ FederatedRegion cacheRegion,
Iterable<FederatedRegion> regions,
CachePolicy defaultCachePolicy ) {
ArgCheck.isNotEmpty(repositoryName, "repositoryName");
+ ArgCheck.isNotNull(cacheRegion, "cacheRegion");
this.name = repositoryName;
this.problems = new ThreadSafeProblems();
this.defaultCachePolicy = defaultCachePolicy;
+ this.cacheRegion = cacheRegion;
List<FederatedRegion> regionList = new ArrayList<FederatedRegion>();
for (FederatedRegion region : regions) {
- if (region != null && !regionList.contains(region)) regionList.add(region);
+ if (region == null) continue;
+ if (!regionList.contains(region)) {
+ regionList.add(region);
+ }
}
this.regions = Collections.unmodifiableList(regionList);
ArgCheck.isNotEmpty(this.regions, "regions");
@@ -89,6 +97,16 @@
}
/**
+ * Get the region that defines the cache for this repository. This region does not exist in the {@link #getRegions() list of
+ * source regions}.
+ *
+ * @return the region used for caching; never null
+ */
+ public FederatedRegion getCacheRegion() {
+ return cacheRegion;
+ }
+
+ /**
* Return the unmodifiable list of bindings.
*
* @return the bindings
Modified: trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederatedRepositoryConnection.java
===================================================================
--- trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederatedRepositoryConnection.java 2008-07-09 14:54:59 UTC (rev 345)
+++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederatedRepositoryConnection.java 2008-07-09 14:57:28 UTC (rev 346)
@@ -27,8 +27,8 @@
import net.jcip.annotations.ThreadSafe;
import org.jboss.dna.repository.RepositoryI18n;
import org.jboss.dna.spi.cache.CachePolicy;
-import org.jboss.dna.spi.graph.commands.CompositeCommand;
import org.jboss.dna.spi.graph.commands.GraphCommand;
+import org.jboss.dna.spi.graph.commands.executor.CommandExecutor;
import org.jboss.dna.spi.graph.connection.ExecutionEnvironment;
import org.jboss.dna.spi.graph.connection.RepositoryConnection;
import org.jboss.dna.spi.graph.connection.RepositorySourceException;
@@ -113,31 +113,19 @@
* {@inheritDoc}
*/
public void execute( ExecutionEnvironment env,
- GraphCommand... commands ) throws RepositorySourceException {
+ GraphCommand... commands ) throws RepositorySourceException, InterruptedException {
if (!this.repository.getAdministrator().isStarted()) {
throw new RepositorySourceException(RepositoryI18n.repositoryHasBeenShutDown.text(this.repository.getName()));
}
if (commands == null || commands.length == 0) return;
- FederatedRepositoryConfig config = this.repository.getConfiguration();
+ CommandExecutor executor = this.repository.getExecutor(env, sourceName);
+ assert executor != null;
for (GraphCommand command : commands) {
- if (command == null) continue;
- executeCommand(env, command, config);
+ executor.execute(command);
}
}
- protected void executeCommand( ExecutionEnvironment env,
- GraphCommand command,
- FederatedRepositoryConfig config ) {
- if (command instanceof CompositeCommand) {
- CompositeCommand composite = (CompositeCommand)command;
- for (GraphCommand nestedCommand : composite) {
- if (nestedCommand == null) continue;
- executeCommand(env, nestedCommand, config);
- }
- }
- }
-
/**
* {@inheritDoc}
*/
Modified: trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederationService.java
===================================================================
--- trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederationService.java 2008-07-09 14:54:59 UTC (rev 345)
+++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederationService.java 2008-07-09 14:57:28 UTC (rev 346)
@@ -400,15 +400,25 @@
// Get the repository node ...
BasicGetNodeCommand getRepository = new BasicGetNodeCommand(repositoryNode);
+ // Add a command to get the region defining the cache ...
+ Path pathToCacheRegion = pathFactory.create(repositoryNode, nameFactory.create("dna:cache"));
+ BasicGetNodeCommand getCacheRegion = new BasicGetNodeCommand(pathToCacheRegion);
+
// Get the regions for the repository ...
Path regionsNode = pathFactory.create(repositoryNode, nameFactory.create("dna:regions"));
BasicGetChildrenCommand getRegions = new BasicGetChildrenCommand(regionsNode);
- configurationConnection.execute(env, getRepository, getRegions);
+ configurationConnection.execute(env, getRepository, getCacheRegion, getRegions);
if (getRepository.hasError()) {
throw new FederationException(RepositoryI18n.federatedRepositoryCannotBeFound.text(repositoryName));
}
+ if (getCacheRegion.hasError()) {
+ I18n msg = RepositoryI18n.requiredNodeDoesNotExistRelativeToNode;
+ throw new FederationException(msg.text("dna:regions", configurationRoot));
+ }
+ FederatedRegion cacheRegion = createRegion(getCacheRegion.getPath(), getCacheRegion.getProperties(), problems);
+
// Build the commands to get each of the region branches ...
List<FederatedRegion> regions = new LinkedList<FederatedRegion>();
if (getRegions.hasNoError() && !getRegions.getChildren().isEmpty()) {
@@ -417,6 +427,7 @@
final Path pathToSource = pathFactory.create(regionsNode, child);
commands.add(new BasicGetNodeCommand(pathToSource));
}
+ // Now execute these commands ...
configurationConnection.execute(env, commands);
// Iterate over each region node obtained ...
@@ -442,7 +453,7 @@
cachePolicy.setTimeToExpire(longFactory.create(timeToExpireProperty.getValues().next()));
}
CachePolicy defaultCachePolicy = cachePolicy.isEmpty() ? null : cachePolicy.getUnmodifiable();
- return new FederatedRepositoryConfig(repositoryName, regions, defaultCachePolicy);
+ return new FederatedRepositoryConfig(repositoryName, cacheRegion, regions, defaultCachePolicy);
} catch (InvalidPathException err) {
I18n msg = RepositoryI18n.federatedRepositoryCannotBeFound;
throw new FederationException(msg.text(repositoryName));
Modified: trunk/dna-repository/src/main/resources/org/jboss/dna/repository/RepositoryI18n.properties
===================================================================
--- trunk/dna-repository/src/main/resources/org/jboss/dna/repository/RepositoryI18n.properties 2008-07-09 14:54:59 UTC (rev 345)
+++ trunk/dna-repository/src/main/resources/org/jboss/dna/repository/RepositoryI18n.properties 2008-07-09 14:57:28 UTC (rev 346)
@@ -111,3 +111,4 @@
unableToAuthenticateConnectionToFederatedRepository = Unable to authenticate "{1}" for repository "{0}"
repositoryHasBeenShutDown = The "{0}" repository has been shut down and may no longer be used.
repositoryPathInFederationBindingIsNotAbsolute = The repository path in a federation binding must be absolute, but was "{0}"
+errorReadingMergePlan = Error while reading merge plan for {0}
\ No newline at end of file
Modified: trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederatedRepositoryConnectionTest.java
===================================================================
--- trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederatedRepositoryConnectionTest.java 2008-07-09 14:54:59 UTC (rev 345)
+++ trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederatedRepositoryConnectionTest.java 2008-07-09 14:57:28 UTC (rev 346)
@@ -31,6 +31,7 @@
import java.util.concurrent.TimeUnit;
import org.jboss.dna.repository.services.ServiceAdministrator;
import org.jboss.dna.spi.graph.commands.GraphCommand;
+import org.jboss.dna.spi.graph.commands.executor.CommandExecutor;
import org.jboss.dna.spi.graph.connection.ExecutionEnvironment;
import org.jboss.dna.spi.graph.connection.RepositorySourceException;
import org.jboss.dna.spi.graph.connection.RepositorySourceListener;
@@ -80,7 +81,7 @@
}
@Test( expected = RepositorySourceException.class )
- public void shouldFailExecutionIfRepositoryAdminsIsNotStarted() {
+ public void shouldFailExecutionIfRepositoryAdminsIsNotStarted() throws Exception {
stub(repositoryAdmin.isStarted()).toReturn(false);
ExecutionEnvironment env = mock(ExecutionEnvironment.class);
GraphCommand command = mock(GraphCommand.class);
@@ -88,7 +89,7 @@
}
@Test
- public void shouldReturnImmediatelyWhenExecutingNullOrEmptyCommandArray() {
+ public void shouldReturnImmediatelyWhenExecutingNullOrEmptyCommandArray() throws Exception {
stub(repositoryAdmin.isStarted()).toReturn(true);
ExecutionEnvironment env = mock(ExecutionEnvironment.class);
connection.execute(env, (GraphCommand[])null);
@@ -98,9 +99,11 @@
}
@Test
- public void shouldSkipNullCommandReferencesWhenExecuting() {
+ public void shouldSkipNullCommandReferencesWhenExecuting() throws Exception {
stub(repositoryAdmin.isStarted()).toReturn(true);
ExecutionEnvironment env = mock(ExecutionEnvironment.class);
+ CommandExecutor executor = mock(CommandExecutor.class);
+ stub(repository.getExecutor(env, sourceName)).toReturn(executor);
connection.execute(env, new GraphCommand[] {null, null, null});
verify(repositoryAdmin, times(1)).isStarted();
}
Modified: trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederationServiceTest.java
===================================================================
--- trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederationServiceTest.java 2008-07-09 14:54:59 UTC (rev 345)
+++ trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederationServiceTest.java 2008-07-09 14:57:28 UTC (rev 346)
@@ -250,6 +250,9 @@
String fedReposPath = "/reposX/dna:repositories/fed repos/";
configRepository.setProperty(env, fedReposPath, TIME_TO_CACHE, "10000");
configRepository.setProperty(env, fedReposPath, TIME_TO_EXPIRE, "20000");
+ configRepository.setProperty(env, fedReposPath + "dna:cache", PATH_IN_REPOSITORY, "/ca/cb/cc");
+ configRepository.setProperty(env, fedReposPath + "dna:cache", PATH_IN_SOURCE, "/cx/cy");
+ configRepository.setProperty(env, fedReposPath + "dna:cache", SOURCE_NAME, "cache source");
configRepository.setProperty(env, fedReposPath + "dna:regions/region1", PATH_IN_REPOSITORY, "/a/b/c");
configRepository.setProperty(env, fedReposPath + "dna:regions/region1", PATH_IN_SOURCE, "/sx/sy");
configRepository.setProperty(env, fedReposPath + "dna:regions/region1", SOURCE_NAME, "source A");
@@ -272,6 +275,10 @@
assertThat(repository.getName(), is("fed repos"));
assertThat(repository.getConfiguration().getDefaultCachePolicy().getTimeToCache(), is(10000l));
assertThat(repository.getConfiguration().getDefaultCachePolicy().getTimeToExpire(), is(20000l));
+ assertThat(repository.getConfiguration().getCacheRegion().getRegionName(), is("cache"));
+ assertThat(repository.getConfiguration().getCacheRegion().getPathInRepository(), is(pathFactory.create("/ca/cb/cc")));
+ assertThat(repository.getConfiguration().getCacheRegion().getPathInSource(), is(pathFactory.create("/cx/cy")));
+ assertThat(repository.getConfiguration().getCacheRegion().getSourceName(), is("cache source"));
assertThat(repository.getConfiguration().getRegions().get(0).getRegionName(), is("region1"));
assertThat(repository.getConfiguration().getRegions().get(0).getPathInRepository(), is(pathFactory.create("/a/b/c")));
assertThat(repository.getConfiguration().getRegions().get(0).getPathInSource(), is(pathFactory.create("/sx/sy")));
Modified: trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/executor/AbstractCommandExecutor.java
===================================================================
--- trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/executor/AbstractCommandExecutor.java 2008-07-09 14:54:59 UTC (rev 345)
+++ trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/executor/AbstractCommandExecutor.java 2008-07-09 14:57:28 UTC (rev 346)
@@ -224,4 +224,13 @@
public void execute( RecordBranchCommand command ) throws RepositorySourceException, InterruptedException {
}
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.jboss.dna.spi.graph.commands.executor.CommandExecutor#close()
+ */
+ @SuppressWarnings( "unused" )
+ public void close() throws InterruptedException {
+ }
+
}
Modified: trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/executor/CommandExecutor.java
===================================================================
--- trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/executor/CommandExecutor.java 2008-07-09 14:54:59 UTC (rev 345)
+++ trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/executor/CommandExecutor.java 2008-07-09 14:57:28 UTC (rev 346)
@@ -140,4 +140,10 @@
*/
void execute( MoveBranchCommand command ) throws RepositorySourceException, InterruptedException;
+ /**
+ * Close this executor, allowing it to clean up any open resources.
+ *
+ * @throws InterruptedException if the thread is interrupted while the connection is being closed
+ */
+ void close() throws InterruptedException;
}
17 years, 5 months
- 1
- 0
DNA SVN: r345 - in trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands: impl and 1 other directory.
by dna-commits＠lists.jboss.org
Author: rhauch
Date: 2008-07-09 10:54:59 -0400 (Wed, 09 Jul 2008)
New Revision: 345
Modified:
trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/GraphCommand.java
trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/impl/BasicGraphCommand.java
Log:
DNA-115 - Create federation service
http://jira.jboss.com/jira/browse/DNA-115
Added to GraphCommand the ability to get and set an exception, as well as two convenience methods to determine whether the command has (or does not have) an error.
Modified: trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/GraphCommand.java
===================================================================
--- trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/GraphCommand.java 2008-07-09 14:52:15 UTC (rev 344)
+++ trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/GraphCommand.java 2008-07-09 14:54:59 UTC (rev 345)
@@ -39,7 +39,40 @@
* Set the error for this command.
*
* @param error the exception
+ * @see #getError()
+ * @see #hasError()
+ * @see #hasNoError()
*/
void setError( Throwable error );
+ /**
+ * Get the error for this command.
+ *
+ * @return the error, or null if there is no error
+ * @see #setError(Throwable)
+ * @see #hasError()
+ * @see #hasNoError()
+ */
+ Throwable getError();
+
+ /**
+ * Return true if this command has an {@link #getError() error}.
+ *
+ * @return true if the command has an error, or false otherwise
+ * @see #getError()
+ * @see #setError(Throwable)
+ * @see #hasNoError()
+ */
+ boolean hasError();
+
+ /**
+ * Convenience method that is equivalent to <code>!hasError()</code>.
+ *
+ * @return true if the command has no error, or false otherwise
+ * @see #getError()
+ * @see #setError(Throwable)
+ * @see #hasError()
+ */
+ boolean hasNoError();
+
}
Modified: trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/impl/BasicGraphCommand.java
===================================================================
--- trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/impl/BasicGraphCommand.java 2008-07-09 14:52:15 UTC (rev 344)
+++ trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/impl/BasicGraphCommand.java 2008-07-09 14:54:59 UTC (rev 345)
@@ -72,12 +72,19 @@
}
/**
- * @return error
+ * {@inheritDoc}
+ *
+ * @see org.jboss.dna.spi.graph.commands.GraphCommand#getError()
*/
public Throwable getError() {
return error;
}
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.jboss.dna.spi.graph.commands.GraphCommand#hasError()
+ */
public boolean hasError() {
return error != null;
}
17 years, 5 months
- 1
- 0
DNA SVN: r344 - in trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph: impl and 1 other directory.
by dna-commits＠lists.jboss.org
Author: rhauch
Date: 2008-07-09 10:52:15 -0400 (Wed, 09 Jul 2008)
New Revision: 344
Modified:
trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/DateTime.java
trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/impl/JodaDateTime.java
Log:
DNA-115 - Create federation service
http://jira.jboss.com/jira/browse/DNA-115
Added methods to compare DateTime instances (isBefore, isAfter, isSameAs). Also optimized the 'compareTo' method of JodaDateTime to delegate to the wrapped Joda DateTime instances if comparing two DNA JodaDateTime instances.
Modified: trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/DateTime.java
===================================================================
--- trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/DateTime.java 2008-07-09 14:46:07 UTC (rev 343)
+++ trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/DateTime.java 2008-07-09 14:52:15 UTC (rev 344)
@@ -31,6 +31,7 @@
* href="http://jcp.org/en/jsr/detail?id=310">JSR-310</a>, which will be based upon <a
* href="http://joda-time.sourceforge.net/">Joda-Time</a>. This class serves as a stable migration path toward the new JSR 310
* classes.
+ *
* @author Randall Hauch
*/
@Immutable
@@ -55,6 +56,7 @@
* <li>three decimal places for milliseconds, if required;</li>
* <li>time zone offset of the form <code>�HH:mm</code> (or '0' if UTC)</li>
* </ul>
+ *
* @return the string representation; never null
*/
String getString();
@@ -62,6 +64,7 @@
/**
* Get the number of milliseconds from 1970-01-01T00:00Z. This value is consistent with the JDK {@link java.util.Date Date}
* and {@link java.util.Calendar Calendar} classes.
+ *
* @return the number of milliseconds from 1970-01-01T00:00Z
*/
long getMilliseconds();
@@ -69,145 +72,202 @@
/**
* Get this instance represented as a standard JDK {@link java.util.Date} instance. Note that this conversion loses the time
* zone information, as the standard JDK {@link java.util.Date} does not represent time zones.
+ *
* @return this instance in time as a JDK Date; never null
*/
java.util.Date toDate();
/**
- * Get this instance represented as a standard JDK {@link java.util.Calendar} instance, in the
- * {@link Locale#getDefault() default locale}.
+ * Get this instance represented as a standard JDK {@link java.util.Calendar} instance, in the {@link Locale#getDefault()
+ * default locale}.
+ *
* @return this instance in time as a JDK Calendar; never null
*/
java.util.Calendar toCalendar();
/**
- * Get this instance represented as a standard JDK {@link java.util.Calendar} instance, in the specified {@link Locale locale}.
- * @param locale the locale in which the Calendar instance is desired; may be null if the
- * {@link Locale#getDefault() default locale} is to be used.
+ * Get this instance represented as a standard JDK {@link java.util.Calendar} instance, in the specified {@link Locale locale}
+ * .
+ *
+ * @param locale the locale in which the Calendar instance is desired; may be null if the {@link Locale#getDefault() default
+ * locale} is to be used.
* @return this instance in time as a JDK Calendar; never null
*/
java.util.Calendar toCalendar( Locale locale );
/**
* Get this instance represented as a standard JDK {@link java.util.GregorianCalendar} instance.
+ *
* @return this instance in time as a JDK GregorianCalendar; never null
*/
java.util.GregorianCalendar toGregorianCalendar();
/**
* Get the era of this instance in time.
+ *
* @return the era
*/
int getEra();
/**
* Get the era of this instance in time.
+ *
* @return the era
*/
int getYear();
/**
* Get the era of this instance in time.
+ *
* @return the era
*/
int getWeekyear();
/**
* Get the era of this instance in time.
+ *
* @return the era
*/
int getCenturyOfEra();
/**
* Get the year of the era of this instance in time.
+ *
* @return the year of the era
*/
int getYearOfEra();
/**
* Get the year of this century of this instance in time.
+ *
* @return the year of the century
*/
int getYearOfCentury();
/**
* Get the month of the year of this instance in time.
+ *
* @return the month number
*/
int getMonthOfYear();
/**
* Get the week of the weekyear of this instance in time.
+ *
* @return the week of the weekyear
*/
int getWeekOfWeekyear();
/**
* Get the day of the year of this instance in time.
+ *
* @return the day of the year
*/
int getDayOfYear();
/**
* Get the day of the month value of this instance in time.
+ *
* @return the day of the month
*/
int getDayOfMonth();
/**
* Get the day of the week value of this instance in time.
+ *
* @return the day of the week
*/
int getDayOfWeek();
/**
* Get the hour of the day of this instance in time.
+ *
* @return the hour of the day
*/
int getHourOfDay();
/**
* Get the minute of this instance in time.
+ *
* @return the minute of the hour
*/
int getMinuteOfHour();
/**
* Get the seconds of the minute value of this instance in time.
+ *
* @return the seconds of the minute
*/
int getSecondOfMinute();
/**
* Get the milliseconds of the second value of this instance in time.
+ *
* @return the milliseconds
*/
int getMillisOfSecond();
/**
* Get the number of hours that this time zone is offset from UTC.
+ *
* @return the number of hours
*/
int getTimeZoneOffsetHours();
/**
* Get the identifier of the time zone in which this instant is defined
+ *
* @return the time zone identifier; never null
*/
String getTimeZoneId();
/**
* Convert this time to the same instant in the UTC time zone.
+ *
* @return this instant in time in the specified time zone
*/
DateTime toUtcTimeZone();
/**
* Convert this time to the time zone given by the supplied identifier.
+ *
* @param timeZoneId the time zone identifier
* @return the instant in the specified time zone
* @throws IllegalArgumentException if the time zone identifier is null or is invalid
*/
DateTime toTimeZone( String timeZoneId );
+ /**
+ * Return whether this date-time is earlier than the supplied date-time.
+ *
+ * @param other the date-time to compare with
+ * @return true if this date-time is earliar than the other, or false otherwise
+ * @see #compareTo(DateTime)
+ * @see #isSameAs(DateTime)
+ * @see #isAfter(DateTime)
+ */
+ boolean isBefore( DateTime other );
+
+ /**
+ * Return whether this date-time is later than the supplied date-time.
+ *
+ * @param other the date-time to compare with
+ * @return true if this date-time is later than the other, or false otherwise
+ * @see #compareTo(DateTime)
+ * @see #isBefore(DateTime)
+ * @see #isSameAs(DateTime)
+ */
+ boolean isAfter( DateTime other );
+
+ /**
+ * Return whether this date-time is at the same time as the supplied date-time.
+ *
+ * @param other the date-time to compare with
+ * @return true if this date-time is later than the other, or false otherwise
+ * @see #compareTo(DateTime)
+ * @see #isBefore(DateTime)
+ * @see #isAfter(DateTime)
+ */
+ boolean isSameAs( DateTime other );
+
}
Modified: trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/impl/JodaDateTime.java
===================================================================
--- trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/impl/JodaDateTime.java 2008-07-09 14:46:07 UTC (rev 343)
+++ trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/impl/JodaDateTime.java 2008-07-09 14:52:15 UTC (rev 344)
@@ -33,6 +33,7 @@
/**
* Implementation of DateTime based upon the Joda-Time library.
+ *
* @author Randall Hauch
*/
@Immutable
@@ -55,7 +56,8 @@
this.instance = new DateTime(iso8601);
}
- public JodaDateTime( String iso8601, String timeZoneId ) {
+ public JodaDateTime( String iso8601,
+ String timeZoneId ) {
this.instance = new DateTime(iso8601, DateTimeZone.forID(timeZoneId));
}
@@ -63,7 +65,8 @@
this.instance = new DateTime(milliseconds);
}
- public JodaDateTime( long milliseconds, Chronology chronology ) {
+ public JodaDateTime( long milliseconds,
+ Chronology chronology ) {
this.instance = new DateTime(milliseconds, chronology);
}
@@ -71,24 +74,62 @@
this.instance = new DateTime(dateTimeZone);
}
- public JodaDateTime( int year, int monthOfYear, int dayOfMonth, int hourOfDay, int minuteOfHour, int secondOfMinute, int millisecondsOfSecond ) {
+ public JodaDateTime( int year,
+ int monthOfYear,
+ int dayOfMonth,
+ int hourOfDay,
+ int minuteOfHour,
+ int secondOfMinute,
+ int millisecondsOfSecond ) {
this.instance = new DateTime(year, monthOfYear, dayOfMonth, hourOfDay, minuteOfHour, secondOfMinute, millisecondsOfSecond);
}
- public JodaDateTime( int year, int monthOfYear, int dayOfMonth, int hourOfDay, int minuteOfHour, int secondOfMinute, int millisecondsOfSecond, Chronology chronology ) {
- this.instance = new DateTime(year, monthOfYear, dayOfMonth, hourOfDay, minuteOfHour, secondOfMinute, millisecondsOfSecond, chronology);
+ public JodaDateTime( int year,
+ int monthOfYear,
+ int dayOfMonth,
+ int hourOfDay,
+ int minuteOfHour,
+ int secondOfMinute,
+ int millisecondsOfSecond,
+ Chronology chronology ) {
+ this.instance = new DateTime(year, monthOfYear, dayOfMonth, hourOfDay, minuteOfHour, secondOfMinute,
+ millisecondsOfSecond, chronology);
}
- public JodaDateTime( int year, int monthOfYear, int dayOfMonth, int hourOfDay, int minuteOfHour, int secondOfMinute, int millisecondsOfSecond, DateTimeZone dateTimeZone ) {
- this.instance = new DateTime(year, monthOfYear, dayOfMonth, hourOfDay, minuteOfHour, secondOfMinute, millisecondsOfSecond, dateTimeZone);
+ public JodaDateTime( int year,
+ int monthOfYear,
+ int dayOfMonth,
+ int hourOfDay,
+ int minuteOfHour,
+ int secondOfMinute,
+ int millisecondsOfSecond,
+ DateTimeZone dateTimeZone ) {
+ this.instance = new DateTime(year, monthOfYear, dayOfMonth, hourOfDay, minuteOfHour, secondOfMinute,
+ millisecondsOfSecond, dateTimeZone);
}
- public JodaDateTime( int year, int monthOfYear, int dayOfMonth, int hourOfDay, int minuteOfHour, int secondOfMinute, int millisecondsOfSecond, int timeZoneOffsetHours ) {
- this.instance = new DateTime(year, monthOfYear, dayOfMonth, hourOfDay, minuteOfHour, secondOfMinute, millisecondsOfSecond, DateTimeZone.forOffsetHours(timeZoneOffsetHours));
+ public JodaDateTime( int year,
+ int monthOfYear,
+ int dayOfMonth,
+ int hourOfDay,
+ int minuteOfHour,
+ int secondOfMinute,
+ int millisecondsOfSecond,
+ int timeZoneOffsetHours ) {
+ this.instance = new DateTime(year, monthOfYear, dayOfMonth, hourOfDay, minuteOfHour, secondOfMinute,
+ millisecondsOfSecond, DateTimeZone.forOffsetHours(timeZoneOffsetHours));
}
- public JodaDateTime( int year, int monthOfYear, int dayOfMonth, int hourOfDay, int minuteOfHour, int secondOfMinute, int millisecondsOfSecond, String timeZoneId ) {
- this.instance = new DateTime(year, monthOfYear, dayOfMonth, hourOfDay, minuteOfHour, secondOfMinute, millisecondsOfSecond, DateTimeZone.forID(timeZoneId));
+ public JodaDateTime( int year,
+ int monthOfYear,
+ int dayOfMonth,
+ int hourOfDay,
+ int minuteOfHour,
+ int secondOfMinute,
+ int millisecondsOfSecond,
+ String timeZoneId ) {
+ this.instance = new DateTime(year, monthOfYear, dayOfMonth, hourOfDay, minuteOfHour, secondOfMinute,
+ millisecondsOfSecond, DateTimeZone.forID(timeZoneId));
}
public JodaDateTime( java.util.Date jdkDate ) {
@@ -274,7 +315,11 @@
* {@inheritDoc}
*/
public int compareTo( org.jboss.dna.spi.graph.DateTime that ) {
- return this.instance.compareTo(that);
+ if (that instanceof JodaDateTime) {
+ return this.instance.compareTo(((JodaDateTime)that).instance);
+ }
+ long diff = this.toUtcTimeZone().getMilliseconds() - that.toUtcTimeZone().getMilliseconds();
+ return (int)diff;
}
/**
@@ -326,4 +371,31 @@
return new JodaDateTime(jodaTime);
}
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.jboss.dna.spi.graph.DateTime#isBefore(org.jboss.dna.spi.graph.DateTime)
+ */
+ public boolean isBefore( org.jboss.dna.spi.graph.DateTime other ) {
+ return this.compareTo(other) < 0;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.jboss.dna.spi.graph.DateTime#isSameAs(org.jboss.dna.spi.graph.DateTime)
+ */
+ public boolean isSameAs( org.jboss.dna.spi.graph.DateTime other ) {
+ return this.compareTo(other) == 0;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.jboss.dna.spi.graph.DateTime#isAfter(org.jboss.dna.spi.graph.DateTime)
+ */
+ public boolean isAfter( org.jboss.dna.spi.graph.DateTime other ) {
+ return this.compareTo(other) > 0;
+ }
+
}
17 years, 5 months
- 1
- 0
DNA SVN: r343 - trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/impl.
by dna-commits＠lists.jboss.org
Author: rhauch
Date: 2008-07-09 10:46:07 -0400 (Wed, 09 Jul 2008)
New Revision: 343
Modified:
trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/impl/BasicPath.java
Log:
DNA-115 - Create federation service
http://jira.jboss.com/jira/browse/DNA-115
Changed type of exception thrown when attempting to retrieve or use a node on a path does not exist.
Modified: trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/impl/BasicPath.java
===================================================================
--- trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/impl/BasicPath.java 2008-07-09 14:45:35 UTC (rev 342)
+++ trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/impl/BasicPath.java 2008-07-09 14:46:07 UTC (rev 343)
@@ -46,7 +46,7 @@
@Immutable
public class BasicPath implements Path {
- /**
+ /**
*/
private static final long serialVersionUID = 8488295345524209746L;
@@ -99,7 +99,7 @@
int endIndex = this.segments.size() - degree;
if (endIndex < 0) {
String msg = SpiI18n.pathAncestorDegreeIsInvalid.text(this.getString(), Inflector.getInstance().ordinalize(degree));
- throw new PathNotFoundException(msg);
+ throw new PathNotFoundException(this, msg);
}
return subpath(0, endIndex);
}
17 years, 5 months
- 1
- 0
DNA SVN: r342 - in trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph: commands and 1 other directory.
by dna-commits＠lists.jboss.org
Author: rhauch
Date: 2008-07-09 10:45:35 -0400 (Wed, 09 Jul 2008)
New Revision: 342
Modified:
trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/PathNotFoundException.java
trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/ActsOnPath.java
Log:
DNA-115 - Create federation service
http://jira.jboss.com/jira/browse/DNA-115
Changed type of exception thrown when attempting to retrieve or use a node on a path does not exist.
Modified: trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/PathNotFoundException.java
===================================================================
--- trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/PathNotFoundException.java 2008-07-09 14:44:53 UTC (rev 341)
+++ trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/PathNotFoundException.java 2008-07-09 14:45:35 UTC (rev 342)
@@ -30,35 +30,45 @@
*/
private static final long serialVersionUID = -3703984046286975978L;
+ private final Path path;
+
/**
- *
+ * @param path
*/
- public PathNotFoundException() {
+ public PathNotFoundException( Path path ) {
+ this.path = path;
}
/**
+ * @param path
* @param message
*/
- public PathNotFoundException( String message ) {
+ public PathNotFoundException( Path path,
+ String message ) {
super(message);
-
+ this.path = path;
}
/**
+ * @param path
* @param cause
*/
- public PathNotFoundException( Throwable cause ) {
+ public PathNotFoundException( Path path,
+ Throwable cause ) {
super(cause);
-
+ this.path = path;
}
/**
+ * @param path
* @param message
* @param cause
*/
- public PathNotFoundException( String message, Throwable cause ) {
+ public PathNotFoundException( Path path,
+ String message,
+ Throwable cause ) {
super(message, cause);
-
+ this.path = path;
}
/**
@@ -68,4 +78,13 @@
public String toString() {
return super.toString();
}
+
+ /**
+ * Get the path that was not found
+ *
+ * @return the path that was not found
+ */
+ public Path getPath() {
+ return path;
+ }
}
Modified: trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/ActsOnPath.java
===================================================================
--- trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/ActsOnPath.java 2008-07-09 14:44:53 UTC (rev 341)
+++ trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/ActsOnPath.java 2008-07-09 14:45:35 UTC (rev 342)
@@ -22,16 +22,20 @@
package org.jboss.dna.spi.graph.commands;
import org.jboss.dna.spi.graph.Path;
+import org.jboss.dna.spi.graph.PathNotFoundException;
/**
* Aspect interface for any repository command that acts upon a specific path. This aspect adds a method that can be used by the
* recipient to obtain the path that the command applies to.
+ *
* @author Randall Hauch
*/
public interface ActsOnPath {
/**
- * Get the path to which this command applies.
+ * Get the path to which this command applies. If the path does not exist, an {@link PathNotFoundException} exception should
+ * be recorded as an {@link GraphCommand#setError(Throwable) error}.
+ *
* @return the path; never null
*/
Path getPath();
17 years, 5 months
- 1
- 0
DNA SVN: r341 - in trunk/connectors: dna-connector-jbosscache/src/main/java/org/jboss/dna/connector/jbosscache and 1 other directory.
by dna-commits＠lists.jboss.org
Author: rhauch
Date: 2008-07-09 10:44:53 -0400 (Wed, 09 Jul 2008)
New Revision: 341
Modified:
trunk/connectors/dna-connector-inmemory/src/main/java/org/jboss/dna/connector/inmemory/InMemoryRepository.java
trunk/connectors/dna-connector-jbosscache/src/main/java/org/jboss/dna/connector/jbosscache/JBossCacheConnection.java
Log:
DNA-115 - Create federation service
http://jira.jboss.com/jira/browse/DNA-115
Changed type of exception thrown when attempting to retrieve or use a node on a path does not exist.
Modified: trunk/connectors/dna-connector-inmemory/src/main/java/org/jboss/dna/connector/inmemory/InMemoryRepository.java
===================================================================
--- trunk/connectors/dna-connector-inmemory/src/main/java/org/jboss/dna/connector/inmemory/InMemoryRepository.java 2008-07-03 18:23:41 UTC (rev 340)
+++ trunk/connectors/dna-connector-inmemory/src/main/java/org/jboss/dna/connector/inmemory/InMemoryRepository.java 2008-07-09 14:44:53 UTC (rev 341)
@@ -33,6 +33,7 @@
import org.jboss.dna.common.util.ArgCheck;
import org.jboss.dna.spi.graph.Name;
import org.jboss.dna.spi.graph.Path;
+import org.jboss.dna.spi.graph.PathNotFoundException;
import org.jboss.dna.spi.graph.Property;
import org.jboss.dna.spi.graph.Path.Segment;
import org.jboss.dna.spi.graph.commands.ActsOnPath;
@@ -48,7 +49,6 @@
import org.jboss.dna.spi.graph.commands.executor.AbstractCommandExecutor;
import org.jboss.dna.spi.graph.commands.executor.CommandExecutor;
import org.jboss.dna.spi.graph.connection.ExecutionEnvironment;
-import org.jboss.dna.spi.graph.connection.RepositorySourceException;
/**
* @author Randall Hauch
@@ -404,7 +404,7 @@
// Look up the node with the supplied path ...
Node node = InMemoryRepository.this.getNode(path);
if (node == null) {
- throw new RepositorySourceException(getSourceName(), InMemoryConnectorI18n.nodeDoesNotExist.text(path));
+ throw new PathNotFoundException(path, InMemoryConnectorI18n.nodeDoesNotExist.text(path));
}
return null;
}
Modified: trunk/connectors/dna-connector-jbosscache/src/main/java/org/jboss/dna/connector/jbosscache/JBossCacheConnection.java
===================================================================
--- trunk/connectors/dna-connector-jbosscache/src/main/java/org/jboss/dna/connector/jbosscache/JBossCacheConnection.java 2008-07-03 18:23:41 UTC (rev 340)
+++ trunk/connectors/dna-connector-jbosscache/src/main/java/org/jboss/dna/connector/jbosscache/JBossCacheConnection.java 2008-07-09 14:44:53 UTC (rev 341)
@@ -34,6 +34,7 @@
import org.jboss.dna.spi.cache.CachePolicy;
import org.jboss.dna.spi.graph.Name;
import org.jboss.dna.spi.graph.Path;
+import org.jboss.dna.spi.graph.PathNotFoundException;
import org.jboss.dna.spi.graph.Property;
import org.jboss.dna.spi.graph.PropertyFactory;
import org.jboss.dna.spi.graph.Path.Segment;
@@ -191,7 +192,7 @@
Node<Name, Object> node = cache.getNode(fqn);
if (node == null) {
String nodePath = path.getString(env.getNamespaceRegistry());
- throw new RepositorySourceException(getSourceName(), JBossCacheConnectorI18n.nodeDoesNotExist.text(nodePath));
+ throw new PathNotFoundException(path, JBossCacheConnectorI18n.nodeDoesNotExist.text(nodePath));
}
return node;
17 years, 5 months
- 1
- 0
DNA SVN: r340 - in trunk: connectors/dna-connector-jbosscache and 6 other directories.
by dna-commits＠lists.jboss.org
Author: rhauch
Date: 2008-07-03 14:23:41 -0400 (Thu, 03 Jul 2008)
New Revision: 340
Added:
trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/executor/
trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/executor/AbstractCommandExecutor.java
trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/executor/CommandExecutor.java
trunk/dna-spi/src/test/java/org/jboss/dna/spi/graph/commands/
trunk/dna-spi/src/test/java/org/jboss/dna/spi/graph/commands/executor/
trunk/dna-spi/src/test/java/org/jboss/dna/spi/graph/commands/executor/AbstractCommandExecutorTest.java
Modified:
trunk/connectors/dna-connector-inmemory/src/main/java/org/jboss/dna/connector/inmemory/InMemoryRepository.java
trunk/connectors/dna-connector-inmemory/src/main/java/org/jboss/dna/connector/inmemory/InMemoryRepositoryConnection.java
trunk/connectors/dna-connector-jbosscache/pom.xml
trunk/connectors/dna-connector-jbosscache/src/main/java/org/jboss/dna/connector/jbosscache/JBossCacheConnection.java
Log:
DNA-171 - Create basic command executor
http://jira.jboss.com/jira/browse/DNA-171
Created CommandExecutor interface and an AbstractCommandExecutor abstract (but complete) implementation. The unit tests verify that the 'execute(GraphCommand)' method properly delegates to the other more specific 'execute(...)' methods, and that the 'execute(CompositeCommand)' method properly iterates over the nested commands.
Modified: trunk/connectors/dna-connector-inmemory/src/main/java/org/jboss/dna/connector/inmemory/InMemoryRepository.java
===================================================================
--- trunk/connectors/dna-connector-inmemory/src/main/java/org/jboss/dna/connector/inmemory/InMemoryRepository.java 2008-07-03 15:42:34 UTC (rev 339)
+++ trunk/connectors/dna-connector-inmemory/src/main/java/org/jboss/dna/connector/inmemory/InMemoryRepository.java 2008-07-03 18:23:41 UTC (rev 340)
@@ -21,6 +21,7 @@
*/
package org.jboss.dna.connector.inmemory;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@@ -32,7 +33,22 @@
import org.jboss.dna.common.util.ArgCheck;
import org.jboss.dna.spi.graph.Name;
import org.jboss.dna.spi.graph.Path;
+import org.jboss.dna.spi.graph.Property;
+import org.jboss.dna.spi.graph.Path.Segment;
+import org.jboss.dna.spi.graph.commands.ActsOnPath;
+import org.jboss.dna.spi.graph.commands.CopyBranchCommand;
+import org.jboss.dna.spi.graph.commands.CopyNodeCommand;
+import org.jboss.dna.spi.graph.commands.CreateNodeCommand;
+import org.jboss.dna.spi.graph.commands.DeleteBranchCommand;
+import org.jboss.dna.spi.graph.commands.GetChildrenCommand;
+import org.jboss.dna.spi.graph.commands.GetPropertiesCommand;
+import org.jboss.dna.spi.graph.commands.MoveBranchCommand;
+import org.jboss.dna.spi.graph.commands.RecordBranchCommand;
+import org.jboss.dna.spi.graph.commands.SetPropertiesCommand;
+import org.jboss.dna.spi.graph.commands.executor.AbstractCommandExecutor;
+import org.jboss.dna.spi.graph.commands.executor.CommandExecutor;
import org.jboss.dna.spi.graph.connection.ExecutionEnvironment;
+import org.jboss.dna.spi.graph.connection.RepositorySourceException;
/**
* @author Randall Hauch
@@ -263,4 +279,136 @@
}
return numNodesCopied;
}
+
+ /**
+ * Get a command executor given the supplied environment and source name.
+ *
+ * @param env the environment in which the commands are to be executed
+ * @param sourceName the name of the repository source
+ * @return the executor; never null
+ */
+ public CommandExecutor getCommandExecutor( ExecutionEnvironment env,
+ String sourceName ) {
+ return new Executor(env, sourceName);
+ }
+
+ protected class Executor extends AbstractCommandExecutor {
+
+ protected Executor( ExecutionEnvironment env,
+ String sourceName ) {
+ super(env, sourceName);
+ }
+
+ @Override
+ public void execute( CreateNodeCommand command ) {
+ Path path = command.getPath();
+ Path parent = path.getAncestor();
+ // Look up the parent node, which must exist ...
+ Node parentNode = getNode(parent);
+ Node node = createNode(getEnvironment(), parentNode, path.getLastSegment().getName());
+ // Now add the properties to the supplied node ...
+ for (Property property : command.getProperties()) {
+ Name propName = property.getName();
+ if (property.size() == 0) {
+ node.getProperties().remove(propName);
+ continue;
+ }
+ node.getProperties().put(propName, property);
+ }
+ assert node != null;
+ }
+
+ @Override
+ public void execute( GetChildrenCommand command ) {
+ Node node = getTargetNode(command);
+ // Get the names of the children ...
+ List<Node> children = node.getChildren();
+ List<Segment> childSegments = new ArrayList<Segment>(children.size());
+ for (Node child : children) {
+ childSegments.add(child.getName());
+ }
+ command.setChildren(childSegments);
+ }
+
+ @Override
+ public void execute( GetPropertiesCommand command ) {
+ Node node = getTargetNode(command);
+ for (Property property : node.getProperties().values()) {
+ command.setProperty(property);
+ }
+ }
+
+ @Override
+ public void execute( SetPropertiesCommand command ) {
+ Node node = getTargetNode(command);
+ // Now set (or remove) the properties to the supplied node ...
+ for (Property property : command.getProperties()) {
+ Name propName = property.getName();
+ if (property.size() == 0) {
+ node.getProperties().remove(propName);
+ continue;
+ }
+ node.getProperties().put(propName, property);
+ }
+ }
+
+ @Override
+ public void execute( DeleteBranchCommand command ) {
+ Node node = getTargetNode(command);
+ removeNode(getEnvironment(), node);
+ }
+
+ @Override
+ public void execute( CopyNodeCommand command ) {
+ Node node = getTargetNode(command);
+ // Look up the new parent, which must exist ...
+ Path newPath = command.getNewPath();
+ Node newParent = getNode(newPath.getAncestor());
+ copyNode(getEnvironment(), node, newParent, false);
+ }
+
+ @Override
+ public void execute( CopyBranchCommand command ) {
+ Node node = getTargetNode(command);
+ // Look up the new parent, which must exist ...
+ Path newPath = command.getNewPath();
+ Node newParent = getNode(newPath.getAncestor());
+ copyNode(getEnvironment(), node, newParent, true);
+ }
+
+ @Override
+ public void execute( MoveBranchCommand command ) {
+ Node node = getTargetNode(command);
+ // Look up the new parent, which must exist ...
+ Path newPath = command.getNewPath();
+ Node newParent = getNode(newPath.getAncestor());
+ node.setParent(newParent);
+ }
+
+ @Override
+ public void execute( RecordBranchCommand command ) {
+ Node node = getTargetNode(command);
+ recordNode(command, node);
+ }
+
+ protected void recordNode( RecordBranchCommand command,
+ Node node ) {
+ command.record(command.getPath(), node.getProperties().values());
+ for (Node child : node.getChildren()) {
+ recordNode(command, child);
+ }
+ }
+
+ protected Node getTargetNode( ActsOnPath command ) {
+ Path path = command.getPath();
+ // Look up the node with the supplied path ...
+ Node node = InMemoryRepository.this.getNode(path);
+ if (node == null) {
+ throw new RepositorySourceException(getSourceName(), InMemoryConnectorI18n.nodeDoesNotExist.text(path));
+ }
+ return null;
+ }
+
+ }
+
}
Modified: trunk/connectors/dna-connector-inmemory/src/main/java/org/jboss/dna/connector/inmemory/InMemoryRepositoryConnection.java
===================================================================
--- trunk/connectors/dna-connector-inmemory/src/main/java/org/jboss/dna/connector/inmemory/InMemoryRepositoryConnection.java 2008-07-03 15:42:34 UTC (rev 339)
+++ trunk/connectors/dna-connector-inmemory/src/main/java/org/jboss/dna/connector/inmemory/InMemoryRepositoryConnection.java 2008-07-03 18:23:41 UTC (rev 340)
@@ -21,31 +21,16 @@
*/
package org.jboss.dna.connector.inmemory;
-import java.util.ArrayList;
-import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
import javax.transaction.xa.XAResource;
import org.jboss.dna.spi.cache.CachePolicy;
-import org.jboss.dna.spi.graph.InvalidPathException;
-import org.jboss.dna.spi.graph.Name;
-import org.jboss.dna.spi.graph.Path;
-import org.jboss.dna.spi.graph.Property;
-import org.jboss.dna.spi.graph.Path.Segment;
import org.jboss.dna.spi.graph.commands.ActsAsUpdate;
-import org.jboss.dna.spi.graph.commands.ActsOnPath;
-import org.jboss.dna.spi.graph.commands.CompositeCommand;
-import org.jboss.dna.spi.graph.commands.CopyBranchCommand;
-import org.jboss.dna.spi.graph.commands.CopyNodeCommand;
-import org.jboss.dna.spi.graph.commands.CreateNodeCommand;
-import org.jboss.dna.spi.graph.commands.DeleteBranchCommand;
-import org.jboss.dna.spi.graph.commands.GetChildrenCommand;
-import org.jboss.dna.spi.graph.commands.GetPropertiesCommand;
import org.jboss.dna.spi.graph.commands.GraphCommand;
-import org.jboss.dna.spi.graph.commands.MoveBranchCommand;
-import org.jboss.dna.spi.graph.commands.SetPropertiesCommand;
+import org.jboss.dna.spi.graph.commands.executor.CommandExecutor;
import org.jboss.dna.spi.graph.connection.ExecutionEnvironment;
import org.jboss.dna.spi.graph.connection.RepositoryConnection;
+import org.jboss.dna.spi.graph.connection.RepositorySourceException;
import org.jboss.dna.spi.graph.connection.RepositorySourceListener;
/**
@@ -122,9 +107,12 @@
/**
* {@inheritDoc}
+ *
+ * @throws InterruptedException
+ * @throws RepositorySourceException
*/
public void execute( ExecutionEnvironment env,
- GraphCommand... commands ) {
+ GraphCommand... commands ) throws RepositorySourceException, InterruptedException {
// Do any commands update/write?
Lock lock = this.content.getLock().readLock();
for (GraphCommand command : commands) {
@@ -135,126 +123,19 @@
}
try {
- // Obtain the lock ...
+ // Obtain the lock and execute the commands ...
+ CommandExecutor executor = this.content.getCommandExecutor(env, this.getSourceName());
lock.lock();
- // Now execute the commands ...
for (GraphCommand command : commands) {
- executeCommand(env, command);
+ executor.execute(command);
}
} finally {
lock.unlock();
}
}
- /**
- * @param env
- * @param command
- */
- protected void executeCommand( ExecutionEnvironment env,
- GraphCommand command ) {
- // This node reference is available for any command that extends ActsOnPath ...
- Node node = null;
-
- if (command instanceof CompositeCommand) {
- CompositeCommand theCommand = (CompositeCommand)command;
- for (GraphCommand containedCommand : theCommand) {
- executeCommand(env, containedCommand);
- }
- }
-
- // First, process the commands that create a new node ...
- if (command instanceof CreateNodeCommand) {
- CreateNodeCommand theCommand = (CreateNodeCommand)command;
- Path path = theCommand.getPath();
- Path parent = path.getAncestor();
- // Look up the parent node, which must exist ...
- Node parentNode = content.getNode(parent);
- node = content.createNode(env, parentNode, path.getLastSegment().getName());
- // Now add the properties to the supplied node ...
- for (Property property : theCommand.getProperties()) {
- Name propName = property.getName();
- if (property.size() == 0) {
- node.getProperties().remove(propName);
- continue;
- }
- node.getProperties().put(propName, property);
- }
- assert node != null;
- }
-
- // Otherwise, check whether the command is applies to a path; all the remaining commands
- // that do so expect the node to exist ...
- else if (command instanceof ActsOnPath) {
- ActsOnPath theCommand = (ActsOnPath)command;
- Path path = theCommand.getPath();
- // Look up the node with the supplied path ...
- node = content.getNode(path);
- if (node == null) throw new InvalidPathException(InMemoryConnectorI18n.nodeDoesNotExist.text(path));
- }
-
- if (command instanceof GetChildrenCommand) {
- GetChildrenCommand theCommand = (GetChildrenCommand)command;
- assert command instanceof ActsOnPath;
- assert node != null;
- // Get the names of the children ...
- List<Node> children = node.getChildren();
- List<Segment> childSegments = new ArrayList<Segment>(children.size());
- for (Node child : children) {
- childSegments.add(child.getName());
- }
- theCommand.setChildren(childSegments);
-
- }
- if (command instanceof GetPropertiesCommand) {
- GetPropertiesCommand theCommand = (GetPropertiesCommand)command;
- assert command instanceof ActsOnPath;
- assert node != null;
- for (Property property : node.getProperties().values()) {
- theCommand.setProperty(property);
- }
- }
- if (command instanceof SetPropertiesCommand) {
- SetPropertiesCommand theCommand = (SetPropertiesCommand)command;
- assert command instanceof ActsOnPath;
- assert node != null;
- // Now set (or remove) the properties to the supplied node ...
- for (Property property : theCommand.getProperties()) {
- Name propName = property.getName();
- if (property.size() == 0) {
- node.getProperties().remove(propName);
- continue;
- }
- node.getProperties().put(propName, property);
- }
- }
- if (command instanceof DeleteBranchCommand) {
- assert command instanceof ActsOnPath;
- assert node != null;
- content.removeNode(env, node);
- }
- if (command instanceof CopyNodeCommand) {
- CopyNodeCommand theCommand = (CopyNodeCommand)command;
- boolean recursive = command instanceof CopyBranchCommand;
- // Look up the new parent, which must exist ...
- Path newPath = theCommand.getNewPath();
- Node newParent = content.getNode(newPath.getAncestor());
- if (newParent == null) {
- throw new InvalidPathException(InMemoryConnectorI18n.nodeDoesNotExist.text(newPath.getAncestor()));
- }
- content.copyNode(env, node, newParent, recursive);
- }
- if (command instanceof MoveBranchCommand) {
- MoveBranchCommand theCommand = (MoveBranchCommand)command;
- assert command instanceof ActsOnPath;
- assert node != null;
- // Look up the new parent, which must exist ...
- Path newPath = theCommand.getNewPath();
- Node newParent = content.getNode(newPath.getAncestor());
- if (newParent == null) {
- throw new InvalidPathException(InMemoryConnectorI18n.nodeDoesNotExist.text(newPath.getAncestor()));
- }
- node.setParent(newParent);
- }
+ protected InMemoryRepository getContent() {
+ return content;
}
/**
Modified: trunk/connectors/dna-connector-jbosscache/pom.xml
===================================================================
--- trunk/connectors/dna-connector-jbosscache/pom.xml 2008-07-03 15:42:34 UTC (rev 339)
+++ trunk/connectors/dna-connector-jbosscache/pom.xml 2008-07-03 18:23:41 UTC (rev 340)
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-core</artifactId>
- <version>2.2.0.CR1</version>
+ <version>2.2.0.CR6</version>
</dependency>
<!--
Testing (note the scope)
Modified: trunk/connectors/dna-connector-jbosscache/src/main/java/org/jboss/dna/connector/jbosscache/JBossCacheConnection.java
===================================================================
--- trunk/connectors/dna-connector-jbosscache/src/main/java/org/jboss/dna/connector/jbosscache/JBossCacheConnection.java 2008-07-03 15:42:34 UTC (rev 339)
+++ trunk/connectors/dna-connector-jbosscache/src/main/java/org/jboss/dna/connector/jbosscache/JBossCacheConnection.java 2008-07-03 18:23:41 UTC (rev 340)
@@ -22,6 +22,7 @@
package org.jboss.dna.connector.jbosscache;
import java.util.ArrayList;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.UUID;
@@ -34,9 +35,8 @@
import org.jboss.dna.spi.graph.Name;
import org.jboss.dna.spi.graph.Path;
import org.jboss.dna.spi.graph.Property;
+import org.jboss.dna.spi.graph.PropertyFactory;
import org.jboss.dna.spi.graph.Path.Segment;
-import org.jboss.dna.spi.graph.commands.ActsOnPath;
-import org.jboss.dna.spi.graph.commands.CompositeCommand;
import org.jboss.dna.spi.graph.commands.CopyBranchCommand;
import org.jboss.dna.spi.graph.commands.CopyNodeCommand;
import org.jboss.dna.spi.graph.commands.CreateNodeCommand;
@@ -45,7 +45,10 @@
import org.jboss.dna.spi.graph.commands.GetPropertiesCommand;
import org.jboss.dna.spi.graph.commands.GraphCommand;
import org.jboss.dna.spi.graph.commands.MoveBranchCommand;
+import org.jboss.dna.spi.graph.commands.RecordBranchCommand;
import org.jboss.dna.spi.graph.commands.SetPropertiesCommand;
+import org.jboss.dna.spi.graph.commands.executor.AbstractCommandExecutor;
+import org.jboss.dna.spi.graph.commands.executor.CommandExecutor;
import org.jboss.dna.spi.graph.connection.ExecutionEnvironment;
import org.jboss.dna.spi.graph.connection.RepositoryConnection;
import org.jboss.dna.spi.graph.connection.RepositorySourceException;
@@ -136,145 +139,15 @@
* {@inheritDoc}
*/
public void execute( ExecutionEnvironment env,
- GraphCommand... commands ) {
- // Set up the workspace ...
-
+ GraphCommand... commands ) throws RepositorySourceException, InterruptedException {
// Now execute the commands ...
+ CommandExecutor executor = new Executor(env, this.getSourceName());
for (GraphCommand command : commands) {
- executeCommand(env, command);
+ executor.execute(command);
}
}
/**
- * @param env
- * @param command
- */
- protected void executeCommand( ExecutionEnvironment env,
- GraphCommand command ) {
- // This node reference is available for any command that extends ActsOnPath ...
- Node<Name, Object> node = null;
-
- if (command instanceof CompositeCommand) {
- CompositeCommand theCommand = (CompositeCommand)command;
- for (GraphCommand containedCommand : theCommand) {
- executeCommand(env, containedCommand);
- }
- }
-
- // First, process the commands that create a new node ...
- if (command instanceof CreateNodeCommand) {
- CreateNodeCommand theCommand = (CreateNodeCommand)command;
- Path path = theCommand.getPath();
- Path parent = path.getAncestor();
- Fqn<Segment> childFqn = getFullyQualifiedName(path.getLastSegment());
- // Look up the parent node, which must exist ...
- Node<Name, Object> parentNode = getNode(env, parent);
- node = parentNode.addChild(childFqn);
- // Add the UUID property (if required), which may be overwritten by a supplied property ...
- Name uuidPropertyName = getUuidProperty(env);
- if (uuidPropertyName != null) {
- node.put(uuidPropertyName, generateUuid());
- }
- // Now add the properties to the supplied node ...
- for (Property property : theCommand.getProperties()) {
- if (property.size() == 0) continue;
- Name propName = property.getName();
- Object value = null;
- if (property.size() == 1) {
- value = property.iterator().next();
- } else {
- value = property.getValuesAsArray();
- }
- node.put(propName, value);
- }
- assert node != null;
- }
-
- // Otherwise, check whether the command is applies to a path; all the remaining commands
- // that do so expect the node to exist ...
- else if (command instanceof ActsOnPath) {
- ActsOnPath theCommand = (ActsOnPath)command;
- Path path = theCommand.getPath();
- // Look up the node with the supplied path ...
- node = getNode(env, path);
- assert node != null;
- }
-
- if (command instanceof GetChildrenCommand) {
- GetChildrenCommand theCommand = (GetChildrenCommand)command;
- assert command instanceof ActsOnPath;
- assert node != null;
- // Get the names of the children ...
- List<Segment> childSegments = new ArrayList<Segment>();
- for (Node<Name, Object> child : node.getChildren()) {
- childSegments.add((Segment)child.getFqn().getLastElement());
- }
- theCommand.setChildren(childSegments);
-
- }
- if (command instanceof GetPropertiesCommand) {
- GetPropertiesCommand theCommand = (GetPropertiesCommand)command;
- assert command instanceof ActsOnPath;
- assert node != null;
- Map<Name, Object> dataMap = node.getData();
- for (Map.Entry<Name, Object> data : dataMap.entrySet()) {
- Name propertyName = data.getKey();
- Object values = data.getValue();
- Property property = env.getPropertyFactory().create(propertyName, values);
- theCommand.setProperty(property);
- }
- }
- if (command instanceof SetPropertiesCommand) {
- SetPropertiesCommand theCommand = (SetPropertiesCommand)command;
- assert command instanceof ActsOnPath;
- assert node != null;
- // Now set (or remove) the properties to the supplied node ...
- for (Property property : theCommand.getProperties()) {
- Name propName = property.getName();
- if (property.size() == 0) {
- node.remove(propName);
- continue;
- }
- Object value = null;
- if (property.size() == 1) {
- value = property.iterator().next();
- } else {
- value = property.getValuesAsArray();
- }
- node.put(propName, value);
- }
- }
- if (command instanceof DeleteBranchCommand) {
- assert command instanceof ActsOnPath;
- assert node != null;
- node.getParent().removeChild(node.getFqn().getLastElement());
- }
- if (command instanceof CopyNodeCommand) {
- CopyNodeCommand theCommand = (CopyNodeCommand)command;
- boolean recursive = command instanceof CopyBranchCommand;
- // Look up the new parent, which must exist ...
- Path newPath = theCommand.getNewPath();
- Node<Name, Object> newParent = getNode(env, newPath.getAncestor());
- copyNode(node, newParent, recursive, null);
- }
- if (command instanceof MoveBranchCommand) {
- MoveBranchCommand theCommand = (MoveBranchCommand)command;
- assert command instanceof ActsOnPath;
- assert node != null;
- boolean recursive = true;
- Name uuidProperty = getUuidProperty(env);
- // Look up the new parent, which must exist ...
- Path newPath = theCommand.getNewPath();
- Node<Name, Object> newParent = getNode(env, newPath.getAncestor());
- copyNode(node, newParent, recursive, uuidProperty);
- // Now delete the old node ...
- Node<Name, Object> oldParent = node.getParent();
- boolean removed = oldParent.removeChild(node.getFqn().getLastElement());
- assert removed;
- }
- }
-
- /**
* @return listener
*/
protected RepositorySourceListener getListener() {
@@ -351,4 +224,154 @@
}
return numNodesCopied;
}
+
+ protected class Executor extends AbstractCommandExecutor {
+
+ private final PropertyFactory propertyFactory;
+
+ protected Executor( ExecutionEnvironment env,
+ String sourceName ) {
+ super(env, sourceName);
+ this.propertyFactory = env.getPropertyFactory();
+ }
+
+ @Override
+ public void execute( CreateNodeCommand command ) {
+ Path path = command.getPath();
+ Path parent = path.getAncestor();
+ Fqn<Segment> childFqn = getFullyQualifiedName(path.getLastSegment());
+ // Look up the parent node, which must exist ...
+ Node<Name, Object> parentNode = getNode(parent);
+ Node<Name, Object> node = parentNode.addChild(childFqn);
+ // Add the UUID property (if required), which may be overwritten by a supplied property ...
+ Name uuidPropertyName = getUuidProperty(getEnvironment());
+ if (uuidPropertyName != null) {
+ node.put(uuidPropertyName, generateUuid());
+ }
+ // Now add the properties to the supplied node ...
+ for (Property property : command.getProperties()) {
+ if (property.size() == 0) continue;
+ Name propName = property.getName();
+ Object value = null;
+ if (property.size() == 1) {
+ value = property.iterator().next();
+ } else {
+ value = property.getValuesAsArray();
+ }
+ node.put(propName, value);
+ }
+ }
+
+ @Override
+ public void execute( GetChildrenCommand command ) {
+ Node<Name, Object> node = getNode(command.getPath());
+ // Get the names of the children ...
+ List<Segment> childSegments = new ArrayList<Segment>();
+ for (Node<Name, Object> child : node.getChildren()) {
+ childSegments.add((Segment)child.getFqn().getLastElement());
+ }
+ command.setChildren(childSegments);
+ }
+
+ @Override
+ public void execute( GetPropertiesCommand command ) {
+ Node<Name, Object> node = getNode(command.getPath());
+ Map<Name, Object> dataMap = node.getData();
+ for (Map.Entry<Name, Object> data : dataMap.entrySet()) {
+ Name propertyName = data.getKey();
+ Object values = data.getValue();
+ Property property = propertyFactory.create(propertyName, values);
+ command.setProperty(property);
+ }
+ }
+
+ @Override
+ public void execute( SetPropertiesCommand command ) {
+ Node<Name, Object> node = getNode(command.getPath());
+ // Now set (or remove) the properties to the supplied node ...
+ for (Property property : command.getProperties()) {
+ Name propName = property.getName();
+ if (property.size() == 0) {
+ node.remove(propName);
+ continue;
+ }
+ Object value = null;
+ if (property.size() == 1) {
+ value = property.iterator().next();
+ } else {
+ value = property.getValuesAsArray();
+ }
+ node.put(propName, value);
+ }
+ }
+
+ @Override
+ public void execute( DeleteBranchCommand command ) {
+ Node<Name, Object> node = getNode(command.getPath());
+ node.getParent().removeChild(node.getFqn().getLastElement());
+ }
+
+ @Override
+ public void execute( CopyNodeCommand command ) {
+ Node<Name, Object> node = getNode(command.getPath());
+ // Look up the new parent, which must exist ...
+ Path newPath = command.getNewPath();
+ Node<Name, Object> newParent = getNode(newPath.getAncestor());
+ copyNode(node, newParent, false, null);
+ }
+
+ @Override
+ public void execute( CopyBranchCommand command ) {
+ Node<Name, Object> node = getNode(command.getPath());
+ // Look up the new parent, which must exist ...
+ Path newPath = command.getNewPath();
+ Node<Name, Object> newParent = getNode(newPath.getAncestor());
+ copyNode(node, newParent, true, null);
+ }
+
+ @Override
+ public void execute( MoveBranchCommand command ) {
+ Node<Name, Object> node = getNode(command.getPath());
+ boolean recursive = true;
+ Name uuidProperty = getUuidProperty(getEnvironment());
+ // Look up the new parent, which must exist ...
+ Path newPath = command.getNewPath();
+ Node<Name, Object> newParent = getNode(newPath.getAncestor());
+ copyNode(node, newParent, recursive, uuidProperty);
+ // Now delete the old node ...
+ Node<Name, Object> oldParent = node.getParent();
+ boolean removed = oldParent.removeChild(node.getFqn().getLastElement());
+ assert removed;
+ }
+
+ @Override
+ public void execute( RecordBranchCommand command ) {
+ Node<Name, Object> node = getNode(command.getPath());
+ recordNode(command, node);
+ }
+
+ protected void recordNode( RecordBranchCommand command,
+ Node<Name, Object> node ) {
+ // Record the properties ...
+ Map<Name, Object> dataMap = node.getData();
+ List<Property> properties = new LinkedList<Property>();
+ for (Map.Entry<Name, Object> data : dataMap.entrySet()) {
+ Name propertyName = data.getKey();
+ Object values = data.getValue();
+ Property property = propertyFactory.create(propertyName, values);
+ properties.add(property);
+ }
+ command.record(command.getPath(), properties);
+ // Now record the children ...
+ for (Node<Name, Object> child : node.getChildren()) {
+ recordNode(command, child);
+ }
+ }
+
+ protected Node<Name, Object> getNode( Path path ) {
+ return JBossCacheConnection.this.getNode(getEnvironment(), path);
+ }
+
+ }
+
}
Added: trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/executor/AbstractCommandExecutor.java
===================================================================
--- trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/executor/AbstractCommandExecutor.java (rev 0)
+++ trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/executor/AbstractCommandExecutor.java 2008-07-03 18:23:41 UTC (rev 340)
@@ -0,0 +1,227 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.dna.spi.graph.commands.executor;
+
+import org.jboss.dna.spi.graph.commands.CompositeCommand;
+import org.jboss.dna.spi.graph.commands.CopyBranchCommand;
+import org.jboss.dna.spi.graph.commands.CopyNodeCommand;
+import org.jboss.dna.spi.graph.commands.CreateNodeCommand;
+import org.jboss.dna.spi.graph.commands.DeleteBranchCommand;
+import org.jboss.dna.spi.graph.commands.GetChildrenCommand;
+import org.jboss.dna.spi.graph.commands.GetNodeCommand;
+import org.jboss.dna.spi.graph.commands.GetPropertiesCommand;
+import org.jboss.dna.spi.graph.commands.GraphCommand;
+import org.jboss.dna.spi.graph.commands.MoveBranchCommand;
+import org.jboss.dna.spi.graph.commands.RecordBranchCommand;
+import org.jboss.dna.spi.graph.commands.SetPropertiesCommand;
+import org.jboss.dna.spi.graph.connection.ExecutionEnvironment;
+import org.jboss.dna.spi.graph.connection.RepositoryConnection;
+import org.jboss.dna.spi.graph.connection.RepositorySourceException;
+
+/**
+ * Abstract implementation of the {@link CommandExecutor} interface that provides implementations for all methods, making this a
+ * useful base class for all {@link CommandExecutor} implementations. Because all methods are implemented, subclasses only need to
+ * override methods that are appropriate or applicable, and all other commands will be processed correctly (even if new command
+ * interfaces are added in later versions). In some cases, as with {@link CompositeCommand} and {@link GetNodeCommand}, these
+ * implementations attempt to process the command. In other cases (e.g., {@link GetPropertiesCommand}, and
+ * {@link DeleteBranchCommand}), the methods do nothing and should be overridden if the command is to be processed.
+ * <p>
+ * The implementation is also designed to be instantated as needed. This may be once per call to
+ * {@link RepositoryConnection#execute(ExecutionEnvironment, GraphCommand...)}, or may be once per transaction. Either way, this
+ * class is designed to allow subclasses to store additional state that may otherwise be expensive or undesirable to obtain
+ * repeatedly. However, this state should be independent of the commands that are processed, meaning that implementations should
+ * generally not change state as a result of processing specific commands.
+ * </p>
+ *
+ * @author Randall Hauch
+ */
+public abstract class AbstractCommandExecutor implements CommandExecutor {
+
+ private final ExecutionEnvironment env;
+ private final String sourceName;
+
+ protected AbstractCommandExecutor( ExecutionEnvironment env,
+ String sourceName ) {
+ assert env != null;
+ assert sourceName != null && sourceName.trim().length() != 0;
+ this.env = env;
+ this.sourceName = sourceName;
+ }
+
+ /**
+ * Get the environment in which these commands are being executed.
+ *
+ * @return the execution environment; never null
+ */
+ public ExecutionEnvironment getEnvironment() {
+ return env;
+ }
+
+ /**
+ * Get the name of the repository source.
+ *
+ * @return the source name; never null or empty
+ */
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ /**
+ * {@inheritDoc}
+ * <p>
+ * This implementation examines the instance to see which {@link GraphCommand command interfaces} are implemented by the
+ * command, and delegates to the appropriate methods.
+ *
+ * @see org.jboss.dna.spi.graph.commands.executor.CommandExecutor#execute(org.jboss.dna.spi.graph.commands.GraphCommand)
+ */
+ public void execute( GraphCommand command ) throws RepositorySourceException, InterruptedException {
+ if (command == null) return;
+ if (command instanceof CompositeCommand) {
+ execute((CompositeCommand)command);
+ // A composite command should only contain other commands and should not do anything on its own
+ return;
+ }
+ // The command could implement multiple "get" behaviors
+ if (command instanceof GetPropertiesCommand) {
+ execute((GetPropertiesCommand)command);
+ }
+ if (command instanceof GetChildrenCommand) {
+ execute((GetChildrenCommand)command);
+ }
+ // The command could record the branch even if deleting or moving ...
+ if (command instanceof RecordBranchCommand) {
+ execute((RecordBranchCommand)command);
+ }
+ // If the command createa a node, it will have properties to set
+ if (command instanceof CreateNodeCommand) {
+ execute((CreateNodeCommand)command);
+ } else if (command instanceof SetPropertiesCommand) {
+ execute((SetPropertiesCommand)command);
+ }
+ // A copy command will either copy a branch or a node, but not both
+ if (command instanceof CopyBranchCommand) {
+ execute((CopyBranchCommand)command);
+ } else if (command instanceof CopyNodeCommand) {
+ execute((CopyNodeCommand)command);
+ }
+ // The command can either delete or move a branch, but a command can't do both (the move does delete)
+ if (command instanceof DeleteBranchCommand) {
+ execute((DeleteBranchCommand)command);
+ } else if (command instanceof MoveBranchCommand) {
+ execute((MoveBranchCommand)command);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.jboss.dna.spi.graph.commands.executor.CommandExecutor#execute(org.jboss.dna.spi.graph.commands.CompositeCommand)
+ */
+ public void execute( CompositeCommand command ) throws RepositorySourceException, InterruptedException {
+ assert command != null;
+ for (GraphCommand nestedCommand : command) {
+ execute(nestedCommand);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.jboss.dna.spi.graph.commands.executor.CommandExecutor#execute(org.jboss.dna.spi.graph.commands.GetPropertiesCommand)
+ */
+ @SuppressWarnings( "unused" )
+ public void execute( GetPropertiesCommand command ) throws RepositorySourceException, InterruptedException {
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.jboss.dna.spi.graph.commands.executor.CommandExecutor#execute(org.jboss.dna.spi.graph.commands.GetChildrenCommand)
+ */
+ @SuppressWarnings( "unused" )
+ public void execute( GetChildrenCommand command ) throws RepositorySourceException, InterruptedException {
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.jboss.dna.spi.graph.commands.executor.CommandExecutor#execute(org.jboss.dna.spi.graph.commands.CreateNodeCommand)
+ */
+ @SuppressWarnings( "unused" )
+ public void execute( CreateNodeCommand command ) throws RepositorySourceException, InterruptedException {
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.jboss.dna.spi.graph.commands.executor.CommandExecutor#execute(org.jboss.dna.spi.graph.commands.SetPropertiesCommand)
+ */
+ @SuppressWarnings( "unused" )
+ public void execute( SetPropertiesCommand command ) throws RepositorySourceException, InterruptedException {
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.jboss.dna.spi.graph.commands.executor.CommandExecutor#execute(org.jboss.dna.spi.graph.commands.CopyNodeCommand)
+ */
+ @SuppressWarnings( "unused" )
+ public void execute( CopyNodeCommand command ) throws RepositorySourceException, InterruptedException {
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.jboss.dna.spi.graph.commands.executor.CommandExecutor#execute(org.jboss.dna.spi.graph.commands.CopyBranchCommand)
+ */
+ @SuppressWarnings( "unused" )
+ public void execute( CopyBranchCommand command ) throws RepositorySourceException, InterruptedException {
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.jboss.dna.spi.graph.commands.executor.CommandExecutor#execute(org.jboss.dna.spi.graph.commands.DeleteBranchCommand)
+ */
+ @SuppressWarnings( "unused" )
+ public void execute( DeleteBranchCommand command ) throws RepositorySourceException, InterruptedException {
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.jboss.dna.spi.graph.commands.executor.CommandExecutor#execute(org.jboss.dna.spi.graph.commands.MoveBranchCommand)
+ */
+ @SuppressWarnings( "unused" )
+ public void execute( MoveBranchCommand command ) throws RepositorySourceException, InterruptedException {
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.jboss.dna.spi.graph.commands.executor.CommandExecutor#execute(org.jboss.dna.spi.graph.commands.RecordBranchCommand)
+ */
+ @SuppressWarnings( "unused" )
+ public void execute( RecordBranchCommand command ) throws RepositorySourceException, InterruptedException {
+ }
+
+}
Property changes on: trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/executor/AbstractCommandExecutor.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/executor/CommandExecutor.java
===================================================================
--- trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/executor/CommandExecutor.java (rev 0)
+++ trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/executor/CommandExecutor.java 2008-07-03 18:23:41 UTC (rev 340)
@@ -0,0 +1,143 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.dna.spi.graph.commands.executor;
+
+import org.jboss.dna.spi.graph.commands.CompositeCommand;
+import org.jboss.dna.spi.graph.commands.CopyBranchCommand;
+import org.jboss.dna.spi.graph.commands.CopyNodeCommand;
+import org.jboss.dna.spi.graph.commands.CreateNodeCommand;
+import org.jboss.dna.spi.graph.commands.DeleteBranchCommand;
+import org.jboss.dna.spi.graph.commands.GetChildrenCommand;
+import org.jboss.dna.spi.graph.commands.GetPropertiesCommand;
+import org.jboss.dna.spi.graph.commands.GraphCommand;
+import org.jboss.dna.spi.graph.commands.MoveBranchCommand;
+import org.jboss.dna.spi.graph.commands.RecordBranchCommand;
+import org.jboss.dna.spi.graph.commands.SetPropertiesCommand;
+import org.jboss.dna.spi.graph.connection.RepositorySourceException;
+
+/**
+ * @author Randall Hauch
+ */
+public interface CommandExecutor {
+
+ /**
+ * Execute a graph command. This method should examine the command's types to determine which other <code>execute</code>
+ * methods should be called, and should then call those methods. This method should also do nothing if the command is null.
+ *
+ * @param command the command to be executed
+ * @throws RepositorySourceException if there is an error executing the command
+ * @throws InterruptedException if the thread is interrupted during execution
+ */
+ void execute( GraphCommand command ) throws RepositorySourceException, InterruptedException;
+
+ /**
+ * Execute a composite command that contains other commands. This method should simply obtain and execute each of the nested
+ * commands.
+ *
+ * @param command the command to be executed; may not be null
+ * @throws RepositorySourceException if there is an error executing the command
+ * @throws InterruptedException if the thread is interrupted during execution
+ */
+ void execute( CompositeCommand command ) throws RepositorySourceException, InterruptedException;
+
+ /**
+ * Execute a command to get the properties of a node.
+ *
+ * @param command the command to be executed; may not be null
+ * @throws RepositorySourceException if there is an error executing the command
+ * @throws InterruptedException if the thread is interrupted during execution
+ */
+ void execute( GetPropertiesCommand command ) throws RepositorySourceException, InterruptedException;
+
+ /**
+ * Execute a command to get the children of a node.
+ *
+ * @param command the command to be executed; may not be null
+ * @throws RepositorySourceException if there is an error executing the command
+ * @throws InterruptedException if the thread is interrupted during execution
+ */
+ void execute( GetChildrenCommand command ) throws RepositorySourceException, InterruptedException;
+
+ /**
+ * Execute a command to create a node and set the node's properties.
+ *
+ * @param command the command to be executed; may not be null
+ * @throws RepositorySourceException if there is an error executing the command
+ * @throws InterruptedException if the thread is interrupted during execution
+ */
+ void execute( CreateNodeCommand command ) throws RepositorySourceException, InterruptedException;
+
+ /**
+ * Execute a command to set some (or all) of the properties on a node.
+ *
+ * @param command the command to be executed; may not be null
+ * @throws RepositorySourceException if there is an error executing the command
+ * @throws InterruptedException if the thread is interrupted during execution
+ */
+ void execute( SetPropertiesCommand command ) throws RepositorySourceException, InterruptedException;
+
+ /**
+ * Execute a command to copy a node to a new location.
+ *
+ * @param command the command to be executed; may not be null
+ * @throws RepositorySourceException if there is an error executing the command
+ * @throws InterruptedException if the thread is interrupted during execution
+ */
+ void execute( CopyNodeCommand command ) throws RepositorySourceException, InterruptedException;
+
+ /**
+ * Execute a command to copy an entire branch to a new location.
+ *
+ * @param command the command to be executed; may not be null
+ * @throws RepositorySourceException if there is an error executing the command
+ * @throws InterruptedException if the thread is interrupted during execution
+ */
+ void execute( CopyBranchCommand command ) throws RepositorySourceException, InterruptedException;
+
+ /**
+ * Execute a command to record the structure of a branch.
+ *
+ * @param command the command to be executed; may not be null
+ * @throws RepositorySourceException if there is an error executing the command
+ * @throws InterruptedException if the thread is interrupted during execution
+ */
+ void execute( RecordBranchCommand command ) throws RepositorySourceException, InterruptedException;
+
+ /**
+ * Execute a command to delete an entire branch.
+ *
+ * @param command the command to be executed; may not be null
+ * @throws RepositorySourceException if there is an error executing the command
+ * @throws InterruptedException if the thread is interrupted during execution
+ */
+ void execute( DeleteBranchCommand command ) throws RepositorySourceException, InterruptedException;
+
+ /**
+ * Execute a command to move a branch from one location to another.
+ *
+ * @param command the command to be executed; may not be null
+ * @throws RepositorySourceException if there is an error executing the command
+ * @throws InterruptedException if the thread is interrupted during execution
+ */
+ void execute( MoveBranchCommand command ) throws RepositorySourceException, InterruptedException;
+
+}
Property changes on: trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/commands/executor/CommandExecutor.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/dna-spi/src/test/java/org/jboss/dna/spi/graph/commands/executor/AbstractCommandExecutorTest.java
===================================================================
--- trunk/dna-spi/src/test/java/org/jboss/dna/spi/graph/commands/executor/AbstractCommandExecutorTest.java (rev 0)
+++ trunk/dna-spi/src/test/java/org/jboss/dna/spi/graph/commands/executor/AbstractCommandExecutorTest.java 2008-07-03 18:23:41 UTC (rev 340)
@@ -0,0 +1,278 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.dna.spi.graph.commands.executor;
+
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsSame.sameInstance;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.stub;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.jboss.dna.spi.graph.commands.CompositeCommand;
+import org.jboss.dna.spi.graph.commands.CopyBranchCommand;
+import org.jboss.dna.spi.graph.commands.CopyNodeCommand;
+import org.jboss.dna.spi.graph.commands.CreateNodeCommand;
+import org.jboss.dna.spi.graph.commands.DeleteBranchCommand;
+import org.jboss.dna.spi.graph.commands.GetChildrenCommand;
+import org.jboss.dna.spi.graph.commands.GetNodeCommand;
+import org.jboss.dna.spi.graph.commands.GetPropertiesCommand;
+import org.jboss.dna.spi.graph.commands.GraphCommand;
+import org.jboss.dna.spi.graph.commands.MoveBranchCommand;
+import org.jboss.dna.spi.graph.commands.RecordBranchCommand;
+import org.jboss.dna.spi.graph.commands.SetPropertiesCommand;
+import org.jboss.dna.spi.graph.connection.ExecutionEnvironment;
+import org.jboss.dna.spi.graph.connection.RepositorySourceException;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.MockitoAnnotations;
+import org.mockito.MockitoAnnotations.Mock;
+
+/**
+ * @author Randall Hauch
+ */
+public class AbstractCommandExecutorTest {
+
+ private static final List<GraphCommand> EMPTY_COMMAND_LIST = Collections.emptyList();
+ private static final List<GraphCommand> NULL_COMMAND_LIST = Collections.singletonList(null);
+
+ private AbstractCommandExecutor executor;
+ private GraphCommand command;
+ @Mock
+ private ExecutionEnvironment env;
+ @Mock
+ protected CommandExecutor validator;
+
+ @Before
+ public void beforeEach() throws Exception {
+ MockitoAnnotations.initMocks(this);
+ executor = new ExecutorImpl(env, "Source X", validator);
+ }
+
+ @Test
+ public void shouldHaveEnvironment() {
+ assertThat(executor.getEnvironment(), is(sameInstance(env)));
+ }
+
+ @Test
+ public void shouldIgnoreNullCommands() throws Exception {
+ executor.execute(command);
+ verify(validator, times(1)).execute(command);
+ verifyNoMoreInteractions(validator);
+ }
+
+ @Test( expected = AssertionError.class )
+ public void shouldNotAllowNullCompositeCommand() throws Exception {
+ executor.execute((CompositeCommand)null);
+ }
+
+ @Test
+ public void shouldCorrectlyExecuteEmptyCompositeCommandByCallingNoOtherExecuteMethods() throws Exception {
+ CompositeCommand command = mock(CompositeCommand.class);
+ stub(command.iterator()).toReturn(EMPTY_COMMAND_LIST.iterator());
+ executor.execute(command);
+ verify(validator, times(1)).execute(command);
+ verifyNoMoreInteractions(validator);
+ }
+
+ @Test
+ public void shouldCorrectlyExecuteCompositeCommandWithSingleNullValueByCallingNoOtherExecuteMethods() throws Exception {
+ CompositeCommand command = mock(CompositeCommand.class);
+ stub(command.iterator()).toReturn(NULL_COMMAND_LIST.iterator());
+ executor.execute(command);
+ verify(validator, times(1)).execute((GraphCommand)null);
+ verify(validator, times(1)).execute(command);
+ verifyNoMoreInteractions(validator);
+ }
+
+ @Test
+ public void shouldCorrectlyExecuteCompositeCommandWithNullValueByCallingNoOtherExecuteMethods() throws Exception {
+ CreateNodeCommand createNodeCommand = mock(CreateNodeCommand.class);
+ GetNodeCommand getNodeCommand = mock(GetNodeCommand.class);
+ CompositeCommand command = mock(CompositeCommand.class);
+ stub(command.iterator()).toReturn(Arrays.asList(new GraphCommand[] {createNodeCommand, getNodeCommand, null,
+ getNodeCommand}).iterator());
+ executor.execute(command);
+ verify(validator, times(1)).execute(command);
+ verify(validator, times(1)).execute((GraphCommand)null);
+ verify(validator, times(1)).execute((GraphCommand)createNodeCommand);
+ verify(validator, times(2)).execute((GraphCommand)getNodeCommand);
+ verify(validator, times(2)).execute((GetPropertiesCommand)getNodeCommand);
+ verify(validator, times(2)).execute((GetChildrenCommand)getNodeCommand);
+ verify(validator, times(1)).execute(createNodeCommand);
+ verifyNoMoreInteractions(validator);
+ }
+
+ @Test
+ public void shouldCorrectlyDelegateCompositeCommands() throws Exception {
+ CreateNodeCommand createNodeCommand = mock(CreateNodeCommand.class);
+ GetNodeCommand getNodeCommand = mock(GetNodeCommand.class);
+ CompositeCommand command = mock(CompositeCommand.class);
+ stub(command.iterator()).toReturn(Arrays.asList(new GraphCommand[] {createNodeCommand, getNodeCommand, getNodeCommand}).iterator());
+ executor.execute(command);
+ verify(validator, times(1)).execute(command);
+ verify(validator, times(1)).execute((GraphCommand)createNodeCommand);
+ verify(validator, times(2)).execute((GraphCommand)getNodeCommand);
+ verify(validator, times(2)).execute((GetPropertiesCommand)getNodeCommand);
+ verify(validator, times(2)).execute((GetChildrenCommand)getNodeCommand);
+ verify(validator, times(1)).execute(createNodeCommand);
+ verifyNoMoreInteractions(validator);
+ }
+
+ @Test
+ public void shouldExecuteGetPropertiesAndGetChildrenCommandsForGetNodeCommand() throws Exception {
+ GetNodeCommand getNodeCommand = mock(GetNodeCommand.class);
+ executor.execute((GraphCommand)getNodeCommand);
+ verify(validator, times(1)).execute((GraphCommand)getNodeCommand);
+ verify(validator, times(1)).execute((GetPropertiesCommand)getNodeCommand);
+ verify(validator, times(1)).execute((GetChildrenCommand)getNodeCommand);
+ verifyNoMoreInteractions(validator);
+ }
+
+ @Test
+ public void shouldExecuteEitherCopyBranchOrCopyNodeCommandButNotBoth() throws Exception {
+ CopyBranchCommand copyBranchCommand = mock(CopyBranchCommand.class);
+ CopyNodeCommand copyNodeCommand = mock(CopyNodeCommand.class);
+ executor.execute((GraphCommand)copyBranchCommand);
+ verify(validator, times(1)).execute((GraphCommand)copyBranchCommand);
+ verify(validator, times(1)).execute(copyBranchCommand);
+ verify(validator, times(0)).execute(copyNodeCommand);
+ executor.execute((GraphCommand)copyNodeCommand);
+ verify(validator, times(1)).execute((GraphCommand)copyNodeCommand);
+ verify(validator, times(1)).execute(copyBranchCommand);
+ verify(validator, times(1)).execute(copyNodeCommand);
+ verifyNoMoreInteractions(validator);
+ }
+
+ @Test
+ public void shouldExecuteEitherCreateNodeOrSetPropertiesCommandButNotBoth() throws Exception {
+ CreateNodeCommand createNodeCommand = mock(CreateNodeCommand.class);
+ SetPropertiesCommand setPropertiesCommand = mock(SetPropertiesCommand.class);
+ executor.execute((GraphCommand)createNodeCommand);
+ verify(validator, times(1)).execute((GraphCommand)createNodeCommand);
+ verify(validator, times(1)).execute(createNodeCommand);
+ verify(validator, times(0)).execute(setPropertiesCommand);
+ executor.execute((GraphCommand)setPropertiesCommand);
+ verify(validator, times(1)).execute((GraphCommand)setPropertiesCommand);
+ verify(validator, times(1)).execute(createNodeCommand);
+ verify(validator, times(1)).execute(setPropertiesCommand);
+ verifyNoMoreInteractions(validator);
+ }
+
+ @Test
+ public void shouldExecuteEitherDeleteOrMoveBranchComamndButNotBoth() throws Exception {
+ DeleteBranchCommand deleteBranchCommand = mock(DeleteBranchCommand.class);
+ MoveBranchCommand moveBranchCommand = mock(MoveBranchCommand.class);
+ executor.execute((GraphCommand)deleteBranchCommand);
+ verify(validator, times(1)).execute((GraphCommand)deleteBranchCommand);
+ verify(validator, times(1)).execute(deleteBranchCommand);
+ verify(validator, times(0)).execute(moveBranchCommand);
+ executor.execute((GraphCommand)moveBranchCommand);
+ verify(validator, times(1)).execute((GraphCommand)moveBranchCommand);
+ verify(validator, times(1)).execute(deleteBranchCommand);
+ verify(validator, times(1)).execute(moveBranchCommand);
+ verifyNoMoreInteractions(validator);
+ }
+
+ @Test
+ public void shouldExecuteRecordBranchCommand() throws Exception {
+ RecordBranchCommand recordBranchCommand = mock(RecordBranchCommand.class);
+ executor.execute((GraphCommand)recordBranchCommand);
+ verify(validator, times(1)).execute((GraphCommand)recordBranchCommand);
+ verify(validator, times(1)).execute(recordBranchCommand);
+ verifyNoMoreInteractions(validator);
+ }
+
+ protected static class ExecutorImpl extends AbstractCommandExecutor {
+
+ private final CommandExecutor validator;
+
+ protected ExecutorImpl( ExecutionEnvironment env,
+ String name,
+ CommandExecutor validator ) {
+ super(env, name);
+ this.validator = validator;
+ }
+
+ @Override
+ public void execute( GraphCommand command ) throws RepositorySourceException, InterruptedException {
+ super.execute(command);
+ validator.execute(command);
+ }
+
+ @Override
+ public void execute( CompositeCommand command ) throws RepositorySourceException, InterruptedException {
+ super.execute(command);
+ validator.execute(command);
+ }
+
+ @Override
+ public void execute( CopyBranchCommand command ) throws RepositorySourceException, InterruptedException {
+ validator.execute(command);
+ }
+
+ @Override
+ public void execute( CopyNodeCommand command ) throws RepositorySourceException, InterruptedException {
+ validator.execute(command);
+ }
+
+ @Override
+ public void execute( CreateNodeCommand command ) throws RepositorySourceException, InterruptedException {
+ validator.execute(command);
+ }
+
+ @Override
+ public void execute( DeleteBranchCommand command ) throws RepositorySourceException, InterruptedException {
+ validator.execute(command);
+ }
+
+ @Override
+ public void execute( GetChildrenCommand command ) throws RepositorySourceException, InterruptedException {
+ validator.execute(command);
+ }
+
+ @Override
+ public void execute( GetPropertiesCommand command ) throws RepositorySourceException, InterruptedException {
+ validator.execute(command);
+ }
+
+ @Override
+ public void execute( MoveBranchCommand command ) throws RepositorySourceException, InterruptedException {
+ validator.execute(command);
+ }
+
+ @Override
+ public void execute( RecordBranchCommand command ) throws RepositorySourceException, InterruptedException {
+ validator.execute(command);
+ }
+
+ @Override
+ public void execute( SetPropertiesCommand command ) throws RepositorySourceException, InterruptedException {
+ validator.execute(command);
+ }
+ }
+
+}
Property changes on: trunk/dna-spi/src/test/java/org/jboss/dna/spi/graph/commands/executor/AbstractCommandExecutorTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 5 months
- 1
- 0
DNA SVN: r339 - in trunk: dna-repository/src/test/java/org/jboss/dna/repository/federation and 1 other directories.
by dna-commits＠lists.jboss.org
Author: rhauch
Date: 2008-07-03 11:42:34 -0400 (Thu, 03 Jul 2008)
New Revision: 339
Added:
trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/connection/RepositoryConnectionFactories.java
Removed:
trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederatedNode.java
trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/RepositoryConnectionFactories.java
Modified:
trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederatedRepository.java
trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederatedRepositoryConnection.java
trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederatedRepositorySource.java
trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederationService.java
trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/RepositorySourceManager.java
trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederatedRepositoryConnectionTest.java
trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederatedRepositorySourceTest.java
trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederatedRepositoryTest.java
trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederationServiceTest.java
Log:
DNA-115 - Create federation service
http://jira.jboss.com/jira/browse/DNA-115
Additional tests and changes to FederatedRepository, FederationService, and FederatedRepositoryConnection. Moved RepositoryConnectionFactories to the SPI.
Deleted: trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederatedNode.java
===================================================================
--- trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederatedNode.java 2008-07-03 15:40:44 UTC (rev 338)
+++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederatedNode.java 2008-07-03 15:42:34 UTC (rev 339)
@@ -1,140 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.dna.repository.federation;
-
-import java.util.Iterator;
-import java.util.Set;
-import java.util.UUID;
-import net.jcip.annotations.ThreadSafe;
-import org.jboss.dna.spi.graph.Name;
-import org.jboss.dna.spi.graph.Property;
-
-/**
- * @author Randall Hauch
- */
-@ThreadSafe
-public interface FederatedNode {
- /**
- * Get the unique identifier for this federated node.
- *
- * @return the UUID; never null
- */
- UUID getUuid();
-
- /**
- * Get the name of this node.
- *
- * @return the node name; never null
- */
- Name getName();
-
- /**
- * Get the property with the given name.
- *
- * @param propertyName the property name
- * @return the property, or null if the property does not exist
- * @throws IllegalArgumentException if the name is null
- */
- Property getProperty( Name propertyName );
-
- /**
- * Get the number of properties on this node. This value is technically an estimate, as it may not exactly match the number of
- * properties returned by {@link #getProperties()} or {@link #getPropertyNames()}.
- *
- * @return the approximate number of properties.
- */
- int getPropertyCount();
-
- /**
- * Get the properties. This method returns a consistent set of properties at the moment this method is called, and is not
- * affected by additions or change to the properties. In other words, it is safe for concurrent operations and is not a
- * fail-fast iterator.
- *
- * @return the properties on this node via an immutable iterator
- */
- Iterator<Property> getProperties();
-
- /**
- * Get the names of the properties for this node. This method returns a consistent set of names at the moment this method is
- * called, and is not affected by additions or change to the properties. In other words, it is safe for concurrent operations
- * and is not a fail-fast iterator.
- *
- * @return the property names via an immutable iterator
- */
- Iterator<Name> getPropertyNames();
-
- /**
- * Set the property if it is not already set.
- *
- * @param property the property
- * @return the existing property, or null if there was no property and the supplied property was set
- * @throws IllegalArgumentException if the property is null
- */
- Property setPropertyIfAbsent( Property property );
-
- /**
- * Set the supplied properties. This method will overwrite any existing properties with the new properties if they have the
- * same {@link Property#getName() property name}. This method ignores any null property references, and does nothing if there
- * are no properties supplied.
- *
- * @param properties the properties that should be set
- */
- void setProperties( Property... properties );
-
- /**
- * Set the supplied properties. This method will overwrite any existing properties with the new properties if they have the
- * same {@link Property#getName() property name}. This method ignores any null property references, and does nothing if there
- * are no properties supplied.
- *
- * @param properties the properties that should be set
- */
- void setProperties( Iterable<Property> properties );
-
- /**
- * Replace all existing properties with the supplied properties. This method ignores any null property references, and does
- * nothing if there are no properties supplied.
- *
- * @param properties the properties that should be set
- */
- void setAllProperties( Property... properties );
-
- /**
- * Replace all existing properties with the supplied properties. This method ignores any null property references, and does
- * nothing if there are no properties supplied.
- *
- * @param properties the properties that should replace the existing properties
- */
- void setAllProperties( Iterable<Property> properties );
-
- /**
- * Remove all properties, except for the {@link #getName() name} and {@link #getUuid() identifier}.
- */
- void removeAllProperties();
-
- /**
- * Get the sources that have contributed information to this node.
- *
- * @return the names of the sources that have contributed content to this node.
- */
- Set<String> getContributingSources();
-
-}
Modified: trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederatedRepository.java
===================================================================
--- trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederatedRepository.java 2008-07-03 15:40:44 UTC (rev 338)
+++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederatedRepository.java 2008-07-03 15:42:34 UTC (rev 339)
@@ -23,7 +23,10 @@
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
import net.jcip.annotations.ThreadSafe;
import org.jboss.dna.common.util.ArgCheck;
import org.jboss.dna.repository.RepositoryI18n;
@@ -31,6 +34,7 @@
import org.jboss.dna.repository.services.ServiceAdministrator;
import org.jboss.dna.spi.graph.connection.ExecutionEnvironment;
import org.jboss.dna.spi.graph.connection.RepositoryConnection;
+import org.jboss.dna.spi.graph.connection.RepositoryConnectionFactories;
import org.jboss.dna.spi.graph.connection.RepositorySource;
import org.jboss.dna.spi.graph.connection.RepositorySourceListener;
@@ -96,6 +100,9 @@
private final ExecutionEnvironment env;
private final RepositoryConnectionFactories connectionFactories;
private FederatedRepositoryConfig config;
+ private final AtomicInteger openConnections = new AtomicInteger(0);
+ private final CountDownLatch shutdownLatch = new CountDownLatch(1);
+ private final AtomicBoolean shutdownRequested = new AtomicBoolean(false);
private final CopyOnWriteArrayList<RepositorySourceListener> listeners = new CopyOnWriteArrayList<RepositorySourceListener>();
/**
@@ -154,18 +161,16 @@
/**
* Utility method called by the administrator.
*/
- protected void startRepository() {
- // Look for the sources in the repository, creating any that are missing
- // Look for the
+ protected synchronized void startRepository() {
// Do not establish connections to the sources; these will be established as needed
-
}
/**
* Utility method called by the administrator.
*/
- protected void shutdownRepository() {
- // Connections to this repository check before doing anything with this, so no need to do anything to them ...
+ protected synchronized void shutdownRepository() {
+ this.shutdownRequested.set(true);
+ if (this.openConnections.get() <= 0) shutdownLatch.countDown();
}
/**
@@ -173,37 +178,23 @@
*
* @param timeout
* @param unit
- * @return true if all pools were terminated in the supplied time (or were already terminated), or false if the timeout
- * occurred before all the connections were closed
+ * @return true if all connections open at the time this method is called were {@link RepositoryConnection#close() closed} in
+ * the supplied time, or false if the timeout occurred before all the connections were closed
* @throws InterruptedException
*/
protected boolean awaitTermination( long timeout,
TimeUnit unit ) throws InterruptedException {
- return true;
+ // Await until all connections have been closed, or until the timeout occurs
+ return shutdownLatch.await(timeout, unit);
}
/**
- * Returns true if this federated repository is in the process of terminating after {@link ServiceAdministrator#shutdown()}
- * has been called on the {@link #getAdministrator() administrator}, but the federated repository has connections that have
- * not yet normally been {@link RepositoryConnection#close() closed}. This method may be useful for debugging. A return of
- * <tt>true</tt> reported a sufficient period after shutdown may indicate that connection users have ignored or suppressed
- * interruption, causing this repository not to properly terminate.
- *
- * @return true if terminating but not yet terminated, or false otherwise
- * @see #isTerminated()
- */
- public boolean isTerminating() {
- return false;
- }
-
- /**
* Return true if this federated repository has completed its termination and no longer has any open connections.
*
* @return true if terminated, or false otherwise
- * @see #isTerminating()
*/
- public boolean isTerminated() {
- return false;
+ protected boolean isTerminated() {
+ return this.openConnections.get() != 0;
}
/**
@@ -245,13 +236,15 @@
/**
* Authenticate the supplied username with the supplied credentials, and return whether authentication was successful.
*
+ * @param source the {@link RepositorySource} that should be affiliated with the resulting connection
* @param username the username
* @param credentials the credentials
- * @return true if authentication succeeded, or false otherwise
+ * @return the repository connection if authentication succeeded, or null otherwise
*/
- public boolean authenticate( String username,
- Object credentials ) {
- return true;
+ public RepositoryConnection createConnection( RepositorySource source,
+ String username,
+ Object credentials ) {
+ return new FederatedRepositoryConnection(this, source.getName());
}
/**
@@ -279,4 +272,26 @@
this.config = config;
}
+ /**
+ * Called by {@link FederatedRepositoryConnection#FederatedRepositoryConnection(FederatedRepository, String)
+ * FederatedRepositoryConnection constructor}.
+ *
+ * @param federatedRepositoryConnection
+ */
+ /*package*/void register( FederatedRepositoryConnection federatedRepositoryConnection ) {
+ openConnections.incrementAndGet();
+ }
+
+ /**
+ * Called by {@link FederatedRepositoryConnection#close()}.
+ *
+ * @param federatedRepositoryConnection
+ */
+ /*package*/void unregister( FederatedRepositoryConnection federatedRepositoryConnection ) {
+ if (openConnections.decrementAndGet() <= 0 && shutdownRequested.get()) {
+ // Last connection, so turn out the lights ...
+ shutdownLatch.countDown();
+ }
+ }
+
}
Modified: trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederatedRepositoryConnection.java
===================================================================
--- trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederatedRepositoryConnection.java 2008-07-03 15:40:44 UTC (rev 338)
+++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederatedRepositoryConnection.java 2008-07-03 15:42:34 UTC (rev 339)
@@ -22,10 +22,12 @@
package org.jboss.dna.repository.federation;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
import javax.transaction.xa.XAResource;
import net.jcip.annotations.ThreadSafe;
import org.jboss.dna.repository.RepositoryI18n;
import org.jboss.dna.spi.cache.CachePolicy;
+import org.jboss.dna.spi.graph.commands.CompositeCommand;
import org.jboss.dna.spi.graph.commands.GraphCommand;
import org.jboss.dna.spi.graph.connection.ExecutionEnvironment;
import org.jboss.dna.spi.graph.connection.RepositoryConnection;
@@ -39,7 +41,6 @@
public class FederatedRepositoryConnection implements RepositoryConnection {
protected static final RepositorySourceListener NO_OP_LISTENER = new RepositorySourceListener() {
-
public void notify( String sourceName,
Object... events ) {
// do nothing
@@ -47,15 +48,17 @@
};
private final FederatedRepository repository;
- private final FederatedRepositorySource source;
- private RepositorySourceListener listener = NO_OP_LISTENER;
+ private final String sourceName;
+ private final AtomicReference<RepositorySourceListener> listener;
protected FederatedRepositoryConnection( FederatedRepository repository,
- FederatedRepositorySource source ) {
- assert source != null;
+ String sourceName ) {
+ assert sourceName != null;
assert repository != null;
- this.source = source;
+ this.sourceName = sourceName;
this.repository = repository;
+ this.listener = new AtomicReference<RepositorySourceListener>(NO_OP_LISTENER);
+ this.repository.register(this);
}
/**
@@ -66,17 +69,10 @@
}
/**
- * @return source
- */
- protected FederatedRepositorySource getRepositorySource() {
- return this.source;
- }
-
- /**
* {@inheritDoc}
*/
public String getSourceName() {
- return this.source.getName();
+ return this.sourceName;
}
/**
@@ -97,9 +93,9 @@
* {@inheritDoc}
*/
public void setListener( RepositorySourceListener listener ) {
- RepositorySourceListener oldListener = this.listener;
- this.listener = listener != null ? listener : NO_OP_LISTENER;
- this.repository.addListener(this.listener);
+ if (listener == null) listener = NO_OP_LISTENER;
+ RepositorySourceListener oldListener = this.listener.getAndSet(listener);
+ this.repository.addListener(listener);
if (oldListener != NO_OP_LISTENER) {
this.repository.removeListener(oldListener);
}
@@ -123,16 +119,34 @@
}
if (commands == null || commands.length == 0) return;
+ FederatedRepositoryConfig config = this.repository.getConfiguration();
for (GraphCommand command : commands) {
if (command == null) continue;
+ executeCommand(env, command, config);
}
}
+ protected void executeCommand( ExecutionEnvironment env,
+ GraphCommand command,
+ FederatedRepositoryConfig config ) {
+ if (command instanceof CompositeCommand) {
+ CompositeCommand composite = (CompositeCommand)command;
+ for (GraphCommand nestedCommand : composite) {
+ if (nestedCommand == null) continue;
+ executeCommand(env, nestedCommand, config);
+ }
+ }
+ }
+
/**
* {@inheritDoc}
*/
public void close() {
- this.repository.removeListener(this.listener);
+ try {
+ this.repository.removeListener(this.listener.get());
+ } finally {
+ this.repository.unregister(this);
+ }
}
}
Modified: trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederatedRepositorySource.java
===================================================================
--- trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederatedRepositorySource.java 2008-07-03 15:40:44 UTC (rev 338)
+++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederatedRepositorySource.java 2008-07-03 15:42:34 UTC (rev 339)
@@ -31,6 +31,7 @@
import javax.naming.StringRefAddr;
import javax.naming.spi.ObjectFactory;
import net.jcip.annotations.ThreadSafe;
+import org.jboss.dna.common.i18n.I18n;
import org.jboss.dna.common.util.ArgCheck;
import org.jboss.dna.repository.RepositoryI18n;
import org.jboss.dna.spi.graph.connection.RepositoryConnection;
@@ -64,9 +65,8 @@
private String credentials;
/**
- * Create a new instance of the source, which must still be properly initialized with a
- * {@link #setRepositoryName(String) repository name} and a reference to the
- * {@link #setFederationService(FederationService) federation service}.
+ * Create a new instance of the source, which must still be properly initialized with a {@link #setRepositoryName(String)
+ * repository name} and a reference to the {@link #setFederationService(FederationService) federation service}.
*/
public FederatedRepositorySource() {
}
@@ -122,19 +122,19 @@
// Find the repository ...
FederatedRepository repository = federationService.getRepository(this.repositoryName);
if (repository == null) {
- throw new RepositorySourceException(
- RepositoryI18n.unableToCreateConnectionToFederatedRepository.text(this.repositoryName));
+ I18n msg = RepositoryI18n.unableToCreateConnectionToFederatedRepository;
+ throw new RepositorySourceException(msg.text(this.repositoryName));
}
// Authenticate the user ...
String username = this.username;
Object credentials = this.credentials;
- if (!repository.authenticate(username, credentials)) {
- throw new RepositorySourceException(
- RepositoryI18n.unableToAuthenticateConnectionToFederatedRepository.text(this.repositoryName,
- username));
+ RepositoryConnection connection = repository.createConnection(this, username, credentials);
+ if (connection == null) {
+ I18n msg = RepositoryI18n.unableToAuthenticateConnectionToFederatedRepository;
+ throw new RepositorySourceException(msg.text(this.repositoryName, username));
}
// Return the new connection ...
- return new FederatedRepositoryConnection(repository, this);
+ return connection;
}
/**
Modified: trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederationService.java
===================================================================
--- trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederationService.java 2008-07-03 15:40:44 UTC (rev 338)
+++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/FederationService.java 2008-07-03 15:42:34 UTC (rev 339)
@@ -101,6 +101,7 @@
@Override
protected void doShutdown( State fromState ) {
super.doShutdown(fromState);
+ FederationService.this.shutdownService();
}
/**
Deleted: trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/RepositoryConnectionFactories.java
===================================================================
--- trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/RepositoryConnectionFactories.java 2008-07-03 15:40:44 UTC (rev 338)
+++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/RepositoryConnectionFactories.java 2008-07-03 15:42:34 UTC (rev 339)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.dna.repository.federation;
-
-import org.jboss.dna.spi.graph.connection.RepositoryConnectionFactory;
-
-/**
- * @author Randall Hauch
- */
-public interface RepositoryConnectionFactories {
-
- RepositoryConnectionFactory getConnectionFactory( String sourceName );
-
-}
Modified: trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/RepositorySourceManager.java
===================================================================
--- trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/RepositorySourceManager.java 2008-07-03 15:40:44 UTC (rev 338)
+++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/RepositorySourceManager.java 2008-07-03 15:42:34 UTC (rev 339)
@@ -32,6 +32,7 @@
import org.jboss.dna.repository.services.AbstractServiceAdministrator;
import org.jboss.dna.repository.services.ServiceAdministrator;
import org.jboss.dna.spi.graph.connection.RepositoryConnection;
+import org.jboss.dna.spi.graph.connection.RepositoryConnectionFactories;
import org.jboss.dna.spi.graph.connection.RepositoryConnectionFactory;
import org.jboss.dna.spi.graph.connection.RepositoryConnectionPool;
import org.jboss.dna.spi.graph.connection.RepositorySource;
@@ -331,7 +332,7 @@
/**
* {@inheritDoc}
*
- * @see org.jboss.dna.repository.federation.RepositoryConnectionFactories#getConnectionFactory(java.lang.String)
+ * @see org.jboss.dna.spi.graph.connection.RepositoryConnectionFactories#getConnectionFactory(java.lang.String)
*/
public RepositoryConnectionFactory getConnectionFactory( String sourceName ) {
RepositoryConnectionFactory result = this.sources.get(sourceName);
Modified: trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederatedRepositoryConnectionTest.java
===================================================================
--- trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederatedRepositoryConnectionTest.java 2008-07-03 15:40:44 UTC (rev 338)
+++ trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederatedRepositoryConnectionTest.java 2008-07-03 15:42:34 UTC (rev 339)
@@ -59,24 +59,15 @@
sourceName = "Source X";
stub(source.getName()).toReturn(sourceName);
stub(repository.getAdministrator()).toReturn(repositoryAdmin);
- connection = new FederatedRepositoryConnection(repository, source);
+ connection = new FederatedRepositoryConnection(repository, sourceName);
}
@Test
- public void shouldHaveSourceAndRepository() {
+ public void shouldHaveRepository() {
assertThat(connection.getRepository(), is(repository));
- assertThat(connection.getRepositorySource(), is(source));
}
@Test
- public void shouldGetSourceNameFromSource() {
- for (int i = 0; i != 10; ++i) {
- assertThat(connection.getSourceName(), is(sourceName));
- }
- verify(source, times(10)).getName();
- }
-
- @Test
public void shouldHaveNoXaResource() {
assertThat(connection.getXAResource(), is(nullValue()));
}
Modified: trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederatedRepositorySourceTest.java
===================================================================
--- trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederatedRepositorySourceTest.java 2008-07-03 15:40:44 UTC (rev 338)
+++ trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederatedRepositorySourceTest.java 2008-07-03 15:42:34 UTC (rev 339)
@@ -50,6 +50,7 @@
public class FederatedRepositorySourceTest {
private FederatedRepositorySource source;
+ @Mock
private FederatedRepositoryConnection connection;
@Mock
private FederatedRepository repository;
@@ -75,18 +76,17 @@
@Test
public void shouldCreateConnectionsByAuthenticateUsingFederationRepository() throws Exception {
- stub(repository.authenticate(source.getUsername(), source.getCredentials())).toReturn(true);
+ stub(repository.createConnection(source, source.getUsername(), source.getCredentials())).toReturn(connection);
stub(service.getRepository(source.getRepositoryName())).toReturn(repository);
connection = (FederatedRepositoryConnection)source.getConnection();
- assertThat(connection, is(notNullValue()));
- assertThat(connection.getRepository(), is(sameInstance(repository)));
- verify(repository, times(1)).authenticate(source.getUsername(), source.getCredentials());
+ assertThat(connection, is(sameInstance(connection)));
+ verify(repository, times(1)).createConnection(source, source.getUsername(), source.getCredentials());
verify(service, times(1)).getRepository(source.getRepositoryName());
}
@Test( expected = RepositorySourceException.class )
public void shouldNotCreateConnectionWhenAuthenticationFails() throws Exception {
- stub(repository.authenticate(source.getUsername(), source.getCredentials())).toReturn(false);
+ stub(repository.createConnection(source, source.getUsername(), source.getCredentials())).toReturn(null);
stub(service.getRepository(source.getRepositoryName())).toReturn(repository);
connection = (FederatedRepositoryConnection)source.getConnection();
}
Modified: trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederatedRepositoryTest.java
===================================================================
--- trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederatedRepositoryTest.java 2008-07-03 15:40:44 UTC (rev 338)
+++ trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederatedRepositoryTest.java 2008-07-03 15:42:34 UTC (rev 339)
@@ -28,6 +28,7 @@
import static org.junit.matchers.JUnitMatchers.hasItems;
import org.jboss.dna.spi.graph.connection.BasicExecutionEnvironment;
import org.jboss.dna.spi.graph.connection.ExecutionEnvironment;
+import org.jboss.dna.spi.graph.connection.RepositoryConnectionFactories;
import org.jboss.dna.spi.graph.connection.RepositorySourceListener;
import org.junit.Before;
import org.junit.Test;
@@ -143,4 +144,9 @@
assertThat(repository.getConfiguration(), is(sameInstance(config)));
}
+ @Test( expected = IllegalArgumentException.class )
+ public void shouldNotAllowSettingConfigurationToNull() {
+ repository.setConfiguration(null);
+ }
+
}
Modified: trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederationServiceTest.java
===================================================================
--- trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederationServiceTest.java 2008-07-03 15:40:44 UTC (rev 338)
+++ trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederationServiceTest.java 2008-07-03 15:42:34 UTC (rev 339)
@@ -35,6 +35,7 @@
import static org.mockito.Mockito.verifyNoMoreInteractions;
import java.util.concurrent.TimeUnit;
import org.jboss.dna.common.component.ClassLoaderFactory;
+import org.jboss.dna.common.util.Logger;
import org.jboss.dna.repository.services.ServiceAdministrator;
import org.jboss.dna.spi.graph.NamespaceRegistry;
import org.jboss.dna.spi.graph.Path;
@@ -103,8 +104,9 @@
@After
public void afterEach() throws Exception {
service.getAdministrator().shutdown();
- service.getAdministrator().awaitTermination(2, TimeUnit.SECONDS);
+ service.getAdministrator().awaitTermination(4, TimeUnit.SECONDS);
SimpleRepository.shutdownAll();
+ Logger.getLogger(getClass()).trace("");
}
@Test
Copied: trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/connection/RepositoryConnectionFactories.java (from rev 321, trunk/dna-repository/src/main/java/org/jboss/dna/repository/federation/RepositoryConnectionFactories.java)
===================================================================
--- trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/connection/RepositoryConnectionFactories.java (rev 0)
+++ trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/connection/RepositoryConnectionFactories.java 2008-07-03 15:42:34 UTC (rev 339)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.dna.spi.graph.connection;
+
+
+/**
+ * @author Randall Hauch
+ */
+public interface RepositoryConnectionFactories {
+
+ RepositoryConnectionFactory getConnectionFactory( String sourceName );
+
+}
17 years, 5 months
- 1
- 0
DNA SVN: r338 - trunk/dna-repository/src/main/java/org/jboss/dna/repository/services.
by dna-commits＠lists.jboss.org
Author: rhauch
Date: 2008-07-03 11:40:44 -0400 (Thu, 03 Jul 2008)
New Revision: 338
Modified:
trunk/dna-repository/src/main/java/org/jboss/dna/repository/services/AbstractServiceAdministrator.java
Log:
DNA-115 - Create federation service
http://jira.jboss.com/jira/browse/DNA-115
Added trace logging to the service administrator.
Modified: trunk/dna-repository/src/main/java/org/jboss/dna/repository/services/AbstractServiceAdministrator.java
===================================================================
--- trunk/dna-repository/src/main/java/org/jboss/dna/repository/services/AbstractServiceAdministrator.java 2008-07-03 11:16:46 UTC (rev 337)
+++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/services/AbstractServiceAdministrator.java 2008-07-03 15:40:44 UTC (rev 338)
@@ -25,6 +25,7 @@
import net.jcip.annotations.GuardedBy;
import net.jcip.annotations.ThreadSafe;
import org.jboss.dna.common.i18n.I18n;
+import org.jboss.dna.common.util.Logger;
import org.jboss.dna.repository.RepositoryI18n;
/**
@@ -38,6 +39,7 @@
private volatile State state;
private final I18n serviceName;
+ private final Logger logger;
protected AbstractServiceAdministrator( I18n serviceName,
State initialState ) {
@@ -45,6 +47,7 @@
assert serviceName != null;
this.state = initialState;
this.serviceName = serviceName;
+ this.logger = Logger.getLogger(getClass());
}
/**
@@ -118,8 +121,10 @@
case STARTED:
break;
case PAUSED:
+ logger.trace("Starting \"{0}\"", getServiceName());
doStart(this.state);
this.state = State.STARTED;
+ logger.trace("Started \"{0}\"", getServiceName());
break;
case SHUTDOWN:
case TERMINATED:
@@ -153,8 +158,10 @@
public synchronized ServiceAdministrator pause() {
switch (this.state) {
case STARTED:
+ logger.trace("Pausing \"{0}\"", getServiceName());
doPause(this.state);
this.state = State.PAUSED;
+ logger.trace("Paused \"{0}\"", getServiceName());
break;
case PAUSED:
break;
@@ -167,8 +174,8 @@
/**
* Implementation of the functionality to switch to the paused state. This method is only called if the state from which the
- * service is transitioning is appropriate ({@link ServiceAdministrator.State#STARTED}). This method does nothing by
- * default, and should be overridden if needed.
+ * service is transitioning is appropriate ({@link ServiceAdministrator.State#STARTED}). This method does nothing by default,
+ * and should be overridden if needed.
*
* @param fromState the state from which this service is transitioning; never null
* @throws IllegalStateException if the service is such that it cannot be transitioned from the supplied state
@@ -190,8 +197,10 @@
switch (this.state) {
case STARTED:
case PAUSED:
+ logger.trace("Initiating shutdown of \"{0}\"", getServiceName());
this.state = State.SHUTDOWN;
doShutdown(this.state);
+ logger.trace("Initiated shutdown of \"{0}\"", getServiceName());
isTerminated();
break;
case SHUTDOWN:
@@ -262,6 +271,7 @@
case SHUTDOWN:
if (doCheckIsTerminated()) {
this.state = State.TERMINATED;
+ logger.trace("Service \"{0}\" has terminated", getServiceName());
return true;
}
return false;
17 years, 5 months
- 1
- 0
DNA SVN: r337 - trunk/sequencers/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java.
by dna-commits＠lists.jboss.org
Author: spagop
Date: 2008-07-03 07:16:46 -0400 (Thu, 03 Jul 2008)
New Revision: 337
Removed:
trunk/sequencers/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/annotationmetadata/
trunk/sequencers/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/fieldmetadata/
trunk/sequencers/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/importmetadata/
trunk/sequencers/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/javadocmetadata/
trunk/sequencers/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/packagemetadata/
trunk/sequencers/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/typemetadata/
Log:
move some related metadata impl. into the metadata package and enhance the java metadata impl.
17 years, 5 months
- 1
- 0