You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2010/07/14 17:51:34 UTC
svn commit: r964086 [3/4] - in /tapestry/tapestry5/trunk:
tapestry-core/src/main/java/org/apache/tapestry5/
tapestry-core/src/main/java/org/apache/tapestry5/ajax/
tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/
tapestry-core/src/ma...
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/AliasContribution.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/AliasContribution.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/AliasContribution.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/AliasContribution.java Wed Jul 14 15:51:30 2010
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007 The Apache Software Foundation
+// Copyright 2006, 2007, 2010 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,12 +14,11 @@
package org.apache.tapestry5.services;
-import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
+import java.util.Formatter;
+
import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.apache.tapestry5.ioc.services.ServiceOverride;
-import java.util.Formatter;
-
/**
* A contribution into the {@link Alias} or AliasOverride service configuration.
*
@@ -59,9 +58,12 @@ public final class AliasContribution<T>
public AliasContribution(Class<T> contributionType, String mode, T object)
{
- this.contributionType = notNull(contributionType, "contributionClass");
- this.mode = notNull(mode, "mode");
- this.object = notNull(object, "object");
+ assert contributionType != null;
+ this.contributionType = contributionType;
+ assert mode != null;
+ this.mode = mode;
+ assert object != null;
+ this.object = object;
}
/**
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStateContribution.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStateContribution.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStateContribution.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStateContribution.java Wed Jul 14 15:51:30 2010
@@ -1,10 +1,10 @@
-// Copyright 2007 The Apache Software Foundation
+// Copyright 2007, 2010 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,12 +14,13 @@
package org.apache.tapestry5.services;
-import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
/**
* A contribution to the configuration of the {@link ApplicationStateManager}, identifying the strategy and creator for
* a particular Session State Object (SSO), identified by the SSO's class.
*/
+@SuppressWarnings("all")
public final class ApplicationStateContribution
{
private final String strategy;
@@ -33,8 +34,7 @@ public final class ApplicationStateContr
public ApplicationStateContribution(String strategy, ApplicationStateCreator creator)
{
- Defense.notBlank(strategy, "strategy");
-
+ assert InternalUtils.isNonBlank(strategy);
this.strategy = strategy;
this.creator = creator;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/BeanBlockContribution.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/BeanBlockContribution.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/BeanBlockContribution.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/BeanBlockContribution.java Wed Jul 14 15:51:30 2010
@@ -1,4 +1,4 @@
-// Copyright 2007 The Apache Software Foundation
+// Copyright 2007, 2010 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
package org.apache.tapestry5.services;
import org.apache.tapestry5.corelib.components.Label;
-import static org.apache.tapestry5.ioc.internal.util.Defense.notBlank;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
/**
* A contribution to the {@link BeanBlockSource} service, defining a page name and block id (within the page) that can
@@ -33,10 +33,9 @@ public final class BeanBlockContribution
public BeanBlockContribution(String dataType, String pageName, String blockId, boolean edit)
{
- notBlank(dataType, "datatype");
- notBlank(pageName, "pageName");
- notBlank(blockId, "blockId");
-
+ assert InternalUtils.isNonBlank(dataType);
+ assert InternalUtils.isNonBlank(pageName);
+ assert InternalUtils.isNonBlank(blockId);
this.dataType = dataType;
this.pageName = pageName;
this.blockId = blockId;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentEventRequestParameters.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentEventRequestParameters.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentEventRequestParameters.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentEventRequestParameters.java Wed Jul 14 15:51:30 2010
@@ -16,7 +16,7 @@ package org.apache.tapestry5.services;
import org.apache.tapestry5.EventContext;
import org.apache.tapestry5.internal.TapestryInternalUtils;
-import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
/**
* Encapsulates all the information that may be provided in a component event request URL.
@@ -30,13 +30,12 @@ public final class ComponentEventRequest
String eventType, EventContext pageActivationContext,
EventContext eventContext)
{
- Defense.notBlank(activePageName, "activePageName");
- Defense.notBlank(containingPageName, "containingPageName");
- Defense.notNull(nestedComponentId, "nestedComponentId");
- Defense.notBlank(eventType, "eventType");
- Defense.notNull(pageActivationContext, "pageActivationContext");
- Defense.notNull(eventContext, "eventContext");
-
+ assert InternalUtils.isNonBlank(activePageName);
+ assert InternalUtils.isNonBlank(containingPageName);
+ assert nestedComponentId != null;
+ assert InternalUtils.isNonBlank(eventType);
+ assert pageActivationContext != null;
+ assert eventContext != null;
this.activePageName = activePageName;
this.containingPageName = containingPageName;
this.nestedComponentId = nestedComponentId;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/DelegatingRequest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/DelegatingRequest.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/DelegatingRequest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/DelegatingRequest.java Wed Jul 14 15:51:30 2010
@@ -17,10 +17,6 @@ package org.apache.tapestry5.services;
import java.util.List;
import java.util.Locale;
-import org.apache.tapestry5.ioc.internal.util.Defense;
-import org.apache.tapestry5.services.Request;
-import org.apache.tapestry5.services.Session;
-
/**
* Class that wraps an {@linkplain Request}, delegating all its methods.
*
@@ -57,7 +53,7 @@ public class DelegatingRequest implement
*/
public void setRequest(Request request)
{
- Defense.notNull(request, "request");
+ assert request != null;
this.request = request;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/LibraryMapping.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/LibraryMapping.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/LibraryMapping.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/LibraryMapping.java Wed Jul 14 15:51:30 2010
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2010 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
package org.apache.tapestry5.services;
-import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
/**
* Used to configure the {@link ComponentClassResolver}, to allow it to map prefixes to library root packages (the
@@ -41,9 +41,8 @@ public final class LibraryMapping
public LibraryMapping(String pathPrefix, String rootPackage)
{
- Defense.notBlank(pathPrefix, "pathPrefix");
- Defense.notBlank(rootPackage, "rootPackage");
-
+ assert InternalUtils.isNonBlank(pathPrefix);
+ assert InternalUtils.isNonBlank(rootPackage);
if (pathPrefix.contains("/"))
throw new RuntimeException(
"LibraryMapping path prefixes may no longer contain slashes (as of Tapestry 5.2).");
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/PageRenderRequestParameters.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/PageRenderRequestParameters.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/PageRenderRequestParameters.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/PageRenderRequestParameters.java Wed Jul 14 15:51:30 2010
@@ -1,4 +1,4 @@
-// Copyright 2008, 2009 The Apache Software Foundation
+// Copyright 2008, 2009, 2010The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@ import org.apache.tapestry5.EventContext
import org.apache.tapestry5.TapestryConstants;
import org.apache.tapestry5.internal.TapestryInternalUtils;
import org.apache.tapestry5.internal.structure.PageResetListener;
-import org.apache.tapestry5.ioc.internal.util.Defense;
/**
* Used with {@link org.apache.tapestry5.services.PageRenderRequestHandler} and
@@ -43,9 +42,8 @@ public class PageRenderRequestParameters
/** @since 5.2.0 */
public PageRenderRequestParameters(String logicalPageName, EventContext activationContext, boolean loopback)
{
- Defense.notNull(logicalPageName, "logicalPageName");
- Defense.notNull(activationContext, "activationContext");
-
+ assert logicalPageName != null;
+ assert activationContext != null;
this.logicalPageName = logicalPageName;
this.activationContext = activationContext;
this.loopback = loopback;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TransformMethodSignature.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TransformMethodSignature.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TransformMethodSignature.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TransformMethodSignature.java Wed Jul 14 15:51:30 2010
@@ -14,13 +14,10 @@
package org.apache.tapestry5.services;
-import static org.apache.tapestry5.ioc.internal.util.Defense.notBlank;
-
-import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import org.apache.tapestry5.internal.InternalConstants;
-import org.apache.tapestry5.ioc.services.ClassFabUtils;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
/**
* A representation of a method signature, which consists of its name, modifiers (primarily,
@@ -46,17 +43,19 @@ public class TransformMethodSignature im
public TransformMethodSignature(String name)
{
- this(Modifier.PUBLIC, "void", name, InternalConstants.EMPTY_STRING_ARRAY,
- InternalConstants.EMPTY_STRING_ARRAY);
+ this(Modifier.PUBLIC, "void", name, InternalConstants.EMPTY_STRING_ARRAY, InternalConstants.EMPTY_STRING_ARRAY);
}
- public TransformMethodSignature(int modifiers, String type, String name,
- String[] parameterTypes, String[] exceptionTypes)
+ public TransformMethodSignature(int modifiers, String type, String name, String[] parameterTypes,
+ String[] exceptionTypes)
{
+ assert InternalUtils.isNonBlank(name);
+ assert InternalUtils.isNonBlank(type);
+
this.modifiers = modifiers;
- returnType = notBlank(type, "type");
- methodName = notBlank(name, "name");
+ returnType = type;
+ methodName = name;
// TODO: Checks that no element within the two arrays
// is null or blank.
@@ -146,9 +145,8 @@ public class TransformMethodSignature im
TransformMethodSignature ms = (TransformMethodSignature) other;
- return modifiers == ms.modifiers && returnType.equals(ms.returnType)
- && methodName.equals(ms.methodName) && matches(parameterTypes, ms.parameterTypes)
- && matches(exceptionTypes, ms.exceptionTypes);
+ return modifiers == ms.modifiers && returnType.equals(ms.returnType) && methodName.equals(ms.methodName)
+ && matches(parameterTypes, ms.parameterTypes) && matches(exceptionTypes, ms.exceptionTypes);
}
private boolean matches(String[] values, String[] otherValues)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetLink.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetLink.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetLink.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetLink.java Wed Jul 14 15:51:30 2010
@@ -19,7 +19,6 @@ import org.apache.tapestry5.dom.Document
import org.apache.tapestry5.dom.Element;
import org.apache.tapestry5.internal.TapestryInternalUtils;
import org.apache.tapestry5.internal.services.DocumentLinker;
-import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.ioc.internal.util.InternalUtils;
/**
@@ -45,7 +44,7 @@ public final class StylesheetLink
public StylesheetLink(Asset asset, StylesheetOptions options)
{
- this(Defense.notNull(asset, "asset").toClientURL(), options);
+ this(asset.toClientURL(), options);
}
public StylesheetLink(String url)
@@ -55,7 +54,8 @@ public final class StylesheetLink
public StylesheetLink(String url, StylesheetOptions options)
{
- this.url = Defense.notBlank(url, "url");
+ assert InternalUtils.isNonBlank(url);
+ this.url = url;
this.options = options != null ? options : BLANK_OPTIONS;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/meta/FixedExtractor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/meta/FixedExtractor.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/meta/FixedExtractor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/meta/FixedExtractor.java Wed Jul 14 15:51:30 2010
@@ -16,7 +16,7 @@ package org.apache.tapestry5.services.me
import java.lang.annotation.Annotation;
-import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.apache.tapestry5.model.MutableComponentModel;
/**
@@ -39,8 +39,10 @@ public class FixedExtractor<T extends An
public FixedExtractor(String key, String value)
{
- this.key = Defense.notBlank(key, "key");
- this.value = Defense.notBlank(value, "value");
+ assert InternalUtils.isNonBlank(key);
+ this.key = key;
+ assert InternalUtils.isNonBlank(value);
+ this.value = value;
}
public void extractMetaData(MutableComponentModel model, T annotation)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/test/PageTester.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/test/PageTester.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/test/PageTester.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/test/PageTester.java Wed Jul 14 15:51:30 2010
@@ -31,7 +31,6 @@ import org.apache.tapestry5.internal.tes
import org.apache.tapestry5.internal.test.TestableResponse;
import org.apache.tapestry5.ioc.Registry;
import org.apache.tapestry5.ioc.def.ModuleDef;
-import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.apache.tapestry5.ioc.services.SymbolProvider;
import org.apache.tapestry5.services.ApplicationGlobals;
@@ -48,6 +47,7 @@ import org.slf4j.LoggerFactory;
* can directly debug
* into your code in your IDE.
*/
+@SuppressWarnings("all")
public class PageTester
{
private final Logger logger = LoggerFactory.getLogger(PageTester.class);
@@ -58,8 +58,6 @@ public class PageTester
private final TestableResponse response;
- // private final StrategyRegistry<ComponentInvoker> invokerRegistry;
-
private final RequestHandler requestHandler;
public static final String DEFAULT_CONTEXT_PATH = "src/main/webapp";
@@ -97,15 +95,13 @@ public class PageTester
* @param moduleClasses
* Classes of additional modules to load
*/
- @SuppressWarnings("unchecked")
public PageTester(String appPackage, String appName, String contextPath, Class... moduleClasses)
{
- Defense.notBlank(appPackage, "appPackage");
- Defense.notNull(appName, "appName");
- Defense.notBlank(contextPath, "contextPath");
+ assert InternalUtils.isNonBlank(appPackage);
+ assert appName != null;
+ assert InternalUtils.isNonBlank(contextPath);
- SymbolProvider provider = new SingleKeySymbolProvider(
- InternalConstants.TAPESTRY_APP_PACKAGE_PARAM, appPackage);
+ SymbolProvider provider = new SingleKeySymbolProvider(InternalConstants.TAPESTRY_APP_PACKAGE_PARAM, appPackage);
TapestryAppInitializer initializer = new TapestryAppInitializer(logger, provider, appName,
PageTesterModule.TEST_MODE, null);
@@ -145,7 +141,7 @@ public class PageTester
public void shutdown()
{
registry.cleanupThread();
-
+
registry.shutdown();
}
@@ -203,8 +199,8 @@ public class PageTester
Document result = response.getRenderedDocument();
if (result == null)
- throw new RuntimeException(String.format(
- "Render of page '%s' did not result in a Document.", pageName));
+ throw new RuntimeException(String.format("Render of page '%s' did not result in a Document.",
+ pageName));
return result;
}
@@ -230,7 +226,7 @@ public class PageTester
public Document clickLink(Element linkElement)
{
- Defense.notNull(linkElement, "link");
+ assert linkElement != null;
validateElementName(linkElement, "a");
@@ -246,9 +242,8 @@ public class PageTester
String result = element.getAttribute(attributeName);
if (InternalUtils.isBlank(result))
- throw new RuntimeException(String.format(
- "The %s attribute of the <%s> element was blank or missing.", attributeName,
- element.getName()));
+ throw new RuntimeException(String.format("The %s attribute of the <%s> element was blank or missing.",
+ attributeName, element.getName()));
return result;
}
@@ -256,8 +251,8 @@ public class PageTester
private void validateElementName(Element element, String expectedElementName)
{
if (!element.getName().equalsIgnoreCase(expectedElementName))
- throw new RuntimeException(String.format("The element must be type '%s', not '%s'.",
- expectedElementName, element.getName()));
+ throw new RuntimeException(String.format("The element must be type '%s', not '%s'.", expectedElementName,
+ element.getName()));
}
private Document runComponentEventRequest()
@@ -271,9 +266,8 @@ public class PageTester
boolean handled = requestHandler.service(request, response);
if (!handled)
- throw new RuntimeException(String
- .format("Request for path '%s' was not handled by Tapestry.", request
- .getPath()));
+ throw new RuntimeException(String.format("Request for path '%s' was not handled by Tapestry.",
+ request.getPath()));
Link link = response.getRedirectLink();
@@ -286,8 +280,8 @@ public class PageTester
Document result = response.getRenderedDocument();
if (result == null)
- throw new RuntimeException(String.format(
- "Render request '%s' did not result in a Document.", request.getPath()));
+ throw new RuntimeException(String.format("Render request '%s' did not result in a Document.",
+ request.getPath()));
return result;
}
@@ -346,8 +340,8 @@ public class PageTester
return path;
if (!path.startsWith(contextPath))
- throw new RuntimeException(String.format(
- "Path '%s' does not start with context path '%s'.", path, contextPath));
+ throw new RuntimeException(String.format("Path '%s' does not start with context path '%s'.", path,
+ contextPath));
return path.substring(contextPath.length());
}
@@ -365,7 +359,7 @@ public class PageTester
*/
public Document submitForm(Element form, Map<String, String> parameters)
{
- Defense.notNull(form, "form");
+ assert form != null;
validateElementName(form, "form");
@@ -471,7 +465,7 @@ public class PageTester
*/
public Document clickSubmit(Element submitButton, Map<String, String> fieldValues)
{
- Defense.notNull(submitButton, "submitButton");
+ assert submitButton != null;
assertIsSubmit(submitButton);
@@ -523,8 +517,7 @@ public class PageTester
e = e.getContainer();
}
- throw new RuntimeException(String.format(
- "Could not locate an ancestor element of type '%s'.", ancestorName));
+ throw new RuntimeException(String.format("Could not locate an ancestor element of type '%s'.", ancestorName));
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/urlrewriter/SimpleRequestWrapper.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/urlrewriter/SimpleRequestWrapper.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/urlrewriter/SimpleRequestWrapper.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/urlrewriter/SimpleRequestWrapper.java Wed Jul 14 15:51:30 2010
@@ -13,7 +13,6 @@
// limitations under the License.
package org.apache.tapestry5.urlrewriter;
-import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.services.DelegatingRequest;
import org.apache.tapestry5.services.Request;
import org.apache.tapestry5.services.linktransform.LinkTransformer;
@@ -46,9 +45,8 @@ public class SimpleRequestWrapper extend
{
super(request);
- Defense.notNull(serverName, "serverName");
- Defense.notNull(path, "path");
-
+ assert serverName != null;
+ assert path != null;
this.serverName = serverName;
this.path = path;
@@ -65,14 +63,12 @@ public class SimpleRequestWrapper extend
*/
public SimpleRequestWrapper(Request request, String path)
{
-
super(request);
+ assert request != null;
- Defense.notNull(request, "request");
- final String serverName = request.getServerName();
- Defense.notNull(serverName, "serverName");
- Defense.notNull(path, "path");
+ assert path != null;
+ final String serverName = request.getServerName();
this.serverName = serverName;
this.path = path;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/util/DefaultPrimaryKeyEncoder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/util/DefaultPrimaryKeyEncoder.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/util/DefaultPrimaryKeyEncoder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/util/DefaultPrimaryKeyEncoder.java Wed Jul 14 15:51:30 2010
@@ -1,4 +1,4 @@
-// Copyright 2007, 2009 The Apache Software Foundation
+// Copyright 2007, 2009, 2010 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,16 +14,15 @@
package org.apache.tapestry5.util;
-import org.apache.tapestry5.PrimaryKeyEncoder;
-import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry5.ioc.internal.util.Defense;
-
import java.io.Serializable;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.apache.tapestry5.PrimaryKeyEncoder;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+
/**
* A default, extensible version of {@link org.apache.tapestry5.PrimaryKeyEncoder} that is based on loading known values
* into an internal map. When there's a reasonable number (hundreds, perhaps thousands) of items to choose from, and
@@ -74,9 +73,8 @@ public class DefaultPrimaryKeyEncoder<K
*/
public final void add(K key, V value)
{
- Defense.notNull(key, "key");
- Defense.notNull(value, "value");
-
+ assert key != null;
+ assert value != null;
V existing = keyToValue.get(key);
if (existing != null) throw new IllegalArgumentException(PublicUtilMessages.duplicateKey(key, value, existing));
@@ -140,8 +138,7 @@ public class DefaultPrimaryKeyEncoder<K
*/
public final K toKey(V value)
{
- Defense.notNull(value, "value");
-
+ assert value != null;
currentKey = valueToKey.get(value);
if (currentKey == null) throw new IllegalArgumentException(PublicUtilMessages.missingValue(value, valueToKey
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/util/EnumSelectModel.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/util/EnumSelectModel.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/util/EnumSelectModel.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/util/EnumSelectModel.java Wed Jul 14 15:51:30 2010
@@ -14,16 +14,15 @@
package org.apache.tapestry5.util;
+import java.io.Serializable;
+import java.util.List;
+
import org.apache.tapestry5.OptionGroupModel;
import org.apache.tapestry5.OptionModel;
import org.apache.tapestry5.internal.OptionModelImpl;
import org.apache.tapestry5.internal.TapestryInternalUtils;
import org.apache.tapestry5.ioc.Messages;
import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
-
-import java.io.Serializable;
-import java.util.List;
/**
* A basic select model for a particular Enum type. The labels for each Enum are drawn from the Enum instance name and
@@ -44,9 +43,8 @@ public final class EnumSelectModel exten
public <T extends Enum> EnumSelectModel(Class<T> enumClass, Messages messages, T[] values)
{
- notNull(enumClass, "enumClass");
- notNull(messages, "messages");
-
+ assert enumClass != null;
+ assert messages != null;
String prefix = enumClass.getSimpleName();
for (T value : values)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/util/EnumValueEncoder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/util/EnumValueEncoder.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/util/EnumValueEncoder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/util/EnumValueEncoder.java Wed Jul 14 15:51:30 2010
@@ -1,10 +1,10 @@
-// Copyright 2007, 2008 The Apache Software Foundation
+// Copyright 2007, 2008, 2010 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,11 +15,10 @@
package org.apache.tapestry5.util;
import org.apache.tapestry5.ValueEncoder;
-import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
import org.apache.tapestry5.ioc.internal.util.InternalUtils;
/**
- * A value encoder that can be used for aribrary Enum types. The enum name is stored as the client side value.
+ * A value encoder that can be used for arbitrary Enum types. The enum name is stored as the client side value.
*/
public class EnumValueEncoder<E extends Enum<E>> implements ValueEncoder<E>
{
@@ -27,22 +26,22 @@ public class EnumValueEncoder<E extends
public EnumValueEncoder(final Class<E> enumType)
{
- notNull(enumType, "enumType");
-
+ assert enumType != null;
this.enumType = enumType;
}
public String toClient(E value)
{
- if (value == null) return null;
+ if (value == null)
+ return null;
return value.name();
}
- @SuppressWarnings("unchecked")
public E toValue(String clientValue)
{
- if (InternalUtils.isBlank(clientValue)) return null;
+ if (InternalUtils.isBlank(clientValue))
+ return null;
return Enum.valueOf(enumType, clientValue);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/util/ResponseWrapper.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/util/ResponseWrapper.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/util/ResponseWrapper.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/util/ResponseWrapper.java Wed Jul 14 15:51:30 2010
@@ -1,4 +1,4 @@
-// Copyright 2009 The Apache Software Foundation
+// Copyright 2009, 2010 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,14 +14,13 @@
package org.apache.tapestry5.util;
-import org.apache.tapestry5.Link;
-import org.apache.tapestry5.ioc.internal.util.Defense;
-import org.apache.tapestry5.services.Response;
-
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintWriter;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.services.Response;
+
/**
* Implementation of {@link org.apache.tapestry5.services.Response} that delegates all method invocations to a delegate
* instance. This is used as a base class for overriding just some behaviors of Response.
@@ -32,8 +31,7 @@ public class ResponseWrapper implements
public ResponseWrapper(Response response)
{
- Defense.notNull(response, "response");
-
+ assert response != null;
this.response = response;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/util/TextStreamResponse.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/util/TextStreamResponse.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/util/TextStreamResponse.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/util/TextStreamResponse.java Wed Jul 14 15:51:30 2010
@@ -1,10 +1,10 @@
-// Copyright 2007, 2008 The Apache Software Foundation
+// Copyright 2007, 2008, 2010 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,15 +14,14 @@
package org.apache.tapestry5.util;
-import org.apache.tapestry5.ContentType;
-import org.apache.tapestry5.StreamResponse;
-import org.apache.tapestry5.ioc.internal.util.Defense;
-import org.apache.tapestry5.services.Response;
-
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+import org.apache.tapestry5.ContentType;
+import org.apache.tapestry5.StreamResponse;
+import org.apache.tapestry5.services.Response;
+
public class TextStreamResponse implements StreamResponse
{
private final ContentType contentType;
@@ -39,22 +38,24 @@ public class TextStreamResponse implemen
/**
* Constructor allowing the content type and character set to the specified.
- *
- * @param contentType type of content, often "text/xml"
- * @param charset character set of output, usually "UTF-8"
- * @param text text to be streamed in the response
+ *
+ * @param contentType
+ * type of content, often "text/xml"
+ * @param charset
+ * character set of output, usually "UTF-8"
+ * @param text
+ * text to be streamed in the response
* @see org.apache.tapestry5.SymbolConstants#CHARSET
*/
public TextStreamResponse(String contentType, String charset, String text)
{
- this(new ContentType(Defense.notBlank(contentType, "contentType"),
- Defense.notBlank(charset, "charset")), text);
+ this(new ContentType(contentType, charset), text);
}
public TextStreamResponse(ContentType contentType, String text)
{
- Defense.notNull(contentType, "contentType");
- Defense.notNull(text, "text");
+ assert contentType != null;
+ assert text != null;
this.contentType = contentType;
this.text = text;
@@ -68,7 +69,7 @@ public class TextStreamResponse implemen
/**
* Converts the text to a byte array (as per the character set, which is usually "UTF-8"), and returns a stream for
* that byte array.
- *
+ *
* @return the text as a byte array stram
* @throws IOException
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/dom/DOMTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/dom/DOMTest.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/dom/DOMTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/dom/DOMTest.java Wed Jul 14 15:51:30 2010
@@ -159,7 +159,7 @@ public class DOMTest extends InternalBas
assertEquals(d.toString(), readFile("nested_elements.txt"));
}
- @Test(expectedExceptions = IllegalArgumentException.class)
+ @Test(expectedExceptions = AssertionError.class)
public void attribute_names_may_not_be_blank()
{
Document d = new Document();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MultiZoneUpdateInsideForm.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MultiZoneUpdateInsideForm.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MultiZoneUpdateInsideForm.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MultiZoneUpdateInsideForm.java Wed Jul 14 15:51:30 2010
@@ -32,7 +32,6 @@ import org.apache.tapestry5.corelib.comp
import org.apache.tapestry5.func.F;
import org.apache.tapestry5.func.Mapper;
import org.apache.tapestry5.ioc.annotations.Inject;
-import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.services.Request;
import org.apache.tapestry5.util.AbstractSelectModel;
@@ -105,8 +104,7 @@ public class MultiZoneUpdateInsideForm
public List<OptionModel> getOptions()
{
- Defense.notNull(options, "source");
-
+ assert options != null;
return F.flow(options).map(new Mapper<SelectObj, OptionModel>()
{
public OptionModel map(final SelectObj input)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/SimpleRequestWrapperTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/SimpleRequestWrapperTest.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/SimpleRequestWrapperTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/SimpleRequestWrapperTest.java Wed Jul 14 15:51:30 2010
@@ -1,4 +1,4 @@
-// Copyright 2009 The Apache Software Foundation
+// Copyright 2009, 2010 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@ import org.testng.annotations.Test;
* Tests {@linkplain org.apache.tapestry5.urlrewritter.SimpleRequestWrapper}
* and {@link DelegatingRequest}.
*/
+@SuppressWarnings("all")
public class SimpleRequestWrapperTest extends TestBase
{
@@ -169,7 +170,7 @@ public class SimpleRequestWrapperTest ex
{
new SimpleRequestWrapper(request, serverName, path);
}
- catch (RuntimeException e)
+ catch (AssertionError e)
{
exceptionRaised = true;
}
@@ -188,7 +189,7 @@ public class SimpleRequestWrapperTest ex
{
new SimpleRequestWrapper(request, path);
}
- catch (RuntimeException e)
+ catch (AssertionError e)
{
exceptionRaised = true;
}
Modified: tapestry/tapestry5/trunk/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateTransactionDecoratorImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateTransactionDecoratorImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateTransactionDecoratorImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateTransactionDecoratorImpl.java Wed Jul 14 15:51:30 2010
@@ -1,4 +1,4 @@
-// Copyright 2008, 2009 The Apache Software Foundation
+// Copyright 2008, 2009, 2010 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@ package org.apache.tapestry5.internal.hi
import org.apache.tapestry5.hibernate.HibernateTransactionAdvisor;
import org.apache.tapestry5.hibernate.HibernateTransactionDecorator;
-import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.apache.tapestry5.ioc.services.AspectDecorator;
import org.apache.tapestry5.ioc.services.AspectInterceptorBuilder;
@@ -34,10 +34,9 @@ public class HibernateTransactionDecorat
public <T> T build(Class<T> serviceInterface, T delegate, String serviceId)
{
- Defense.notNull(serviceInterface, "serviceInterface");
- Defense.notNull(delegate, "delegate");
- Defense.notBlank(serviceId, "serviceId");
-
+ assert serviceInterface != null;
+ assert delegate != null;
+ assert InternalUtils.isNonBlank(serviceId);
String description = String.format("<Hibernate Transaction interceptor for %s(%s)>",
serviceId,
serviceInterface.getName());
Modified: tapestry/tapestry5/trunk/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/PackageNameHibernateConfigurer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/PackageNameHibernateConfigurer.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/PackageNameHibernateConfigurer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/PackageNameHibernateConfigurer.java Wed Jul 14 15:51:30 2010
@@ -1,10 +1,10 @@
-// Copyright 2007, 2008 The Apache Software Foundation
+// Copyright 2007, 2008, 2010 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,7 +16,6 @@ package org.apache.tapestry5.internal.hi
import org.apache.tapestry5.hibernate.HibernateConfigurer;
import org.apache.tapestry5.hibernate.HibernateEntityPackageManager;
-import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.ioc.services.ClassNameLocator;
import org.hibernate.cfg.AnnotationConfiguration;
import org.hibernate.cfg.Configuration;
@@ -31,7 +30,7 @@ public final class PackageNameHibernateC
private final ClassNameLocator classNameLocator;
public PackageNameHibernateConfigurer(HibernateEntityPackageManager packageManager,
- ClassNameLocator classNameLocator)
+ ClassNameLocator classNameLocator)
{
this.packageManager = packageManager;
this.classNameLocator = classNameLocator;
@@ -39,7 +38,6 @@ public final class PackageNameHibernateC
public void configure(Configuration configuration)
{
- Defense.cast(configuration, AnnotationConfiguration.class, "configuration");
AnnotationConfiguration cfg = (AnnotationConfiguration) configuration;
ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateGridDataSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateGridDataSource.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateGridDataSource.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateGridDataSource.java Wed Jul 14 15:51:30 2010
@@ -1,4 +1,4 @@
-// Copyright 2008 The Apache Software Foundation
+// Copyright 2008, 2010 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,16 +14,15 @@
package org.apache.tapestry5.hibernate;
+import java.util.List;
+
import org.apache.tapestry5.grid.GridDataSource;
import org.apache.tapestry5.grid.SortConstraint;
-import org.apache.tapestry5.ioc.internal.util.Defense;
import org.hibernate.Criteria;
import org.hibernate.Session;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Projections;
-import java.util.List;
-
/**
* A simple implementation of {@link org.apache.tapestry5.grid.GridDataSource} based on a Hibernate Session and a known
* entity class. This implementation does support multiple {@link org.apache.tapestry5.grid.SortConstraint sort
@@ -45,9 +44,8 @@ public class HibernateGridDataSource imp
public HibernateGridDataSource(Session session, Class entityType)
{
- Defense.notNull(session, "session");
- Defense.notNull(entityType, "entityType");
-
+ assert session != null;
+ assert entityType != null;
this.session = session;
this.entityType = entityType;
}
@@ -78,11 +76,7 @@ public class HibernateGridDataSource imp
*/
public void prepare(int startIndex, int endIndex, List<SortConstraint> sortConstraints)
{
- Defense.notNull(sortConstraints, "sortConstraints");
-
- // We just assume that the property names in the SortContraint match the Hibernate
- // properties.
-
+ assert sortConstraints != null;
Criteria crit = session.createCriteria(entityType);
crit.setFirstResult(startIndex).setMaxResults(endIndex - startIndex + 1);
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateEntityValueEncoder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateEntityValueEncoder.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateEntityValueEncoder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateEntityValueEncoder.java Wed Jul 14 15:51:30 2010
@@ -4,7 +4,7 @@
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,8 +14,9 @@
package org.apache.tapestry5.internal.hibernate;
+import java.io.Serializable;
+
import org.apache.tapestry5.ValueEncoder;
-import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.apache.tapestry5.ioc.services.PropertyAccess;
import org.apache.tapestry5.ioc.services.PropertyAdapter;
@@ -25,8 +26,6 @@ import org.hibernate.mapping.PersistentC
import org.hibernate.mapping.Property;
import org.slf4j.Logger;
-import java.io.Serializable;
-
public final class HibernateEntityValueEncoder<E> implements ValueEncoder<E>
{
private final Class<E> entityClass;
@@ -41,8 +40,8 @@ public final class HibernateEntityValueE
private final Logger logger;
- public HibernateEntityValueEncoder(Class<E> entityClass, PersistentClass persistentClass,
- Session session, PropertyAccess propertyAccess, TypeCoercer typeCoercer, Logger logger)
+ public HibernateEntityValueEncoder(Class<E> entityClass, PersistentClass persistentClass, Session session,
+ PropertyAccess propertyAccess, TypeCoercer typeCoercer, Logger logger)
{
this.entityClass = entityClass;
this.session = session;
@@ -53,8 +52,7 @@ public final class HibernateEntityValueE
idPropertyName = property.getName();
- propertyAdapter = propertyAccess.getAdapter(this.entityClass).getPropertyAdapter(
- idPropertyName);
+ propertyAdapter = propertyAccess.getAdapter(this.entityClass).getPropertyAdapter(idPropertyName);
}
public String toClient(E value)
@@ -65,11 +63,9 @@ public final class HibernateEntityValueE
Object id = propertyAdapter.get(value);
if (id == null)
- throw new IllegalStateException(
- String
- .format(
- "Entity %s has an %s property of null; this probably means that it has not been persisted yet.",
- value, idPropertyName));
+ throw new IllegalStateException(String.format(
+ "Entity %s has an %s property of null; this probably means that it has not been persisted yet.",
+ value, idPropertyName));
return typeCoercer.coerce(id, String.class);
}
@@ -90,12 +86,11 @@ public final class HibernateEntityValueE
catch (Exception ex)
{
throw new RuntimeException(String.format(
- "Exception converting '%s' to instance of %s (id type for entity %s): %s",
- clientValue, propertyAdapter.getType().getName(), entityClass.getName(),
- InternalUtils.toMessage(ex)), ex);
+ "Exception converting '%s' to instance of %s (id type for entity %s): %s", clientValue,
+ propertyAdapter.getType().getName(), entityClass.getName(), InternalUtils.toMessage(ex)), ex);
}
- Serializable ser = Defense.cast(id, Serializable.class, "id");
+ Serializable ser = (Serializable) id;
E result = (E) session.get(entityClass, ser);
@@ -103,8 +98,7 @@ public final class HibernateEntityValueE
{
// We don't identify the entity type in the message because the logger is based on the
// entity type.
- logger.error(String.format(
- "Unable to convert client value '%s' into an entity instance.", clientValue));
+ logger.error(String.format("Unable to convert client value '%s' into an entity instance.", clientValue));
}
return result;
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Orderable.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Orderable.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Orderable.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Orderable.java Wed Jul 14 15:51:30 2010
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2010 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
package org.apache.tapestry5.ioc;
-import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
/**
* A wrapper that allows objects of a target type to be ordered. Each Orderable object is given a unique id and a set of
@@ -38,7 +38,8 @@ public class Orderable<T>
public Orderable(String id, T target, String... constraints)
{
- this.id = Defense.notBlank(id, "id");
+ assert InternalUtils.isNonBlank(id);
+ this.id = id;
this.target = target;
this.constraints = constraints;
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractConfigurationImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractConfigurationImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractConfigurationImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractConfigurationImpl.java Wed Jul 14 15:51:30 2010
@@ -15,7 +15,6 @@
package org.apache.tapestry5.ioc.internal;
import org.apache.tapestry5.ioc.ObjectLocator;
-import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.ioc.internal.util.InternalUtils;
public abstract class AbstractConfigurationImpl<T>
@@ -32,7 +31,7 @@ public abstract class AbstractConfigurat
protected T instantiate(Class<? extends T> clazz)
{
- Defense.notNull(clazz, "clazz");
+ assert clazz != null;
if (contributionType.isInterface() && InternalUtils.isLocalFile(clazz))
return locator.proxy(contributionType, clazz);
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractServiceInstrumenter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractServiceInstrumenter.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractServiceInstrumenter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractServiceInstrumenter.java Wed Jul 14 15:51:30 2010
@@ -1,10 +1,10 @@
-// Copyright 2009 The Apache Software Foundation
+// Copyright 2009, 2010 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,21 +14,20 @@
package org.apache.tapestry5.ioc.internal;
+import java.lang.reflect.Method;
+import java.util.List;
+
import org.apache.tapestry5.ioc.IdMatcher;
import org.apache.tapestry5.ioc.def.ServiceDef;
import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.apache.tapestry5.ioc.services.ClassFactory;
-import java.lang.reflect.Method;
-import java.util.List;
-
/**
* Abstract base class for implementations of {@link org.apache.tapestry5.ioc.ServiceDecorator} (i.e., old school) and
- * {@link org.apache.tapestry5.ioc.ServiceAdvisor} (i.e., new school). "Instrumenter" is a rought approximation of what
+ * {@link org.apache.tapestry5.ioc.ServiceAdvisor} (i.e., new school). "Instrumenter" is a rought approximation of what
* these two approaches have in common: instrumenting of method calls of a service.
- *
+ *
* @since 5.1.0.0
*/
public class AbstractServiceInstrumenter
@@ -41,15 +40,16 @@ public class AbstractServiceInstrumenter
protected final ClassFactory classFactory;
- public AbstractServiceInstrumenter(Method method, String[] patterns, String[] constraints,
- ClassFactory classFactory)
+ public AbstractServiceInstrumenter(Method method, String[] patterns, String[] constraints, ClassFactory classFactory)
{
this.method = method;
this.classFactory = classFactory;
+ assert patterns != null;
+
List<IdMatcher> matchers = CollectionFactory.newList();
- for (String pattern : Defense.notNull(patterns, "patterns"))
+ for (String pattern : patterns)
{
IdMatcher matcher = new IdMatcherImpl(pattern);
matchers.add(matcher);
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AdvisorDefImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AdvisorDefImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AdvisorDefImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AdvisorDefImpl.java Wed Jul 14 15:51:30 2010
@@ -1,4 +1,4 @@
-// Copyright 2009 The Apache Software Foundation
+// Copyright 2009, 2010 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
package org.apache.tapestry5.ioc.internal;
+import java.lang.reflect.Method;
+
import org.apache.tapestry5.ioc.AdvisorDef;
import org.apache.tapestry5.ioc.ModuleBuilderSource;
import org.apache.tapestry5.ioc.ServiceAdvisor;
import org.apache.tapestry5.ioc.ServiceResources;
-import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.apache.tapestry5.ioc.services.ClassFactory;
-import java.lang.reflect.Method;
-
public class AdvisorDefImpl extends AbstractServiceInstrumenter implements AdvisorDef
{
private final String advisorId;
@@ -31,8 +31,9 @@ public class AdvisorDefImpl extends Abst
String advisorId)
{
super(method, patterns, constraints, classFactory);
+ assert InternalUtils.isNonBlank(advisorId);
- this.advisorId = Defense.notBlank(advisorId, "advisorId");
+ this.advisorId = advisorId;
}
public ServiceAdvisor createAdvisor(ModuleBuilderSource moduleSource, ServiceResources resources)
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DecoratorDefImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DecoratorDefImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DecoratorDefImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DecoratorDefImpl.java Wed Jul 14 15:51:30 2010
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007, 2009 The Apache Software Foundation
+// Copyright 2006, 2007, 2009, 2010 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
package org.apache.tapestry5.ioc.internal;
+import java.lang.reflect.Method;
+
import org.apache.tapestry5.ioc.ModuleBuilderSource;
import org.apache.tapestry5.ioc.ServiceDecorator;
import org.apache.tapestry5.ioc.ServiceResources;
import org.apache.tapestry5.ioc.def.DecoratorDef;
-import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.apache.tapestry5.ioc.services.ClassFactory;
-import java.lang.reflect.Method;
-
public class DecoratorDefImpl extends AbstractServiceInstrumenter implements DecoratorDef
{
private final String decoratorId;
@@ -32,8 +32,9 @@ public class DecoratorDefImpl extends Ab
)
{
super(decoratorMethod, patterns, constraints, classFactory);
+ assert InternalUtils.isNonBlank(decoratorId);
- this.decoratorId = Defense.notBlank(decoratorId, "decoratorId");
+ this.decoratorId = decoratorId;
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ModuleImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ModuleImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ModuleImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ModuleImpl.java Wed Jul 14 15:51:30 2010
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007, 2008, 2009 The Apache Software Foundation
+// Copyright 2006, 2007, 2008, 2009, 2010 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -47,7 +47,6 @@ import org.apache.tapestry5.ioc.def.Star
import org.apache.tapestry5.ioc.internal.services.JustInTimeObjectCreator;
import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import org.apache.tapestry5.ioc.internal.util.ConcurrentBarrier;
-import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.ioc.internal.util.InjectionResources;
import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.apache.tapestry5.ioc.internal.util.MapInjectionResources;
@@ -58,6 +57,7 @@ import org.apache.tapestry5.ioc.services
import org.apache.tapestry5.ioc.services.Status;
import org.slf4j.Logger;
+@SuppressWarnings("all")
public class ModuleImpl implements Module
{
private final InternalRegistry registry;
@@ -114,10 +114,8 @@ public class ModuleImpl implements Modul
public <T> T getService(String serviceId, Class<T> serviceInterface)
{
- Defense.notBlank(serviceId, "serviceId");
- Defense.notNull(serviceInterface, "serviceInterface");
- // module may be null.
-
+ assert InternalUtils.isNonBlank(serviceId);
+ assert serviceInterface != null;
ServiceDef2 def = getServiceDef(serviceId);
// RegistryImpl should already have checked that the service exists.
@@ -169,8 +167,7 @@ public class ModuleImpl implements Modul
@SuppressWarnings("unchecked")
public Collection<String> findServiceIdsForInterface(Class serviceInterface)
{
- Defense.notNull(serviceInterface, "serviceInterface");
-
+ assert serviceInterface != null;
Collection<String> result = CollectionFactory.newList();
for (ServiceDef2 def : serviceDefs.values())
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/OperationTrackerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/OperationTrackerImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/OperationTrackerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/OperationTrackerImpl.java Wed Jul 14 15:51:30 2010
@@ -17,7 +17,6 @@ package org.apache.tapestry5.ioc.interna
import org.apache.tapestry5.ioc.Invokable;
import org.apache.tapestry5.ioc.OperationTracker;
import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.apache.tapestry5.ioc.util.Stack;
import org.slf4j.Logger;
@@ -42,9 +41,8 @@ public class OperationTrackerImpl implem
public void run(String description, final Runnable operation)
{
- Defense.notBlank(description, "description");
- Defense.notNull(operation, "operation");
-
+ assert InternalUtils.isNonBlank(description);
+ assert operation != null;
invoke(description, new Invokable<Void>()
{
public Void invoke()
@@ -58,9 +56,8 @@ public class OperationTrackerImpl implem
public <T> T invoke(String description, Invokable<T> operation)
{
- Defense.notBlank(description, "description");
- Defense.notNull(operation, "operation");
-
+ assert InternalUtils.isNonBlank(description);
+ assert operation != null;
operations.push(description);
try
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java Wed Jul 14 15:51:30 2010
@@ -40,7 +40,6 @@ import org.apache.tapestry5.ioc.internal
import org.apache.tapestry5.ioc.internal.services.RegistryShutdownHubImpl;
import org.apache.tapestry5.ioc.internal.services.ServiceMessages;
import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.ioc.internal.util.InjectionResources;
import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.apache.tapestry5.ioc.internal.util.MapInjectionResources;
@@ -52,6 +51,7 @@ import org.apache.tapestry5.ioc.util.Unk
import org.apache.tapestry5.services.UpdateListenerHub;
import org.slf4j.Logger;
+@SuppressWarnings("all")
public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyProvider
{
private static final String SYMBOL_SOURCE_SERVICE_ID = "SymbolSource";
@@ -955,8 +955,7 @@ public class RegistryImpl implements Reg
public <T> T autobuild(final Class<T> clazz)
{
- Defense.notNull(clazz, "clazz");
-
+ assert clazz != null;
final Constructor constructor = InternalUtils.findAutobuildConstructor(clazz);
if (constructor == null)
@@ -995,12 +994,8 @@ public class RegistryImpl implements Reg
public <T> T proxy(Class<T> interfaceClass, Class<? extends T> implementationClass, ObjectLocator locator)
{
- Defense.notNull(interfaceClass, "interfaceClass");
- Defense.notNull(implementationClass, "implementationClass");
-
- // TODO: Check really an interface
- // TODO: Check impl class extends interfaceClass and is concrete
-
+ assert interfaceClass != null;
+ assert implementationClass != null;
if (InternalUtils.isLocalFile(implementationClass))
return createReloadingProxy(interfaceClass, implementationClass, locator);
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBinderImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBinderImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBinderImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBinderImpl.java Wed Jul 14 15:51:30 2010
@@ -14,7 +14,18 @@
package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry5.ioc.*;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Set;
+
+import org.apache.tapestry5.ioc.ObjectCreator;
+import org.apache.tapestry5.ioc.ScopeConstants;
+import org.apache.tapestry5.ioc.ServiceBinder;
+import org.apache.tapestry5.ioc.ServiceBindingOptions;
+import org.apache.tapestry5.ioc.ServiceBuilder;
+import org.apache.tapestry5.ioc.ServiceBuilderResources;
import org.apache.tapestry5.ioc.annotations.EagerLoad;
import org.apache.tapestry5.ioc.annotations.Marker;
import org.apache.tapestry5.ioc.annotations.PreventServiceDecoration;
@@ -22,17 +33,11 @@ import org.apache.tapestry5.ioc.annotati
import org.apache.tapestry5.ioc.annotations.ServiceId;
import org.apache.tapestry5.ioc.def.ServiceDef;
import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.apache.tapestry5.ioc.internal.util.OneShotLock;
import org.apache.tapestry5.ioc.services.ClassFactory;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.Set;
-
+@SuppressWarnings("all")
public class ServiceBinderImpl implements ServiceBinder, ServiceBindingOptions
{
private final OneShotLock lock = new OneShotLock();
@@ -194,9 +199,8 @@ public class ServiceBinderImpl implement
public <T> ServiceBindingOptions bind(Class<T> serviceInterface, final ServiceBuilder<T> builder)
{
- Defense.notNull(serviceInterface, "serviceInterface");
- Defense.notNull(builder, "builder");
-
+ assert serviceInterface != null;
+ assert builder != null;
lock.check();
flush();
@@ -230,9 +234,8 @@ public class ServiceBinderImpl implement
public <T> ServiceBindingOptions bind(Class<T> serviceInterface, Class<? extends T> serviceImplementation)
{
- Defense.notNull(serviceInterface, "serviceInterface");
- Defense.notNull(serviceImplementation, "serviceImplementation");
-
+ assert serviceInterface != null;
+ assert serviceImplementation != null;
lock.check();
flush();
@@ -302,8 +305,7 @@ public class ServiceBinderImpl implement
public ServiceBindingOptions withId(String id)
{
- Defense.notBlank(id, "id");
-
+ assert InternalUtils.isNonBlank(id);
lock.check();
serviceId = id;
@@ -313,8 +315,7 @@ public class ServiceBinderImpl implement
public ServiceBindingOptions scope(String scope)
{
- Defense.notBlank(scope, "scope");
-
+ assert InternalUtils.isNonBlank(scope);
lock.check();
this.scope = scope;
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceResourcesImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceResourcesImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceResourcesImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceResourcesImpl.java Wed Jul 14 15:51:30 2010
@@ -4,7 +4,7 @@
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,32 +14,30 @@
package org.apache.tapestry5.ioc.internal;
+import java.lang.reflect.Constructor;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
import org.apache.tapestry5.ioc.Invokable;
import org.apache.tapestry5.ioc.ObjectCreator;
import org.apache.tapestry5.ioc.OperationTracker;
import org.apache.tapestry5.ioc.ServiceBuilderResources;
import org.apache.tapestry5.ioc.def.ServiceDef;
-import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.apache.tapestry5.ioc.services.ClassFactory;
import org.slf4j.Logger;
-import java.lang.reflect.Constructor;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
/**
* Implementation of {@link org.apache.tapestry5.ioc.ServiceBuilderResources}. We just have one
* implementation that
- * fills the purposes of methods that need a {@link org.apache.tapestry5.ioc.ServiceResources}
- * (which includes service
- * decorator methods) as well as methods that need a
- * {@link org.apache.tapestry5.ioc.ServiceBuilderResources} (which is
+ * fills the purposes of methods that need a {@link org.apache.tapestry5.ioc.ServiceResources} (which includes service
+ * decorator methods) as well as methods that need a {@link org.apache.tapestry5.ioc.ServiceBuilderResources} (which is
* just service builder methods). Since it is most commonly used for the former, we'll just leave
* the name as
* ServiceResourcesImpl.
*/
+@SuppressWarnings("all")
public class ServiceResourcesImpl extends ObjectLocatorImpl implements ServiceBuilderResources
{
private final InternalRegistry registry;
@@ -81,14 +79,15 @@ public class ServiceResourcesImpl extend
public <T> Collection<T> getUnorderedConfiguration(final Class<T> valueType)
{
- Collection<T> result = registry.invoke("Collecting unordered configuration for service "
- + serviceDef.getServiceId(), new Invokable<Collection<T>>()
- {
- public Collection<T> invoke()
- {
- return registry.getUnorderedConfiguration(serviceDef, valueType);
- }
- });
+ Collection<T> result = registry.invoke(
+ "Collecting unordered configuration for service " + serviceDef.getServiceId(),
+ new Invokable<Collection<T>>()
+ {
+ public Collection<T> invoke()
+ {
+ return registry.getUnorderedConfiguration(serviceDef, valueType);
+ }
+ });
logConfiguration(result);
@@ -103,14 +102,14 @@ public class ServiceResourcesImpl extend
public <T> List<T> getOrderedConfiguration(final Class<T> valueType)
{
- List<T> result = registry.invoke("Collecting ordered configuration for service "
- + serviceDef.getServiceId(), new Invokable<List<T>>()
- {
- public List<T> invoke()
- {
- return registry.getOrderedConfiguration(serviceDef, valueType);
- }
- });
+ List<T> result = registry.invoke("Collecting ordered configuration for service " + serviceDef.getServiceId(),
+ new Invokable<List<T>>()
+ {
+ public List<T> invoke()
+ {
+ return registry.getOrderedConfiguration(serviceDef, valueType);
+ }
+ });
logConfiguration(result);
@@ -119,14 +118,14 @@ public class ServiceResourcesImpl extend
public <K, V> Map<K, V> getMappedConfiguration(final Class<K> keyType, final Class<V> valueType)
{
- Map<K, V> result = registry.invoke("Collecting mapped configuration for service "
- + serviceDef.getServiceId(), new Invokable<Map<K, V>>()
- {
- public Map<K, V> invoke()
- {
- return registry.getMappedConfiguration(serviceDef, keyType, valueType);
- }
- });
+ Map<K, V> result = registry.invoke("Collecting mapped configuration for service " + serviceDef.getServiceId(),
+ new Invokable<Map<K, V>>()
+ {
+ public Map<K, V> invoke()
+ {
+ return registry.getMappedConfiguration(serviceDef, keyType, valueType);
+ }
+ });
if (logger.isDebugEnabled())
logger.debug(IOCMessages.constructedConfiguration(result));
@@ -142,7 +141,7 @@ public class ServiceResourcesImpl extend
@Override
public <T> T autobuild(String description, final Class<T> clazz)
{
- Defense.notNull(clazz, "clazz");
+ assert clazz != null;
return registry.invoke(description, new Invokable<T>()
{
@@ -155,8 +154,8 @@ public class ServiceResourcesImpl extend
String description = classFactory.getConstructorLocation(constructor).toString();
- ObjectCreator creator = new ConstructorServiceCreator(ServiceResourcesImpl.this,
- description, constructor);
+ ObjectCreator creator = new ConstructorServiceCreator(ServiceResourcesImpl.this, description,
+ constructor);
return clazz.cast(creator.createObject());
}
@@ -166,7 +165,7 @@ public class ServiceResourcesImpl extend
@Override
public <T> T autobuild(final Class<T> clazz)
{
- Defense.notNull(clazz, "clazz");
+ assert clazz != null;
return autobuild("Autobuilding instance of class " + clazz.getName(), clazz);
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingOrderedConfigurationWrapper.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingOrderedConfigurationWrapper.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingOrderedConfigurationWrapper.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingOrderedConfigurationWrapper.java Wed Jul 14 15:51:30 2010
@@ -19,7 +19,7 @@ import java.util.Map;
import org.apache.tapestry5.ioc.ObjectLocator;
import org.apache.tapestry5.ioc.OrderedConfiguration;
import org.apache.tapestry5.ioc.def.ContributionDef;
-import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.apache.tapestry5.ioc.internal.util.Orderer;
/**
@@ -62,8 +62,7 @@ public class ValidatingOrderedConfigurat
public void override(String id, T object, String... constraints)
{
- Defense.notBlank(id, "id");
-
+ assert InternalUtils.isNonBlank(id);
checkValid(object);
OrderedConfigurationOverride<T> existing = overrides.get(id);
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AbstractInvocation.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AbstractInvocation.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AbstractInvocation.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AbstractInvocation.java Wed Jul 14 15:51:30 2010
@@ -1,4 +1,4 @@
-// Copyright 2008 The Apache Software Foundation
+// Copyright 2008, 2010 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry5.ioc.Invocation;
-import org.apache.tapestry5.ioc.internal.util.Defense;
-
import java.lang.reflect.Method;
+import org.apache.tapestry5.ioc.Invocation;
+
/**
* Base class for {@link org.apache.tapestry5.ioc.Invocation}, which is extended with a dynamically generated class
* generated for each individual class and method.
*/
+@SuppressWarnings("all")
public abstract class AbstractInvocation implements Invocation
{
private final MethodInfo methodInfo;
@@ -81,7 +81,7 @@ public abstract class AbstractInvocation
public <T extends Throwable> T getThrown(Class<T> throwableClass)
{
- Defense.notNull(throwableClass, "throwableClass");
+ assert throwableClass != null;
if (throwableClass.isInstance(thrown))
return throwableClass.cast(thrown);
@@ -91,7 +91,7 @@ public abstract class AbstractInvocation
public void overrideThrown(Exception thrown)
{
- Defense.notNull(thrown, "thrown");
+ assert thrown != null;
for (Class t : method.getExceptionTypes())
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectDecoratorImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectDecoratorImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectDecoratorImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectDecoratorImpl.java Wed Jul 14 15:51:30 2010
@@ -18,7 +18,7 @@ import java.lang.reflect.Method;
import org.apache.tapestry5.ioc.MethodAdvice;
import org.apache.tapestry5.ioc.annotations.PreventServiceDecoration;
-import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.apache.tapestry5.ioc.services.AspectDecorator;
import org.apache.tapestry5.ioc.services.AspectInterceptorBuilder;
import org.apache.tapestry5.ioc.services.Builtin;
@@ -37,8 +37,7 @@ public class AspectDecoratorImpl impleme
public <T> T build(Class<T> serviceInterface, T delegate, MethodAdvice advice, String description)
{
- Defense.notNull(advice, "advice");
-
+ assert advice != null;
AspectInterceptorBuilder<T> builder = createBuilder(serviceInterface, delegate, description);
builder.adviseAllMethods(advice);
@@ -49,13 +48,9 @@ public class AspectDecoratorImpl impleme
public <T> AspectInterceptorBuilder<T> createBuilder(final Class<T> serviceInterface, final T delegate,
final String description)
{
- Defense.notNull(serviceInterface, "serviceInterface");
- Defense.notNull(delegate, "delegate");
- Defense.notBlank(description, "description");
-
- // Defer creating the real builder until a method gets advised. If no method is advised then
- // the delegate can be used unchanged.
-
+ assert serviceInterface != null;
+ assert delegate != null;
+ assert InternalUtils.isNonBlank(description);
return new AspectInterceptorBuilder<T>()
{
private AspectInterceptorBuilder<T> builder;