svn commit: r742252 - in /lenya/trunk: org.apache.lenya.core.administration/src/main/java/org/apache/lenya/modules/administration/ org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/acting/ org.apache.lenya.core.api/src/main/java/org/a...
[email protected] Mon, 09 Feb 2009 04:31:07 -0000
Newsgroups
gmane.comp.cms.lenya.cvs
Message-ID
<[email protected] >
Author: froethenbacher
Date: Mon Feb 9 04:31:06 2009
New Revision: 742252
URL: http://svn.apache.org/viewvc?rev=742252&view=rev
Log:
Cont'd replacing deprecated Assert with Validate.
Modified:
lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/modules/administration/Reports.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckoutAction.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/FallbackModule.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/observation/RepositoryEvent.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/publication/Proxy.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/publication/ResourceType.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/repository/SessionImpl.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/site/AbstractSiteNode.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/site/NodeIterator.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/workflow/WorkflowEventDescriptor.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/transaction/ConcurrentModificationException.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/transaction/UnitOfWorkImpl.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/xml/ChainErrorHandler.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/xml/NamespaceHelper.java
lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/AreaImpl.java
lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryImpl.java
lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentImpl.java
lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java
lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/PublicationConfiguration.java
lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/PublicationManagerImpl.java
lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/RepositoryImpl.java
lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java
lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/SessionImpl.java
lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/ChainLinkRewriter.java
lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkResolverImpl.java
lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkTarget.java
lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/RelativeToAbsoluteLinkRewriter.java
lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/UuidToUrlRewriter.java
Modified: lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/modules/administration/Reports.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/modules/administration/Reports.java?rev=742252&r1=742251&r2=742252&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/modules/administration/Reports.java (original)
+++ lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/modules/administration/Reports.java Mon Feb 9 04:31:06 2009
@@ -20,6 +20,7 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.lang.Validate;
import org.apache.lenya.cms.linking.Link;
import org.apache.lenya.cms.linking.LinkManager;
import org.apache.lenya.cms.linking.LinkResolver;
@@ -28,7 +29,6 @@
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.usecase.AbstractUsecase;
-import org.apache.lenya.util.Assert;
/**
* Various reports about a publication.
@@ -86,8 +86,8 @@
private String targetUrl;
public BrokenLink(String sourceUrl, String targetUrl) {
- Assert.notNull("source URL", sourceUrl);
- Assert.notNull("target URL", targetUrl);
+ Validate.notNull(sourceUrl);
+ Validate.notNull(targetUrl);
this.sourceUrl = sourceUrl;
this.targetUrl = targetUrl;
}
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckoutAction.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckoutAction.java?rev=742252&r1=742251&r2=742252&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckoutAction.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckoutAction.java Mon Feb 9 04:31:06 2009
@@ -26,9 +26,9 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
+import org.apache.commons.lang.Validate;
import org.apache.lenya.cms.repository.Node;
import org.apache.lenya.cms.repository.RepositoryException;
-import org.apache.lenya.util.Assert;
/**
* Action doing reserved checkout
@@ -50,8 +50,8 @@
Node node = getNode();
String username = getUsername();
- Assert.notNull("node", node);
- Assert.notNull("username", username);
+ assert node != null;
+ assert username != null;
if (!node.isCheckedOutBySession(node.getSession())) {
node.checkout();
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/FallbackModule.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/FallbackModule.java?rev=742252&r1=742251&r2=742252&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/FallbackModule.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/FallbackModule.java Mon Feb 9 04:31:06 2009
@@ -28,6 +28,7 @@
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.spring.configurator.WebAppContextUtils;
+import org.apache.commons.lang.Validate;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
import org.apache.excalibur.store.impl.MRUMemoryStore;
@@ -39,7 +40,6 @@
import org.apache.lenya.cms.repository.RepositoryUtil;
import org.apache.lenya.cms.repository.Session;
import org.apache.lenya.util.ServletHelper;
-import org.springframework.util.Assert;
import org.springframework.web.context.WebApplicationContext;
/**
@@ -70,7 +70,7 @@
}
public void setStore(MRUMemoryStore store) {
- Assert.notNull(store, "store");
+ Validate.notNull(store);
this.store = store;
}
@@ -145,7 +145,7 @@
}
public void setProtocol(String protocol) {
- Assert.notNull(protocol, "protocol");
+ Validate.notNull(protocol);
this.protocol = protocol;
}
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java?rev=742252&r1=742251&r2=742252&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java Mon Feb 9 04:31:06 2009
@@ -26,6 +26,7 @@
import org.apache.cocoon.processing.ProcessInfoProvider;
import org.apache.cocoon.spring.configurator.WebAppContextUtils;
import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.lang.Validate;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceFactory;
import org.apache.excalibur.source.SourceResolver;
@@ -44,7 +45,6 @@
import org.apache.lenya.cms.repository.RepositoryUtil;
import org.apache.lenya.cms.repository.Session;
import org.apache.lenya.util.ServletHelper;
-import org.springframework.util.Assert;
/**
* <p>
@@ -73,7 +73,7 @@
* @param store The store.
*/
public void setStore(MRUMemoryStore store) {
- Assert.notNull(store, "store");
+ Validate.notNull(store);
this.store = store;
}
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/observation/RepositoryEvent.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/observation/RepositoryEvent.java?rev=742252&r1=742251&r2=742252&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/observation/RepositoryEvent.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/observation/RepositoryEvent.java Mon Feb 9 04:31:06 2009
@@ -17,8 +17,8 @@
*/
package org.apache.lenya.cms.observation;
+import org.apache.commons.lang.Validate;
import org.apache.lenya.cms.repository.Session;
-import org.apache.lenya.util.Assert;
/**
* A repository event provides additional information if a document was added, changed, or removed.
@@ -35,11 +35,9 @@
* @param descriptor More information about the event.
*/
public RepositoryEvent(Session session, Object descriptor) {
-
- Assert.notNull("session", session);
+ Validate.notNull(session);
+ Validate.notNull(descriptor);
this.session = session;
-
- Assert.notNull("descriptor", descriptor);
this.descriptor = descriptor;
}
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/publication/Proxy.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/publication/Proxy.java?rev=742252&r1=742251&r2=742252&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/publication/Proxy.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/publication/Proxy.java Mon Feb 9 04:31:06 2009
@@ -17,7 +17,7 @@
*/
package org.apache.lenya.cms.publication;
-import org.apache.lenya.util.Assert;
+import org.apache.commons.lang.Validate;
/**
* <p>
@@ -46,7 +46,7 @@
* @param defaultUrl The default proxy URL.
*/
public Proxy(String defaultUrl) {
- Assert.notNull("default URL", defaultUrl);
+ Validate.notNull(defaultUrl);
this.defaultUrl = defaultUrl;
}
@@ -93,7 +93,7 @@
* @param _url The url to set.
*/
public void setUrl(String _url) {
- Assert.notNull("url", _url);
+ Validate.notNull(_url);
this.url = _url;
}
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/publication/ResourceType.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/publication/ResourceType.java?rev=742252&r1=742251&r2=742252&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/publication/ResourceType.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/publication/ResourceType.java Mon Feb 9 04:31:06 2009
@@ -36,7 +36,7 @@
import java.util.Date;
-import org.apache.lenya.util.Assert;
+import org.apache.commons.lang.Validate;
import org.apache.lenya.xml.Schema;
/**
@@ -114,11 +114,11 @@
public static class Sample {
protected Sample(String name, String mimeType, String uri) {
- Assert.notNull("name", name);
+ Validate.notNull(name);
+ Validate.notNull(mimeType);
+ Validate.notNull(uri);
this.name = name;
- Assert.notNull("mimeType", mimeType);
this.mimeType = mimeType;
- Assert.notNull("uri", uri);
this.uri = uri;
}
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/repository/SessionImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/repository/SessionImpl.java?rev=742252&r1=742251&r2=742252&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/repository/SessionImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/repository/SessionImpl.java Mon Feb 9 04:31:06 2009
@@ -24,6 +24,7 @@
import java.util.Set;
import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.lang.Validate;
import org.apache.commons.logging.Log;
import org.apache.lenya.ac.Identity;
import org.apache.lenya.cms.observation.ObservationRegistry;
@@ -39,7 +40,6 @@
import org.apache.lenya.transaction.Transactionable;
import org.apache.lenya.transaction.UnitOfWork;
import org.apache.lenya.transaction.UnitOfWorkImpl;
-import org.apache.lenya.util.Assert;
/**
* Repository session.
@@ -247,6 +247,7 @@
private IdentityMap identityMap;
public synchronized void enqueueEvent(RepositoryEvent event) {
+ Validate.isTrue(event.getSession() == this, "event belongs to session");
if (!isModifiable()) {
throw new RuntimeException("Can't enqueue event in unmodifiable session!");
}
@@ -255,7 +256,6 @@
"No events can be queued while the session is being committed. Event: ["
+ event.getDescriptor() + "]");
}
- Assert.isTrue("event belongs to session", event.getSession() == this);
this.events.add(event);
}
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/site/AbstractSiteNode.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/site/AbstractSiteNode.java?rev=742252&r1=742251&r2=742252&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/site/AbstractSiteNode.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/site/AbstractSiteNode.java Mon Feb 9 04:31:06 2009
@@ -21,9 +21,9 @@
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.lang.Validate;
import org.apache.commons.logging.Log;
import org.apache.lenya.cms.publication.Publication;
-import org.apache.lenya.util.Assert;
/**
* Abstract site node implementation.
@@ -35,16 +35,14 @@
private String uuid;
protected AbstractSiteNode(Publication publication, SiteStructure structure, String path,
- String uuid, Log logger) {
-
- Assert.notNull("structure", structure);
+ String uuid, Log logger)
+ {
+ Validate.notNull(structure);
+ Validate.notNull(path);
+ Validate.isTrue(path.startsWith("/"), "Path must start with /");
+ Validate.notNull(uuid);
this.structure = structure;
-
- Assert.notNull("path", path);
- Assert.isTrue("path starts with /", path.startsWith("/"));
this.path = path;
-
- Assert.notNull("uuid", uuid);
this.uuid = uuid;
}
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/site/NodeIterator.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/site/NodeIterator.java?rev=742252&r1=742251&r2=742252&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/site/NodeIterator.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/site/NodeIterator.java Mon Feb 9 04:31:06 2009
@@ -21,7 +21,7 @@
import java.util.Collection;
import java.util.Iterator;
-import org.apache.lenya.util.Assert;
+import org.apache.commons.lang.Validate;
/**
* Node iterator.
@@ -34,7 +34,7 @@
* @param collection The collection to iterate over.
*/
public NodeIterator(Collection collection) {
- Assert.notNull("collection", collection);
+ Validate.notNull(collection);
this.delegate = collection.iterator();
}
@@ -42,7 +42,7 @@
* @param nodes The nodes to iterate over.
*/
public NodeIterator(SiteNode[] nodes) {
- Assert.notNull("nodes", nodes);
+ Validate.notNull(nodes);
this.delegate = Arrays.asList(nodes).iterator();
}
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/workflow/WorkflowEventDescriptor.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/workflow/WorkflowEventDescriptor.java?rev=742252&r1=742251&r2=742252&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/workflow/WorkflowEventDescriptor.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/workflow/WorkflowEventDescriptor.java Mon Feb 9 04:31:06 2009
@@ -17,7 +17,7 @@
*/
package org.apache.lenya.cms.workflow;
-import org.apache.lenya.util.Assert;
+import org.apache.commons.lang.Validate;
import org.apache.lenya.workflow.Version;
/**
@@ -31,7 +31,7 @@
* @param version The version.
*/
public WorkflowEventDescriptor(Version version) {
- Assert.notNull("version", version);
+ Validate.notNull(version);
this.version = version;
}
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/transaction/ConcurrentModificationException.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/transaction/ConcurrentModificationException.java?rev=742252&r1=742251&r2=742252&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/transaction/ConcurrentModificationException.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/transaction/ConcurrentModificationException.java Mon Feb 9 04:31:06 2009
@@ -17,7 +17,7 @@
*/
package org.apache.lenya.transaction;
-import org.apache.lenya.util.Assert;
+import org.apache.commons.lang.Validate;
/**
* Exception which is thrown when a different identity changed a transactionable
@@ -29,7 +29,7 @@
public ConcurrentModificationException(Transactionable t) {
super();
- Assert.notNull("transactionable", t);
+ Validate.notNull(t);
this.transactionable = t;
}
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/transaction/UnitOfWorkImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/transaction/UnitOfWorkImpl.java?rev=742252&r1=742251&r2=742252&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/transaction/UnitOfWorkImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/transaction/UnitOfWorkImpl.java Mon Feb 9 04:31:06 2009
@@ -25,9 +25,9 @@
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.lang.Validate;
import org.apache.commons.logging.Log;
import org.apache.lenya.ac.Identity;
-import org.apache.lenya.util.Assert;
/**
* Default implementation of a unit of work.
@@ -42,9 +42,9 @@
* @param identity The identity.
* @param logger The logger.
*/
- public UnitOfWorkImpl(IdentityMap map, Identity identity, Log logger) {
-
- Assert.notNull(map);
+ public UnitOfWorkImpl(IdentityMap map, Identity identity, Log logger)
+ {
+ Validate.notNull(map);
this.identityMap = map;
this.identityMap.setUnitOfWork(this);
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/xml/ChainErrorHandler.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/xml/ChainErrorHandler.java?rev=742252&r1=742251&r2=742252&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/xml/ChainErrorHandler.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/xml/ChainErrorHandler.java Mon Feb 9 04:31:06 2009
@@ -20,7 +20,7 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.lenya.util.Assert;
+import org.apache.commons.lang.Validate;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
@@ -30,7 +30,7 @@
private List handlers = new ArrayList();
public void add(ErrorHandler handler) {
- Assert.notNull("handler", handler);
+ Validate.notNull(handler);
this.handlers.add(handler);
}
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/xml/NamespaceHelper.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/xml/NamespaceHelper.java?rev=742252&r1=742251&r2=742252&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/xml/NamespaceHelper.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/xml/NamespaceHelper.java Mon Feb 9 04:31:06 2009
@@ -24,7 +24,7 @@
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.lenya.util.Assert;
+import org.apache.commons.lang.Validate;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Text;
@@ -48,10 +48,10 @@
* @param _namespaceUri The namespace URI.
* @param _prefix The namespace prefix.
*/
- public NamespaceHelper(String _namespaceUri, String _prefix, Document _document) {
-
- Assert.notNull("namespace URI", _namespaceUri);
- Assert.notNull("DOM", _document);
+ public NamespaceHelper(String _namespaceUri, String _prefix, Document _document)
+ {
+ Validate.notNull(_namespaceUri);
+ Validate.notNull(_document);
this.namespaceUri = _namespaceUri;
this.prefix = _prefix;
Modified: lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/AreaImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/AreaImpl.java?rev=742252&r1=742251&r2=742252&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/AreaImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/AreaImpl.java Mon Feb 9 04:31:06 2009
@@ -21,6 +21,7 @@
import java.util.List;
import org.apache.cocoon.spring.configurator.WebAppContextUtils;
+import org.apache.commons.lang.Validate;
import org.apache.lenya.cms.repository.Node;
import org.apache.lenya.cms.repository.NodeFactory;
import org.apache.lenya.cms.repository.RepositoryException;
@@ -28,7 +29,6 @@
import org.apache.lenya.cms.site.SiteManager;
import org.apache.lenya.cms.site.SiteNode;
import org.apache.lenya.cms.site.SiteStructure;
-import org.apache.lenya.util.Assert;
/**
* Area implementation.
@@ -53,8 +53,8 @@
}
public boolean contains(String uuid, String language) {
- Assert.notNull("uuid", uuid);
- Assert.notNull("language", language);
+ Validate.notNull(uuid);
+ Validate.notNull(language);
if (uuid.equals("") || language.equals("")) {
return false;
}
Modified: lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryImpl.java?rev=742252&r1=742251&r2=742252&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryImpl.java Mon Feb 9 04:31:06 2009
@@ -24,6 +24,7 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.lang.Validate;
import org.apache.commons.logging.Log;
import org.apache.excalibur.source.SourceResolver;
import org.apache.lenya.cms.metadata.MetaDataCache;
@@ -31,7 +32,6 @@
import org.apache.lenya.cms.repository.RepositoryItem;
import org.apache.lenya.cms.repository.Session;
import org.apache.lenya.cms.site.SiteStructure;
-import org.apache.lenya.util.Assert;
/**
* A DocumentIdentityMap avoids the multiple instanciation of a document object.
@@ -179,7 +179,7 @@
* @throws DocumentBuildException if an error occurs.
*/
public boolean isDocument(String webappUrl) throws DocumentBuildException {
- Assert.notNull("webapp URL", webappUrl);
+ Validate.notNull(webappUrl);
PublicationManager pubMgr = getPublicationManager();
try {
URLInformation info = new URLInformation(webappUrl);
@@ -206,10 +206,10 @@
* @return A key.
*/
public String getKey(Publication publication, String area, String uuid, String language, int revision) {
- Assert.notNull("publication", publication);
- Assert.notNull("area", area);
- Assert.notNull("uuid", uuid);
- Assert.notNull("language", language);
+ Validate.notNull(publication);
+ Validate.notNull(area);
+ Validate.notNull(uuid);
+ Validate.notNull(language);
return publication.getId() + ":" + area + ":" + uuid + ":" + language + ":" + revision;
}
@@ -219,7 +219,7 @@
* @return A key.
*/
public String getKey(String webappUrl) {
- Assert.notNull("webapp URL", webappUrl);
+ Validate.notNull(webappUrl);
try {
if (!isDocument(webappUrl)) {
throw new RuntimeException("No document for URL [" + webappUrl + "] found.");
Modified: lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentImpl.java?rev=742252&r1=742251&r2=742252&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentImpl.java Mon Feb 9 04:31:06 2009
@@ -27,6 +27,7 @@
import org.apache.cocoon.spring.configurator.WebAppContextUtils;
import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.lang.Validate;
import org.apache.commons.logging.Log;
import org.apache.excalibur.source.SourceResolver;
import org.apache.lenya.cms.cocoon.source.SourceUtil;
@@ -42,7 +43,6 @@
import org.apache.lenya.cms.site.Link;
import org.apache.lenya.cms.site.SiteException;
import org.apache.lenya.cms.site.SiteStructure;
-import org.apache.lenya.util.Assert;
/**
* A typical CMS document.
@@ -282,9 +282,9 @@
* @param _extension A string.
*/
protected void setExtension(String _extension) {
+ Validate.notNull(_extension);
+ Validate.isTrue(!_extension.startsWith("."), "Extension must start with a dot");
checkWritability();
- assert _extension != null;
- Assert.isTrue("Extension doesn't start with a dot", !_extension.startsWith("."));
this.extension = _extension;
}
@@ -628,8 +628,8 @@
}
public void setResourceType(ResourceType resourceType) {
+ Validate.notNull(resourceType);
checkWritability();
- Assert.notNull("resource type", resourceType);
try {
MetaData meta = getMetaData(DocumentImpl.METADATA_NAMESPACE);
meta.setValue(DocumentImpl.METADATA_RESOURCE_TYPE, resourceType.getName());
@@ -639,9 +639,9 @@
}
public void setSourceExtension(String extension) {
+ Validate.notNull(extension);
+ Validate.isTrue(!extension.startsWith("."), "Extension must start with a dot");
checkWritability();
- Assert.notNull("extension", extension);
- Assert.isTrue("extension doesn't start with a dot", !extension.startsWith("."));
try {
MetaData meta = getMetaData(DocumentImpl.METADATA_NAMESPACE);
meta.setValue(DocumentImpl.METADATA_EXTENSION, extension);
Modified: lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java?rev=742252&r1=742251&r2=742252&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java Mon Feb 9 04:31:06 2009
@@ -52,7 +52,6 @@
import org.apache.lenya.cms.site.SiteNode;
import org.apache.lenya.cms.site.SiteStructure;
import org.apache.lenya.cms.site.SiteUtil;
-import org.apache.lenya.util.Assert;
/**
* DocumentManager implementation.
@@ -497,7 +496,7 @@
Link link = targetArea.getSite().add(targetPath, targetDoc);
link.setLabel(label);
- Assert.isTrue("label set", targetDoc.getLink().getLabel().equals(label));
+ assert targetDoc.getLink().getLabel().equals(label);
}
SiteNode targetNode = targetArea.getSite().getNode(targetPath);
targetNode.setVisible(sourceNode.isVisible());
Modified: lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/PublicationConfiguration.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/PublicationConfiguration.java?rev=742252&r1=742251&r2=742252&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/PublicationConfiguration.java (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/PublicationConfiguration.java Mon Feb 9 04:31:06 2009
@@ -31,9 +31,9 @@
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.avalon.framework.configuration.DefaultConfigurationSerializer;
import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.lang.Validate;
import org.apache.lenya.cms.repository.Node;
import org.apache.lenya.cms.repository.Session;
-import org.apache.lenya.util.Assert;
/**
* A publication's configuration. Keep in sync with
@@ -365,7 +365,7 @@
* @param language the default language
*/
public void setDefaultLanguage(String language) {
- Assert.notNull(language);
+ Validate.notNull(language);
if (!Arrays.asList(getLanguages()).contains(language)) {
throw new IllegalArgumentException("The publication [" + this +
"] doesn't contain the language [" + language + "]!");
@@ -584,12 +584,12 @@
}
public void addLanguage(String language) {
- Assert.notNull("language", language);
+ Validate.notNull(language);
this.languages.add(language);
}
public void removeLanguage(String language) {
- Assert.notNull("language", language);
+ Validate.notNull(language);
if (!Arrays.asList(getLanguages()).contains(language)) {
throw new IllegalArgumentException("The publication [" + this +
"] doesn't contain the language [" + language + "]!");
@@ -602,8 +602,8 @@
}
public void setName(String name) {
- Assert.notNull("name", name);
- Assert.isTrue("name not empty", name.length() > 0);
+ Validate.notNull(name);
+ Validate.isTrue(name.length() > 0, "name must not be empty");
this.name = name;
}
Modified: lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/PublicationManagerImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/PublicationManagerImpl.java?rev=742252&r1=742251&r2=742252&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/PublicationManagerImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/PublicationManagerImpl.java Mon Feb 9 04:31:06 2009
@@ -32,9 +32,9 @@
import org.apache.cocoon.processing.ProcessInfoProvider;
import org.apache.cocoon.spring.configurator.WebAppContextUtils;
import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.lang.Validate;
import org.apache.lenya.cms.repository.NodeFactory;
import org.apache.lenya.cms.repository.RepositoryException;
-import org.apache.lenya.util.Assert;
/**
* Factory for creating publication objects.
@@ -72,9 +72,9 @@
}
public Publication getPublication(DocumentFactory factory, String id)
- throws PublicationException {
-
- Assert.notNull("publication ID", id);
+ throws PublicationException
+ {
+ Validate.notNull(id);
Map id2config = getId2config();
if (!id2config.containsKey(id)) {
throw new PublicationException("The publication [" + id + "] does not exist.");
Modified: lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/RepositoryImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/RepositoryImpl.java?rev=742252&r1=742251&r2=742252&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/RepositoryImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/RepositoryImpl.java Mon Feb 9 04:31:06 2009
@@ -19,18 +19,18 @@
import javax.servlet.http.HttpServletRequest;
+import org.apache.commons.lang.Validate;
import org.apache.lenya.ac.Identity;
import org.apache.lenya.cms.repository.RepositoryException;
import org.apache.lenya.cms.repository.RepositoryManager;
import org.apache.lenya.cms.repository.RepositoryUtil;
-import org.springframework.util.Assert;
public class RepositoryImpl implements Repository {
private RepositoryManager repositoryManager;
public Session getSession(HttpServletRequest request) {
- Assert.notNull(request, "request");
+ Validate.notNull(request);
try {
org.apache.lenya.cms.repository.Session repoSession = RepositoryUtil.getSession(
this.repositoryManager, request);
Modified: lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java?rev=742252&r1=742251&r2=742252&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java Mon Feb 9 04:31:06 2009
@@ -34,9 +34,9 @@
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.lang.Validate;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
-import org.apache.lenya.util.Assert;
import org.apache.lenya.xml.Schema;
/**
@@ -83,7 +83,7 @@
* @param uri The uri.
*/
public Format(String uri) {
- Assert.notNull("uri", uri);
+ Validate.notNull(uri);
this.uri = uri;
}
/**
@@ -225,7 +225,7 @@
}
public void setName(String name) {
- Assert.notNull("name", name);
+ Validate.notNull(name);
this.name = name;
}
Modified: lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/SessionImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/SessionImpl.java?rev=742252&r1=742251&r2=742252&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/SessionImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/SessionImpl.java Mon Feb 9 04:31:06 2009
@@ -17,17 +17,18 @@
*/
package org.apache.lenya.cms.publication;
+import org.apache.commons.lang.Validate;
import org.apache.lenya.ac.Identity;
import org.apache.lenya.cms.repository.RepositoryException;
import org.apache.lenya.transaction.ConcurrentModificationException;
-import org.springframework.util.Assert;
public class SessionImpl implements Session {
public SessionImpl(RepositoryImpl repository,
- org.apache.lenya.cms.repository.Session repoSession) {
- Assert.notNull(repository, "repository");
- Assert.notNull(repoSession, "repository session");
+ org.apache.lenya.cms.repository.Session repoSession)
+ {
+ Validate.notNull(repository, "repository");
+ Validate.notNull(repoSession, "repository session");
this.repository = repository;
this.repositorySession = repoSession;
}
Modified: lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/ChainLinkRewriter.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/ChainLinkRewriter.java?rev=742252&r1=742251&r2=742252&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/ChainLinkRewriter.java (original)
+++ lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/ChainLinkRewriter.java Mon Feb 9 04:31:06 2009
@@ -21,7 +21,7 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.lenya.util.Assert;
+import org.apache.commons.lang.Validate;
/**
* A chain of link rewriters. The output of one rewriter serves as the input of the next one. If a
@@ -36,7 +36,7 @@
* @param rewriter The rewriter.
*/
public void add(LinkRewriter rewriter) {
- Assert.notNull("rewriter", rewriter);
+ Validate.notNull(rewriter);
this.rewriters.add(rewriter);
}
Modified: lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkResolverImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkResolverImpl.java?rev=742252&r1=742251&r2=742252&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkResolverImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkResolverImpl.java Mon Feb 9 04:31:06 2009
@@ -28,7 +28,6 @@
import org.apache.lenya.cms.publication.DocumentFactory;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.PublicationException;
-import org.apache.lenya.util.Assert;
/**
* Link resolver implementation.
@@ -93,13 +92,13 @@
Link link = new Link(linkUri);
String language = link.getLanguage();
- Assert.notNull("language", language);
+ assert language != null;
String uuid = link.getUuid();
- Assert.notNull("uuid", uuid);
+ assert uuid != null;
String area = link.getArea();
- Assert.notNull("area", area);
+ assert area != null;
String pubId = link.getPubId();
- Assert.notNull("publication ID", pubId);
+ assert pubId != null;
String revisionString = getValue(link.getRevision(), null);
Modified: lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkTarget.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkTarget.java?rev=742252&r1=742251&r2=742252&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkTarget.java (original)
+++ lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkTarget.java Mon Feb 9 04:31:06 2009
@@ -17,8 +17,8 @@
*/
package org.apache.lenya.cms.linking;
+import org.apache.commons.lang.Validate;
import org.apache.lenya.cms.publication.Document;
-import org.apache.lenya.util.Assert;
/**
* The target of a link.
@@ -43,7 +43,7 @@
* @param doc The document.
*/
protected LinkTarget(Document doc) {
- Assert.notNull("document", doc);
+ Validate.notNull(doc);
this.doc = doc;
}
Modified: lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/RelativeToAbsoluteLinkRewriter.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/RelativeToAbsoluteLinkRewriter.java?rev=742252&r1=742251&r2=742252&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/RelativeToAbsoluteLinkRewriter.java (original)
+++ lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/RelativeToAbsoluteLinkRewriter.java Mon Feb 9 04:31:06 2009
@@ -20,7 +20,7 @@
import java.net.URI;
import java.net.URISyntaxException;
-import org.apache.lenya.util.Assert;
+import org.apache.commons.lang.Validate;
public class RelativeToAbsoluteLinkRewriter implements LinkRewriter {
@@ -30,12 +30,12 @@
"mailto:", "file:" };
public RelativeToAbsoluteLinkRewriter(String sourceUri) {
- Assert.notNull("source URI", sourceUri);
+ Validate.notNull(sourceUri);
this.sourceUri = sourceUri;
}
public boolean matches(String url) {
- Assert.notNull("url", url);
+ Validate.notNull(url);
for (int i = 0; i < PROTOCOLS.length; i++) {
if (url.startsWith(PROTOCOLS[i])) {
return false;
Modified: lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/UuidToUrlRewriter.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/UuidToUrlRewriter.java?rev=742252&r1=742251&r2=742252&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/UuidToUrlRewriter.java (original)
+++ lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/UuidToUrlRewriter.java Mon Feb 9 04:31:06 2009
@@ -20,12 +20,12 @@
import java.net.MalformedURLException;
import java.util.StringTokenizer;
+import org.apache.commons.lang.Validate;
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentFactory;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.URLInformation;
-import org.apache.lenya.util.Assert;
import org.apache.lenya.util.Query;
/**
@@ -73,16 +73,16 @@
* @param factory The document factory to use.
*/
public UuidToUrlRewriter(String currentUrl, LinkResolver linkResolver, DocumentFactory factory) {
- Assert.notNull("current URL", currentUrl);
- Assert.notNull("link resolver", linkResolver);
- Assert.notNull("document factory", factory);
+ Validate.notNull(currentUrl);
+ Validate.notNull(linkResolver);
+ Validate.notNull(factory);
this.currentUrl = currentUrl;
this.factory = factory;
this.linkResolver = linkResolver;
}
public void setCurrentDocument(Document doc) {
- Assert.notNull("current document", doc);
+ Validate.notNull(doc);
this.currentDoc = doc;
}