Author: knopp
Date: Fri Apr 3 00:56:59 2009
New Revision: 761494
URL: http://svn.apache.org/viewvc?rev=761494&view=rev
Log: (empty)
Added:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/util/lang/Check.java
(with props)
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/RequestCycle.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/page/persistent/DefaultPageStore.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/AbstractBookmarkableEncoder.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/AbstractEncoder.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/BookmarkableEncoder.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/MountedEncoder.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/ResourceReferenceEncoder.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/info/ComponentInfo.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/info/PageComponentInfo.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/info/PageInfo.java
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/RequestCycle.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/RequestCycle.java?rev=761494&r1=761493&r2=761494&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/RequestCycle.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/RequestCycle.java
Fri Apr 3 00:56:59 2009
@@ -29,6 +29,7 @@
import org.apache.wicket.request.handler.impl.RenderPageRequestHandler;
import org.apache.wicket.request.request.Request;
import org.apache.wicket.request.response.Response;
+import org.apache.wicket.util.lang.Check;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -69,19 +70,10 @@
{
super(response);
- if (request == null)
- {
- throw new IllegalArgumentException("Argument 'request'
may not be null.");
- }
- if (response == null)
- {
- throw new IllegalArgumentException("Argument 'response'
may not be null.");
- }
- if (context == null)
- {
- throw new IllegalArgumentException("Argument 'context'
may not be null.");
- }
-
+ Check.argumentNotNull(request, "request");
+ Check.argumentNotNull(response, "response");
+ Check.argumentNotNull(context, "context");
+
this.request = request;
this.originalResponse = response;
this.context = context;
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/page/persistent/DefaultPageStore.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/page/persistent/DefaultPageStore.java?rev=761494&r1=761493&r2=761494&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/page/persistent/DefaultPageStore.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/page/persistent/DefaultPageStore.java
Fri Apr 3 00:56:59 2009
@@ -8,6 +8,7 @@
import org.apache.wicket.IPage;
import org.apache.wicket.Page;
+import org.apache.wicket.util.lang.Check;
import org.apache.wicket.util.lang.Objects;
public class DefaultPageStore implements PageStore
@@ -20,14 +21,9 @@
public DefaultPageStore(String applicationName, DataStore dataStore,
int cacheSize)
{
- if (applicationName == null)
- {
- throw new IllegalArgumentException("Argument
'applicationName' may not be null.");
- }
- if (dataStore == null)
- {
- throw new IllegalArgumentException("Argument
'pageDataStore' may not be null.");
- }
+ Check.argumentNotNull(applicationName, "applicationName");
+ Check.argumentNotNull(dataStore, "DataStore");
+
this.applicationName = applicationName;
this.pageDataStore = dataStore;
this.serializedPagesCache = new SerializedPagesCache(cacheSize);
@@ -283,14 +279,9 @@
protected SerializedPage serializePage(String sessionId, IPage page)
{
- if (sessionId == null)
- {
- throw new IllegalArgumentException("Argument
'sessionId' may not be null.");
- }
- if (page == null)
- {
- throw new IllegalArgumentException("Argument 'page' may
not be null.");
- }
+ Check.argumentNotNull(sessionId, "sessionId");
+ Check.argumentNotNull(page, "page");
+
byte data[] = Objects.objectToByteArray(page, applicationName);
return new SerializedPage(sessionId, page.getPageId(), data);
}
@@ -328,11 +319,8 @@
private final List<SoftReference<SerializedPage>> cache;
public SerializedPage removePage(String sessionId, int id)
- {
- if (sessionId == null)
- {
- throw new IllegalArgumentException("Argument
'sessionId' may not be null");
- }
+ {
+ Check.argumentNotNull(sessionId, "sessionId");
if (size > 0)
{
@@ -354,11 +342,8 @@
}
public void removePages(String sessionId)
- {
- if (sessionId == null)
- {
- throw new IllegalArgumentException("Argument
'sessionId' may not be null");
- }
+ {
+ Check.argumentNotNull(sessionId, "sessionId");
if (size > 0)
{
@@ -379,10 +364,7 @@
public SerializedPage getPage(String sessionId, int id)
{
- if (sessionId == null)
- {
- throw new IllegalArgumentException("Argument
'sessionId' may not be null");
- }
+ Check.argumentNotNull(sessionId, "sessionId");
SerializedPage result = null;
if (size > 0)
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/AbstractBookmarkableEncoder.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/AbstractBookmarkableEncoder.java?rev=761494&r1=761493&r2=761494&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/AbstractBookmarkableEncoder.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/AbstractBookmarkableEncoder.java
Fri Apr 3 00:56:59 2009
@@ -31,6 +31,9 @@
import org.apache.wicket.request.handler.impl.ListenerInterfaceRequestHandler;
import org.apache.wicket.request.handler.impl.RenderPageRequestHandler;
import org.apache.wicket.request.request.Request;
+import org.apache.wicket.util.lang.Check;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Abstract encoder for Bookmarkable, Hybrid and BookmarkableListenerInterface
URLs.
@@ -70,10 +73,18 @@
RequestListenerInterface listenerInterface =
requestListenerInterfaceFromString(componentInfo
.getListenerInterface());
- PageComponentProvider provider = new
PageComponentProvider(getContext(), pageInfo.getPageId(), pageClass,
- pageParameters, renderCount,
componentInfo.getComponentPath());
+ if (listenerInterface != null)
+ {
+ PageComponentProvider provider = new
PageComponentProvider(getContext(), pageInfo.getPageId(), pageClass,
+ pageParameters, renderCount,
componentInfo.getComponentPath());
- return new ListenerInterfaceRequestHandler(provider,
listenerInterface, componentInfo.getBehaviorIndex());
+ return new ListenerInterfaceRequestHandler(provider,
listenerInterface, componentInfo.getBehaviorIndex());
+ }
+ else
+ {
+ logger.warn("Unknown listener interface '" +
componentInfo.getListenerInterface() + "'");
+ return null;
+ }
}
/**
@@ -100,10 +111,8 @@
public UrlInfo(PageComponentInfo pageComponentInfo, Class<?
extends IPage> pageClass,
PageParameters pageParameters)
{
- if (pageClass == null)
- {
- throw new IllegalArgumentException("Argument
'pageClass' may not be null.");
- }
+ Check.argumentNotNull(pageClass, "pageClass");
+
this.pageComponentInfo = pageComponentInfo;
this.pageParameters = pageParameters != null ?
pageParameters : null;
this.pageClass = pageClass;
@@ -302,4 +311,6 @@
}
return res;
}
+
+ private static Logger logger =
LoggerFactory.getLogger(AbstractBookmarkableEncoder.class);
}
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/AbstractEncoder.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/AbstractEncoder.java?rev=761494&r1=761493&r2=761494&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/AbstractEncoder.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/AbstractEncoder.java
Fri Apr 3 00:56:59 2009
@@ -26,6 +26,7 @@
import org.apache.wicket.request.Url.QueryParameter;
import org.apache.wicket.request.encoder.info.PageComponentInfo;
import org.apache.wicket.request.encoder.parameters.PageParametersEncoder;
+import org.apache.wicket.util.lang.Check;
import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.util.string.Strings;
@@ -49,10 +50,8 @@
*/
protected String
requestListenerInterfaceToString(RequestListenerInterface listenerInterface)
{
- if (listenerInterface == null)
- {
- throw new IllegalArgumentException("Argument
'listenerInterface' may not be null.");
- }
+ Check.argumentNotNull(listenerInterface, "listenerInterface");
+
return
getContext().requestListenerInterfaceToString(listenerInterface);
}
@@ -64,10 +63,8 @@
*/
protected RequestListenerInterface
requestListenerInterfaceFromString(String interfaceName)
{
- if (interfaceName == null)
- {
- throw new IllegalArgumentException("Argument
'interfaceName' may not be null.");
- }
+ Check.argumentNotEmpty(interfaceName, "interfaceName");
+
return
getContext().requestListenerInterfaceFromString(interfaceName);
}
@@ -175,10 +172,8 @@
*/
protected Class<? extends IPage> getPageClass(String name)
{
- if (name == null)
- {
- throw new IllegalArgumentException("Argument 'name' may
not be null");
- }
+ Check.argumentNotEmpty(name, "name");
+
return Classes.resolveClass(name);
}
@@ -196,15 +191,9 @@
protected PageParameters extractPageParameters(Url url,
RequestParameters requestParameters, int segmentsToSkip,
PageParametersEncoder encoder)
{
- if (url == null)
- {
- throw new IllegalArgumentException("Argument 'url' may
not be null.");
- }
- if (encoder == null)
- {
- throw new IllegalArgumentException("Argument 'encoder'
may not be null.");
- }
-
+ Check.argumentNotNull(url, "url");
+ Check.argumentNotNull(encoder, "encoder");
+
// strip the segments and first query parameter from URL
Url urlCopy = new Url(url);
while (segmentsToSkip > 0 && urlCopy.getSegments().isEmpty() ==
false)
@@ -233,21 +222,14 @@
*/
protected Url encodePageParameters(Url url, PageParameters
pageParameters, PageParametersEncoder encoder)
{
- if (url == null)
- {
- throw new IllegalArgumentException("Argument 'url' may
no be null.");
- }
+ Check.argumentNotNull(url, "url");
+ Check.argumentNotNull(encoder, "encoder");
if (pageParameters == null)
{
pageParameters = new PageParameters();
}
- if (encoder == null)
- {
- throw new IllegalArgumentException("Argument 'encoder'
may not be null.");
- }
-
Url parametersUrl =
encoder.encodePageParameters(pageParameters);
if (parametersUrl != null)
{
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/BookmarkableEncoder.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/BookmarkableEncoder.java?rev=761494&r1=761493&r2=761494&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/BookmarkableEncoder.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/BookmarkableEncoder.java
Fri Apr 3 00:56:59 2009
@@ -23,6 +23,7 @@
import org.apache.wicket.request.encoder.parameters.PageParametersEncoder;
import
org.apache.wicket.request.encoder.parameters.SimplePageParametersEncoder;
import org.apache.wicket.request.request.Request;
+import org.apache.wicket.util.lang.Check;
/**
* Decodes and encodes the following URLs:
@@ -59,10 +60,8 @@
*/
public BookmarkableEncoder(PageParametersEncoder pageParametersEncoder)
{
- if (pageParametersEncoder == null)
- {
- throw new IllegalArgumentException("Argument
'pageParametersEncoder' may not be null.");
- }
+ Check.argumentNotNull(pageParametersEncoder,
"pageParametersEncoder");
+
this.pageParametersEncoder = pageParametersEncoder;
}
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/MountedEncoder.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/MountedEncoder.java?rev=761494&r1=761493&r2=761494&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/MountedEncoder.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/MountedEncoder.java
Fri Apr 3 00:56:59 2009
@@ -25,6 +25,7 @@
import org.apache.wicket.request.encoder.parameters.PageParametersEncoder;
import
org.apache.wicket.request.encoder.parameters.SimplePageParametersEncoder;
import org.apache.wicket.request.request.Request;
+import org.apache.wicket.util.lang.Check;
/**
* Encoder for mounted URL. The mount path can contain parameter placeholders,
i.e.
@@ -69,18 +70,10 @@
public MountedEncoder(String mountPath, Class<? extends IPage>
pageClass,
PageParametersEncoder pageParametersEncoder)
{
- if (pageParametersEncoder == null)
- {
- throw new IllegalArgumentException("Argument
'pageParametersEncoder' may not be null.");
- }
- if (pageClass == null)
- {
- throw new IllegalArgumentException("Argument
'pageClass' may not be null.");
- }
- if (mountPath == null)
- {
- throw new IllegalArgumentException("Argument
'mountPath' may not be null.");
- }
+ Check.argumentNotEmpty(mountPath, "mountPath");
+ Check.argumentNotNull(pageClass, "pageClass");
+ Check.argumentNotNull(pageParametersEncoder,
"pageParametersEncoder");
+
this.pageParametersEncoder = pageParametersEncoder;
this.pageClass = new WeakReference<Class<? extends
IPage>>(pageClass);
this.mountSegments = getMountSegments(mountPath);
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/ResourceReferenceEncoder.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/ResourceReferenceEncoder.java?rev=761494&r1=761493&r2=761494&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/ResourceReferenceEncoder.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/ResourceReferenceEncoder.java
Fri Apr 3 00:56:59 2009
@@ -64,11 +64,6 @@
this(new SimplePageParametersEncoder());
}
- protected EncoderContext getContext()
- {
- return null;
- };
-
public RequestHandler decode(Request request)
{
Url url = request.getUrl();
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/info/ComponentInfo.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/info/ComponentInfo.java?rev=761494&r1=761493&r2=761494&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/info/ComponentInfo.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/info/ComponentInfo.java
Fri Apr 3 00:56:59 2009
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.request.encoder.info;
+import org.apache.wicket.util.lang.Check;
import org.apache.wicket.util.string.Strings;
/**
@@ -48,14 +49,9 @@
public ComponentInfo(Integer renderCount, String listenerInterface,
String componentPath,
Integer behaviorIndex)
{
- if (listenerInterface == null)
- {
- throw new IllegalArgumentException("Argument
'listenerInterface' may not be null.");
- }
- if (componentPath == null)
- {
- throw new IllegalArgumentException("Argument
'componentPath' may not be null.");
- }
+ Check.argumentNotEmpty(listenerInterface, "listenerInterface");
+ Check.argumentNotEmpty(componentPath, "componentPath");
+
this.listenerInterface = listenerInterface;
this.componentPath = componentPath;
this.behaviorIndex = behaviorIndex;
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/info/PageComponentInfo.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/info/PageComponentInfo.java?rev=761494&r1=761493&r2=761494&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/info/PageComponentInfo.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/info/PageComponentInfo.java
Fri Apr 3 00:56:59 2009
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.request.encoder.info;
+import org.apache.wicket.util.lang.Check;
import org.apache.wicket.util.string.Strings;
/**
@@ -38,10 +39,8 @@
*/
public PageComponentInfo(PageInfo pageInfo, ComponentInfo componentInfo)
{
- if (pageInfo == null)
- {
- throw new IllegalArgumentException("Argument 'pageInfo'
may nut be null.");
- }
+ Check.argumentNotNull(pageInfo, "pageInfo");
+
this.pageInfo = pageInfo;
this.componentInfo = componentInfo;
}
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/info/PageInfo.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/info/PageInfo.java?rev=761494&r1=761493&r2=761494&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/info/PageInfo.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/info/PageInfo.java
Fri Apr 3 00:56:59 2009
@@ -17,6 +17,7 @@
package org.apache.wicket.request.encoder.info;
import org.apache.wicket.IPage;
+import org.apache.wicket.util.lang.Check;
import org.apache.wicket.util.string.Strings;
/**
@@ -56,10 +57,8 @@
*/
public PageInfo(IPage page)
{
- if (page == null)
- {
- throw new IllegalArgumentException("Argument 'page' may
not be null.");
- }
+ Check.argumentNotNull(page, "page");
+
this.pageId = page.getPageId();
}
Added:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/util/lang/Check.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/util/lang/Check.java?rev=761494&view=auto
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/util/lang/Check.java
(added)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/util/lang/Check.java
Fri Apr 3 00:56:59 2009
@@ -0,0 +1,22 @@
+package org.apache.wicket.util.lang;
+
+import org.apache.wicket.util.string.Strings;
+
+public class Check
+{
+ public static void argumentNotNull(Object argument, String name)
+ {
+ if (argument == null)
+ {
+ throw new IllegalArgumentException("Argument '" + name
+ "' may not be null.");
+ }
+ }
+
+ public static void argumentNotEmpty(String argument, String name)
+ {
+ if (Strings.isEmpty(argument))
+ {
+ throw new IllegalArgumentException("Argument '" + name
+ "' may not be null or empty string.");
+ }
+ }
+}
Propchange:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/util/lang/Check.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
