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 [2/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/internal/services/ContextPathEncoderImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextPathEncoderImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextPathEncoderImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextPathEncoderImpl.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.
@@ -18,7 +18,6 @@ import org.apache.tapestry5.EventContext
import org.apache.tapestry5.internal.EmptyEventContext;
import org.apache.tapestry5.internal.TapestryInternalUtils;
import org.apache.tapestry5.internal.URLEventContext;
-import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.apache.tapestry5.ioc.services.TypeCoercer;
import org.apache.tapestry5.services.ContextPathEncoder;
@@ -53,8 +52,7 @@ public class ContextPathEncoderImpl impl
public String encodeIntoPath(EventContext context)
{
- Defense.notNull(context, "context");
-
+ assert context != null;
int count = context.getCount();
StringBuilder output = new StringBuilder(BUFFER_SIZE);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextResource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextResource.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextResource.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextResource.java Wed Jul 14 15:51:30 2010
@@ -1,4 +1,4 @@
-// Copyright 2006, 2008 The Apache Software Foundation
+// Copyright 2006, 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,14 @@
package org.apache.tapestry5.internal.services;
-import org.apache.tapestry5.ioc.Resource;
-import org.apache.tapestry5.ioc.internal.util.AbstractResource;
-import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
-import org.apache.tapestry5.services.Context;
-
import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.internal.util.AbstractResource;
+import org.apache.tapestry5.services.Context;
+
/**
* A resource stored with in the web application context.
*/
@@ -35,8 +34,8 @@ public class ContextResource extends Abs
public ContextResource(Context context, String path)
{
super(path);
-
- notNull(context, "context");
+
+ assert context != null;
this.context = context;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextValueEncoderImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextValueEncoderImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextValueEncoderImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextValueEncoderImpl.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.
@@ -15,10 +15,10 @@
package org.apache.tapestry5.internal.services;
import org.apache.tapestry5.ValueEncoder;
-import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.services.ContextValueEncoder;
import org.apache.tapestry5.services.ValueEncoderSource;
+@SuppressWarnings("all")
public class ContextValueEncoderImpl implements ContextValueEncoder
{
private final ValueEncoderSource valueEncoderSource;
@@ -30,7 +30,7 @@ public class ContextValueEncoderImpl imp
public String toClient(Object value)
{
- Defense.notNull(value, "value");
+ assert value != null;
ValueEncoder encoder = valueEncoderSource.getValueEncoder(value.getClass());
@@ -40,7 +40,7 @@ public class ContextValueEncoderImpl imp
public <T> T toValue(Class<T> requiredType, String clientValue)
{
- Defense.notNull(requiredType, "requiredType");
+ assert requiredType != null;
ValueEncoder<T> encoder = valueEncoderSource.getValueEncoder(requiredType);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/EventImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/EventImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/EventImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/EventImpl.java Wed Jul 14 15:51:30 2010
@@ -1,4 +1,4 @@
-// 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.
@@ -16,10 +16,10 @@ package org.apache.tapestry5.internal.se
import org.apache.tapestry5.ComponentEventCallback;
import org.apache.tapestry5.TapestryMarkers;
-import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
import org.apache.tapestry5.runtime.Event;
import org.slf4j.Logger;
+@SuppressWarnings("all")
public class EventImpl implements Event
{
private boolean aborted;
@@ -38,7 +38,8 @@ public class EventImpl implements Event
*/
public EventImpl(ComponentEventCallback handler, Logger logger)
{
- this.handler = notNull(handler, "handler");
+ assert handler != null;
+ this.handler = handler;
this.logger = logger;
// TAP5-471: Thousands of calls to isDebugEnabled() do add up
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldTranslatorSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldTranslatorSourceImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldTranslatorSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldTranslatorSourceImpl.java Wed Jul 14 15:51:30 2010
@@ -14,8 +14,9 @@
package org.apache.tapestry5.internal.services;
-import org.apache.tapestry5.ComponentResources;
+import java.util.Locale;
+import org.apache.tapestry5.ComponentResources;
import org.apache.tapestry5.Field;
import org.apache.tapestry5.FieldTranslator;
import org.apache.tapestry5.Translator;
@@ -23,15 +24,13 @@ import org.apache.tapestry5.beaneditor.T
import org.apache.tapestry5.ioc.AnnotationProvider;
import org.apache.tapestry5.ioc.MessageFormatter;
import org.apache.tapestry5.ioc.Messages;
-import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.apache.tapestry5.services.FieldTranslatorSource;
import org.apache.tapestry5.services.FormSupport;
import org.apache.tapestry5.services.TranslatorSource;
import org.apache.tapestry5.services.ValidationMessagesSource;
-import java.util.Locale;
-
-@SuppressWarnings("unchecked")
+@SuppressWarnings("all")
public class FieldTranslatorSourceImpl implements FieldTranslatorSource
{
private final TranslatorSource translatorSource;
@@ -50,9 +49,8 @@ public class FieldTranslatorSourceImpl i
public FieldTranslator createDefaultTranslator(ComponentResources resources, String parameterName)
{
- Defense.notNull(resources, "resources");
- Defense.notBlank(parameterName, "parameterName");
-
+ assert resources != null;
+ assert InternalUtils.isNonBlank(parameterName);
Field field = (Field) resources.getComponent();
Class propertyType = resources.getBoundType(parameterName);
@@ -63,11 +61,10 @@ public class FieldTranslatorSourceImpl i
public FieldTranslator createDefaultTranslator(Field field, String overrideId, Messages overrideMessages,
Locale locale, Class propertyType, AnnotationProvider propertyAnnotations)
{
- Defense.notNull(field, "field");
- Defense.notBlank(overrideId, "overrideId");
- Defense.notNull(overrideMessages, "overrideMessages");
- Defense.notNull(locale, "locale");
-
+ assert field != null;
+ assert overrideMessages != null;
+ assert locale != null;
+ assert InternalUtils.isNonBlank(overrideId);
if (propertyType == null)
return null;
@@ -102,9 +99,8 @@ public class FieldTranslatorSourceImpl i
public FieldTranslator createTranslator(ComponentResources resources, String translatorName)
{
- Defense.notNull(resources, "resources");
- Defense.notBlank(translatorName, "translatorName");
-
+ assert resources != null;
+ assert InternalUtils.isNonBlank(translatorName);
Field field = (Field) resources.getComponent();
Translator translator = translatorSource.get(translatorName);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldValidationSupportImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldValidationSupportImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldValidationSupportImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldValidationSupportImpl.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,14 +14,21 @@
package org.apache.tapestry5.internal.services;
-import org.apache.tapestry5.*;
+import org.apache.tapestry5.ComponentEventCallback;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.EventConstants;
+import org.apache.tapestry5.FieldTranslator;
+import org.apache.tapestry5.FieldValidationSupport;
+import org.apache.tapestry5.FieldValidator;
+import org.apache.tapestry5.NullFieldStrategy;
+import org.apache.tapestry5.ValidationException;
import org.apache.tapestry5.corelib.internal.InternalMessages;
import org.apache.tapestry5.internal.util.Holder;
-import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.apache.tapestry5.ioc.services.TypeCoercer;
import org.apache.tapestry5.ioc.util.ExceptionUtils;
+@SuppressWarnings("all")
public class FieldValidationSupportImpl implements FieldValidationSupport
{
private final TypeCoercer typeCoercer;
@@ -31,14 +38,12 @@ public class FieldValidationSupportImpl
this.typeCoercer = typeCoercer;
}
- @SuppressWarnings({"unchecked"})
public String toClient(Object value, ComponentResources componentResources, FieldTranslator<Object> translator,
- NullFieldStrategy nullFieldStrategy)
+ NullFieldStrategy nullFieldStrategy)
{
- Defense.notNull(componentResources, "componentResources");
- Defense.notNull(translator, "translator");
- Defense.notNull(nullFieldStrategy, "nullFieldStrategy");
-
+ assert componentResources != null;
+ assert translator != null;
+ assert nullFieldStrategy != null;
final Holder<String> resultHolder = Holder.create();
ComponentEventCallback callback = new ComponentEventCallback()
@@ -57,9 +62,11 @@ public class FieldValidationSupportImpl
}
};
- componentResources.triggerEvent(EventConstants.TO_CLIENT, new Object[] {value}, callback);
+ componentResources.triggerEvent(EventConstants.TO_CLIENT, new Object[]
+ { value }, callback);
- if (resultHolder.hasValue()) return resultHolder.get();
+ if (resultHolder.hasValue())
+ return resultHolder.get();
Object effectiveValue = value;
@@ -69,7 +76,8 @@ public class FieldValidationSupportImpl
// Don't try to coerce or translate null.
- if (effectiveValue == null) return null;
+ if (effectiveValue == null)
+ return null;
}
// And now, whether its a value from a bound property, or from the null field strategy,
@@ -81,21 +89,19 @@ public class FieldValidationSupportImpl
}
public Object parseClient(String clientValue, ComponentResources componentResources,
- FieldTranslator<Object> translator,
- NullFieldStrategy nullFieldStrategy)
- throws ValidationException
+ FieldTranslator<Object> translator, NullFieldStrategy nullFieldStrategy) throws ValidationException
{
- Defense.notNull(componentResources, "componentResources");
- Defense.notNull(translator, "translator");
- Defense.notNull(nullFieldStrategy, "nullFieldStrategy");
-
+ assert componentResources != null;
+ assert translator != null;
+ assert nullFieldStrategy != null;
String effectiveValue = clientValue;
if (InternalUtils.isBlank(effectiveValue))
{
effectiveValue = nullFieldStrategy.replaceFromClient();
- if (effectiveValue == null) return null;
+ if (effectiveValue == null)
+ return null;
}
final Holder<Object> resultHolder = Holder.create();
@@ -111,14 +117,16 @@ public class FieldValidationSupportImpl
try
{
- componentResources.triggerEvent(EventConstants.PARSE_CLIENT, new Object[] {effectiveValue}, callback);
+ componentResources.triggerEvent(EventConstants.PARSE_CLIENT, new Object[]
+ { effectiveValue }, callback);
}
catch (RuntimeException ex)
{
rethrowValidationException(ex);
}
- if (resultHolder.hasValue()) return resultHolder.get();
+ if (resultHolder.hasValue())
+ return resultHolder.get();
return translator.parse(effectiveValue);
}
@@ -126,31 +134,35 @@ public class FieldValidationSupportImpl
/**
* Checks for a {@link org.apache.tapestry5.ValidationException} inside the outer exception and throws that,
* otherwise rethrows the runtime exception.
- *
- * @param outerException initially caught exception
- * @throws ValidationException if found
+ *
+ * @param outerException
+ * initially caught exception
+ * @throws ValidationException
+ * if found
*/
private void rethrowValidationException(RuntimeException outerException) throws ValidationException
{
ValidationException ve = ExceptionUtils.findCause(outerException, ValidationException.class);
- if (ve != null) throw ve;
+ if (ve != null)
+ throw ve;
throw outerException;
}
- @SuppressWarnings({"unchecked"})
+ @SuppressWarnings(
+ { "unchecked" })
public void validate(Object value, ComponentResources componentResources, FieldValidator validator)
throws ValidationException
{
- Defense.notNull(componentResources, "componentResources");
- Defense.notNull(validator, "validator");
-
+ assert componentResources != null;
+ assert validator != null;
validator.validate(value);
try
{
- componentResources.triggerEvent(EventConstants.VALIDATE, new Object[] {value}, null);
+ componentResources.triggerEvent(EventConstants.VALIDATE, new Object[]
+ { value }, null);
}
catch (RuntimeException ex)
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldValidatorSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldValidatorSourceImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldValidatorSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldValidatorSourceImpl.java Wed Jul 14 15:51:30 2010
@@ -15,8 +15,6 @@
package org.apache.tapestry5.internal.services;
import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
-import static org.apache.tapestry5.ioc.internal.util.Defense.cast;
-import static org.apache.tapestry5.ioc.internal.util.Defense.notBlank;
import java.util.List;
import java.util.Locale;
@@ -37,7 +35,7 @@ import org.apache.tapestry5.services.For
import org.apache.tapestry5.services.ValidationMessagesSource;
import org.apache.tapestry5.validator.ValidatorMacro;
-@SuppressWarnings("unchecked")
+@SuppressWarnings("all")
public class FieldValidatorSourceImpl implements FieldValidatorSource
{
private final ValidationMessagesSource messagesSource;
@@ -62,9 +60,8 @@ public class FieldValidatorSourceImpl im
public FieldValidator createValidator(Field field, String validatorType, String constraintValue)
{
- Component component = cast(field, Component.class, "field");
- notBlank(validatorType, "validatorType");
-
+ Component component = (Component) field;
+ assert InternalUtils.isNonBlank(validatorType);
ComponentResources componentResources = component.getComponentResources();
String overrideId = componentResources.getId();
Locale locale = componentResources.getLocale();
@@ -80,8 +77,7 @@ public class FieldValidatorSourceImpl im
public FieldValidator createValidator(Field field, String validatorType, String constraintValue, String overrideId,
Messages overrideMessages, Locale locale)
{
- notBlank(validatorType, "validatorType");
-
+ assert InternalUtils.isNonBlank(validatorType);
Validator validator = validators.get(validatorType);
if (validator == null)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/HeartbeatImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/HeartbeatImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/HeartbeatImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/HeartbeatImpl.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,14 +14,14 @@
package org.apache.tapestry5.internal.services;
-import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newStack;
-import org.apache.tapestry5.ioc.internal.util.Defense;
-import org.apache.tapestry5.ioc.util.Stack;
-import org.apache.tapestry5.services.Heartbeat;
import java.util.List;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.util.Stack;
+import org.apache.tapestry5.services.Heartbeat;
+
public class HeartbeatImpl implements Heartbeat
{
private final Stack<List<Runnable>> stack = newStack();
@@ -35,7 +35,7 @@ public class HeartbeatImpl implements He
public void defer(Runnable command)
{
- Defense.notNull(command, "command");
+ assert command != null;
stack.peek().add(command);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/HiddenFieldLocationRulesImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/HiddenFieldLocationRulesImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/HiddenFieldLocationRulesImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/HiddenFieldLocationRulesImpl.java Wed Jul 14 15:51:30 2010
@@ -1,12 +1,25 @@
+// 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.
+// You may obtain a copy of the License at
+//
+// 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,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry5.internal.services;
+import java.util.Map;
+
import org.apache.tapestry5.dom.Element;
-import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.services.HiddenFieldLocationRules;
import org.apache.tapestry5.services.RelativeElementPosition;
-import java.util.Map;
-
public class HiddenFieldLocationRulesImpl implements HiddenFieldLocationRules
{
private final Map<String, RelativeElementPosition> configuration;
@@ -18,13 +31,13 @@ public class HiddenFieldLocationRulesImp
private boolean match(Element element, RelativeElementPosition position)
{
- Defense.notNull(element, "element");
-
+ assert element != null;
String key = element.getName();
RelativeElementPosition actual = configuration.get(key);
- if (actual == null) return false;
+ if (actual == null)
+ return false;
return actual == position;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ImmediateActionRenderResponseGenerator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ImmediateActionRenderResponseGenerator.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ImmediateActionRenderResponseGenerator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ImmediateActionRenderResponseGenerator.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,13 +14,12 @@
package org.apache.tapestry5.internal.services;
+import java.io.IOException;
+
import org.apache.tapestry5.internal.InternalConstants;
import org.apache.tapestry5.internal.structure.Page;
-import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.services.Request;
-import java.io.IOException;
-
/**
* Alternative implementation, used when {@link org.apache.tapestry5.SymbolConstants#SUPPRESS_REDIRECT_FROM_ACTION_REQUESTS}
* is set to true.
@@ -36,11 +35,7 @@ public class ImmediateActionRenderRespon
public void generateResponse(Page page) throws IOException
{
- Defense.notNull(page, "page");
-
- // This can happen when the ComponentEventRequestHandlerImpl notices that the response
- // is not yet committed, and sets up to render a default response for the page containing
- // the component.
+ assert page != null;
if (request.getAttribute(InternalConstants.IMMEDIATE_RESPONSE_PAGE_ATTRIBUTE) != null) return;
// We are somewhere in the middle of processing an action request, possibly something
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalClassTransformationImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalClassTransformationImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalClassTransformationImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalClassTransformationImpl.java Wed Jul 14 15:51:30 2010
@@ -32,7 +32,6 @@ import org.apache.tapestry5.func.Predica
import org.apache.tapestry5.internal.InternalComponentResources;
import org.apache.tapestry5.ioc.internal.services.CtClassSource;
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.ClassFab;
import org.apache.tapestry5.ioc.services.ClassFabUtils;
@@ -51,6 +50,7 @@ import org.slf4j.Logger;
/**
* Implementation of the {@link org.apache.tapestry5.internal.services.InternalClassTransformation} interface.
*/
+@SuppressWarnings("all")
public final class InternalClassTransformationImpl implements InternalClassTransformation
{
public static final MethodSignature INVOKE_SIGNATURE = new MethodSignature(MethodInvocationResult.class, "invoke",
@@ -175,7 +175,7 @@ public final class InternalClassTransfor
{
failIfFrozen();
- Defense.notNull(advice, "advice");
+ assert advice != null;
if (builder == null)
builder = createBuilder(sig);
@@ -498,7 +498,7 @@ public final class InternalClassTransfor
public void claim(Object tag)
{
- Defense.notNull(tag, "tag");
+ assert tag != null;
failIfFrozen();
@@ -719,7 +719,7 @@ public final class InternalClassTransfor
public <T> void injectIndirect(ComponentValueProvider<T> provider)
{
- Defense.notNull(provider, "provider");
+ assert provider != null;
failIfFrozen();
@@ -1039,7 +1039,9 @@ public final class InternalClassTransfor
{
failIfFrozen();
- String memberName = InternalUtils.createMemberName(Defense.notBlank(suggested, "suggested"));
+ assert InternalUtils.isNonBlank(suggested);
+
+ String memberName = InternalUtils.createMemberName(suggested);
return idAllocator.allocateId(memberName);
}
@@ -1505,7 +1507,7 @@ public final class InternalClassTransfor
public List<String> findFields(final FieldFilter filter)
{
- Defense.notNull(filter, "filter");
+ assert filter != null;
failIfFrozen();
@@ -1553,7 +1555,7 @@ public final class InternalClassTransfor
public List<TransformMethodSignature> findMethods(final MethodFilter filter)
{
- Defense.notNull(filter, "filter");
+ assert filter != null;
List<TransformMethod> methods = matchMethods(new Predicate<TransformMethod>()
{
@@ -1692,7 +1694,7 @@ public final class InternalClassTransfor
// Returns String for backwards compatibility reasons
public String addInjectedField(Class type, String suggestedName, Object value)
{
- Defense.notNull(type, "type");
+ assert type != null;
failIfFrozen();
@@ -1717,8 +1719,8 @@ public final class InternalClassTransfor
public <T> TransformField addIndirectInjectedField(Class<T> type, String suggestedName,
ComponentValueProvider<T> provider)
{
- Defense.notNull(type, "type");
- Defense.notNull(provider, "provider");
+ assert type != null;
+ assert provider != null;
TransformField field = createField(Modifier.PROTECTED | Modifier.FINAL, type.getName(), suggestedName);
@@ -1799,7 +1801,7 @@ public final class InternalClassTransfor
public boolean isMethod(TransformMethodSignature signature)
{
- Defense.notNull(signature, "signature");
+ assert signature != null;
return methods.containsKey(signature);
}
@@ -2303,7 +2305,7 @@ public final class InternalClassTransfor
{
failIfFrozen();
- Defense.notNull(signature, "signature");
+ assert signature != null;
return methods.containsKey(signature);
}
@@ -2345,9 +2347,9 @@ public final class InternalClassTransfor
public void addComponentEventHandler(String eventType, int minContextValues, String methodDescription,
ComponentEventHandler handler)
{
- Defense.notBlank(eventType, "eventType");
- Defense.notBlank(methodDescription, "methodDescription");
- Defense.notNull(handler, "handler");
+ assert InternalUtils.isNonBlank(eventType);
+ assert InternalUtils.isNonBlank(methodDescription);
+ assert handler != null;
componentModel.addEventHandler(eventType);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkImpl.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,14 @@
package org.apache.tapestry5.internal.services;
+import java.util.List;
+import java.util.Map;
+
import org.apache.tapestry5.Link;
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.services.Response;
-import java.util.List;
-import java.util.Map;
-
public class LinkImpl implements Link
{
private Map<String, String> parameters;
@@ -51,8 +50,7 @@ public class LinkImpl implements Link
public Link copyWithBasePath(String basePath)
{
- Defense.notNull(basePath, "basePath");
-
+ assert basePath != null;
LinkImpl copy = new LinkImpl(basePath, optimizable, forForm, response, optimizer);
copy.anchor = anchor;
@@ -67,9 +65,8 @@ public class LinkImpl implements Link
public void addParameter(String parameterName, String value)
{
- Defense.notBlank(parameterName, "parameterName");
- Defense.notBlank(value, "value");
-
+ assert InternalUtils.isNonBlank(parameterName);
+ assert InternalUtils.isNonBlank(value);
if (parameters == null)
parameters = CollectionFactory.newMap();
@@ -83,8 +80,7 @@ public class LinkImpl implements Link
public void removeParameter(String parameterName)
{
- Defense.notBlank(parameterName, "parameterName");
-
+ assert InternalUtils.isNonBlank(parameterName);
if (parameters != null)
parameters.remove(parameterName);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkSourceImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkSourceImpl.java Wed Jul 14 15:51:30 2010
@@ -14,16 +14,24 @@
package org.apache.tapestry5.internal.services;
+import java.util.List;
+
import org.apache.tapestry5.Link;
import org.apache.tapestry5.internal.TapestryInternalUtils;
import org.apache.tapestry5.internal.structure.Page;
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.TypeCoercer;
-import org.apache.tapestry5.services.*;
-
-import java.util.List;
+import org.apache.tapestry5.services.ComponentClassResolver;
+import org.apache.tapestry5.services.ComponentEventLinkEncoder;
+import org.apache.tapestry5.services.ComponentEventRequestParameters;
+import org.apache.tapestry5.services.LinkCreationHub;
+import org.apache.tapestry5.services.LinkCreationListener;
+import org.apache.tapestry5.services.LinkCreationListener2;
+import org.apache.tapestry5.services.PageRenderRequestParameters;
+import org.apache.tapestry5.services.RequestGlobals;
+@SuppressWarnings("all")
public class LinkSourceImpl implements LinkSource, LinkCreationHub
{
private final PageRenderQueue pageRenderQueue;
@@ -60,8 +68,8 @@ public class LinkSourceImpl implements L
public Link createComponentEventLink(Page page, String nestedId, String eventType, boolean forForm,
Object... eventContext)
{
- Defense.notNull(page, "page");
- Defense.notBlank(eventType, "action");
+ assert page != null;
+ assert InternalUtils.isNonBlank(eventType);
Page activePage = pageRenderQueue.getRenderingPage();
@@ -123,7 +131,7 @@ public class LinkSourceImpl implements L
public void addListener(LinkCreationListener listener)
{
- Defense.notNull(listener, "listener");
+ assert listener != null;
addListener(TapestryInternalUtils.toLinkCreationListener2(listener));
}
@@ -135,7 +143,7 @@ public class LinkSourceImpl implements L
public void addListener(LinkCreationListener2 listener)
{
- Defense.notNull(listener, "listener");
+ assert listener != null;
listeners.add(listener);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MarkupWriterImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MarkupWriterImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MarkupWriterImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MarkupWriterImpl.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.
@@ -14,16 +14,19 @@
package org.apache.tapestry5.internal.services;
-import org.apache.tapestry5.MarkupWriter;
-import org.apache.tapestry5.MarkupWriterListener;
-import org.apache.tapestry5.dom.*;
-import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry5.ioc.internal.util.Defense;
-
import java.io.PrintWriter;
import java.util.Collection;
import java.util.List;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.MarkupWriterListener;
+import org.apache.tapestry5.dom.DefaultMarkupModel;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.dom.Element;
+import org.apache.tapestry5.dom.MarkupModel;
+import org.apache.tapestry5.dom.Text;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+
public class MarkupWriterImpl implements MarkupWriter
{
private final Document document;
@@ -242,8 +245,7 @@ public class MarkupWriterImpl implements
public void addListener(MarkupWriterListener listener)
{
- Defense.notNull(listener, "listener");
-
+ assert listener != null;
if (listeners == null) listeners = CollectionFactory.newList();
listeners.add(listener);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderQueueImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderQueueImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderQueueImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderQueueImpl.java Wed Jul 14 15:51:30 2010
@@ -1,4 +1,4 @@
-// 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.
@@ -15,13 +15,11 @@
package org.apache.tapestry5.internal.services;
import org.apache.tapestry5.MarkupWriter;
-import org.apache.tapestry5.dom.Element;
import org.apache.tapestry5.internal.structure.Page;
import org.apache.tapestry5.ioc.LoggerSource;
import org.apache.tapestry5.ioc.ScopeConstants;
import org.apache.tapestry5.ioc.annotations.Scope;
import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.ioc.util.Stack;
import org.apache.tapestry5.json.JSONObject;
import org.apache.tapestry5.runtime.RenderCommand;
@@ -76,8 +74,7 @@ public class PageRenderQueueImpl impleme
public void setRenderingPage(Page page)
{
- Defense.notNull(page, "page");
-
+ assert page != null;
this.page = page;
}
@@ -88,8 +85,7 @@ public class PageRenderQueueImpl impleme
public void initializeForPartialPageRender(RenderCommand rootCommand)
{
- Defense.notNull(rootCommand, "rootCommand");
-
+ assert rootCommand != null;
if (page == null)
throw new IllegalStateException("Page must be specified before root render command.");
@@ -123,8 +119,7 @@ public class PageRenderQueueImpl impleme
public void addPartialMarkupRendererFilter(PartialMarkupRendererFilter filter)
{
- Defense.notNull(filter, "filter");
-
+ assert filter != null;
filters.push(filter);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageResponseRendererImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageResponseRendererImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageResponseRendererImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageResponseRendererImpl.java Wed Jul 14 15:51:30 2010
@@ -1,10 +1,10 @@
-// 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.
// 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,17 +14,16 @@
package org.apache.tapestry5.internal.services;
+import java.io.IOException;
+import java.io.PrintWriter;
+
import org.apache.tapestry5.ContentType;
import org.apache.tapestry5.MarkupWriter;
import org.apache.tapestry5.internal.structure.Page;
-import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.services.MarkupWriterFactory;
import org.apache.tapestry5.services.Response;
import org.slf4j.Logger;
-import java.io.IOException;
-import java.io.PrintWriter;
-
public class PageResponseRendererImpl implements PageResponseRenderer
{
private final PageMarkupRenderer markupRenderer;
@@ -38,7 +37,7 @@ public class PageResponseRendererImpl im
private final Logger logger;
public PageResponseRendererImpl(MarkupWriterFactory markupWriterFactory, PageMarkupRenderer markupRenderer,
- PageContentTypeAnalyzer pageContentTypeAnalyzer, Response response, Logger logger)
+ PageContentTypeAnalyzer pageContentTypeAnalyzer, Response response, Logger logger)
{
this.markupWriterFactory = markupWriterFactory;
this.markupRenderer = markupRenderer;
@@ -49,7 +48,7 @@ public class PageResponseRendererImpl im
public void renderPageResponse(Page page) throws IOException
{
- Defense.notNull(page, "page");
+ assert page != null;
ContentType contentType = pageContentTypeAnalyzer.findContentType(page);
@@ -73,8 +72,7 @@ public class PageResponseRendererImpl im
long elapsedNanos = endNanos - startNanos;
double elapsedSeconds = ((float) elapsedNanos) / 1000000000F;
- logger.debug(String.format("Response DOM streamed to markup in %.3f seconds",
- elapsedSeconds));
+ logger.debug(String.format("Response DOM streamed to markup in %.3f seconds", elapsedSeconds));
}
pw.close();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentFieldChangeImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentFieldChangeImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentFieldChangeImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentFieldChangeImpl.java Wed Jul 14 15:51:30 2010
@@ -1,10 +1,10 @@
-// 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.
// 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,7 @@
package org.apache.tapestry5.internal.services;
-import static org.apache.tapestry5.ioc.internal.util.Defense.notBlank;
-import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.apache.tapestry5.services.PersistentFieldChange;
public class PersistentFieldChangeImpl implements PersistentFieldChange
@@ -26,11 +25,10 @@ public class PersistentFieldChangeImpl i
private final Object value;
- public PersistentFieldChangeImpl(final String componentId, final String fieldName,
- final Object value)
+ public PersistentFieldChangeImpl(final String componentId, final String fieldName, final Object value)
{
- notNull(componentId, "componentId");
- notBlank(fieldName, "fieldName");
+ assert componentId != null;
+ assert InternalUtils.isNonBlank(fieldName);
this.componentId = componentId;
this.fieldName = fieldName;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentLocaleImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentLocaleImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentLocaleImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentLocaleImpl.java Wed Jul 14 15:51:30 2010
@@ -21,7 +21,6 @@ import org.apache.tapestry5.SymbolConsta
import org.apache.tapestry5.internal.TapestryInternalUtils;
import org.apache.tapestry5.ioc.annotations.Symbol;
import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.ioc.services.PerthreadManager;
import org.apache.tapestry5.services.PersistentLocale;
@@ -49,8 +48,7 @@ public class PersistentLocaleImpl implem
public void set(Locale locale)
{
- Defense.notNull(locale, "locale");
-
+ assert locale != null;
if (!localeNames.contains(locale.toString().toLowerCase()))
{
String message = String
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PropertyConduitSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PropertyConduitSourceImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PropertyConduitSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PropertyConduitSourceImpl.java Wed Jul 14 15:51:30 2010
@@ -33,13 +33,11 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.Set;
import org.antlr.runtime.ANTLRInputStream;
import org.antlr.runtime.CommonTokenStream;
@@ -52,7 +50,6 @@ import org.apache.tapestry5.internal.uti
import org.apache.tapestry5.ioc.AnnotationProvider;
import org.apache.tapestry5.ioc.internal.NullAnnotationProvider;
import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.ioc.internal.util.GenericsUtils;
import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.apache.tapestry5.ioc.services.ClassFab;
@@ -1187,9 +1184,8 @@ public class PropertyConduitSourceImpl i
public PropertyConduit create(Class rootClass, String expression)
{
- Defense.notNull(rootClass, "rootType");
- Defense.notBlank(expression, "expression");
-
+ assert rootClass != null;
+ assert InternalUtils.isNonBlank(expression);
Class effectiveClass = toEffectiveClass(rootClass);
MultiKey key = new MultiKey(effectiveClass, expression);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderQueueImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderQueueImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderQueueImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderQueueImpl.java Wed Jul 14 15:51:30 2010
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007, 2008 The Apache Software Foundation
+// Copyright 2006, 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.
@@ -18,7 +18,6 @@ import org.apache.tapestry5.ComponentRes
import org.apache.tapestry5.MarkupWriter;
import org.apache.tapestry5.TapestryMarkers;
import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.ioc.util.Stack;
import org.apache.tapestry5.runtime.RenderCommand;
import org.apache.tapestry5.runtime.RenderQueue;
@@ -41,8 +40,7 @@ public class RenderQueueImpl implements
public void push(RenderCommand command)
{
- Defense.notNull(command, "command");
-
+ assert command != null;
queue.push(command);
}
@@ -100,8 +98,7 @@ public class RenderQueueImpl implements
public void startComponent(ComponentResources resources)
{
- Defense.notNull(resources, "resources");
-
+ assert resources != null;
renderingComponents.push(resources);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderSupportImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderSupportImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderSupportImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderSupportImpl.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.
@@ -18,7 +18,7 @@ import org.apache.tapestry5.Asset;
import org.apache.tapestry5.ComponentResources;
import org.apache.tapestry5.FieldFocusPriority;
import org.apache.tapestry5.RenderSupport;
-import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.apache.tapestry5.ioc.services.SymbolSource;
import org.apache.tapestry5.json.JSONArray;
import org.apache.tapestry5.json.JSONObject;
@@ -70,7 +70,7 @@ public class RenderSupportImpl implement
{
for (Asset asset : scriptAssets)
{
- Defense.notNull(asset, "scriptAsset");
+ assert asset != null;
javascriptSupport.importJavascriptLibrary(asset);
}
@@ -131,9 +131,8 @@ public class RenderSupportImpl implement
public void autofocus(FieldFocusPriority priority, String fieldId)
{
- Defense.notNull(priority, "priority");
- Defense.notBlank(fieldId, "fieldId");
-
+ assert priority != null;
+ assert InternalUtils.isNonBlank(fieldId);
if (focusFieldId == null || priority.compareTo(focusPriority) > 0)
{
this.focusPriority = priority;
@@ -149,8 +148,8 @@ public class RenderSupportImpl implement
*/
private void addInitFunctionInvocation(String functionName, Object parameters)
{
- Defense.notBlank(functionName, "functionName");
- Defense.notNull(parameters, "parameters");
+ assert InternalUtils.isNonBlank(functionName);
+ assert parameters != null;
JSONArray list = new JSONArray().put(parameters);
JSONObject wrapper = new JSONObject().put(functionName, list);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestPageCacheImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestPageCacheImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestPageCacheImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestPageCacheImpl.java Wed Jul 14 15:51:30 2010
@@ -14,14 +14,13 @@
package org.apache.tapestry5.internal.services;
+import java.util.Map;
+
import org.apache.tapestry5.internal.structure.Page;
import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.ioc.services.ThreadCleanupListener;
import org.apache.tapestry5.services.ComponentClassResolver;
-import java.util.Map;
-
/**
* This is the original implementation, which is built around the {@link PagePool}.
*/
@@ -43,7 +42,7 @@ public class RequestPageCacheImpl implem
public Page get(String pageName)
{
- Defense.notNull(pageName, "pageName");
+ assert pageName != null;
String canonicalName = resolver.canonicalizePageName(pageName);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResponseImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResponseImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResponseImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResponseImpl.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.
@@ -14,12 +14,18 @@
package org.apache.tapestry5.internal.services;
-import org.apache.tapestry5.Link;
-import org.apache.tapestry5.ioc.internal.util.Defense;
-import org.apache.tapestry5.services.Response;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.Writer;
import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.services.Response;
/**
* Implementation of {@link Response} that wraps around an underlying {@link HttpServletResponse}.
@@ -30,15 +36,13 @@ public class ResponseImpl implements Res
public ResponseImpl(HttpServletResponse response)
{
- Defense.notNull(response, "response");
-
+ assert response != null;
this.response = response;
}
public PrintWriter getPrintWriter(String contentType) throws IOException
{
- Defense.notBlank(contentType, "contentType");
-
+ assert InternalUtils.isNonBlank(contentType);
OutputStream os = getOutputStream(contentType);
Writer w = new OutputStreamWriter(os, response.getCharacterEncoding());
@@ -63,8 +67,7 @@ public class ResponseImpl implements Res
public void sendRedirect(Link link) throws IOException
{
- Defense.notNull(link, "link");
-
+ assert link != null;
String redirectURL = encodeRedirectURL(link.toRedirectURI());
sendRedirect(redirectURL);
@@ -77,8 +80,7 @@ public class ResponseImpl implements Res
public OutputStream getOutputStream(String contentType) throws IOException
{
- Defense.notBlank(contentType, "contentType");
-
+ assert InternalUtils.isNonBlank(contentType);
response.setContentType(contentType);
return response.getOutputStream();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResponseRendererImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResponseRendererImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResponseRendererImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResponseRendererImpl.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,14 +14,13 @@
package org.apache.tapestry5.internal.services;
+import java.io.IOException;
+
import org.apache.tapestry5.ContentType;
import org.apache.tapestry5.internal.structure.Page;
-import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.runtime.Component;
import org.apache.tapestry5.services.ResponseRenderer;
-import java.io.IOException;
-
public class ResponseRendererImpl implements ResponseRenderer
{
private final RequestPageCache pageCache;
@@ -31,7 +30,7 @@ public class ResponseRendererImpl implem
private final PageResponseRenderer renderer;
public ResponseRendererImpl(RequestPageCache pageCache, PageContentTypeAnalyzer pageContentAnalyzer,
- PageResponseRenderer renderer)
+ PageResponseRenderer renderer)
{
this.pageCache = pageCache;
this.pageContentAnalyzer = pageContentAnalyzer;
@@ -40,7 +39,7 @@ public class ResponseRendererImpl implem
public ContentType findContentType(Object component)
{
- Component c = Defense.cast(component, Component.class, "component");
+ Component c = (Component) component;
String pageName = c.getComponentResources().getPageName();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/URLEncoderImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/URLEncoderImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/URLEncoderImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/URLEncoderImpl.java Wed Jul 14 15:51:30 2010
@@ -1,10 +1,10 @@
-// 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.
// 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,18 +14,17 @@
package org.apache.tapestry5.internal.services;
-import org.apache.tapestry5.ioc.internal.util.Defense;
-import org.apache.tapestry5.services.URLEncoder;
-
import java.util.BitSet;
+import org.apache.tapestry5.services.URLEncoder;
+
public class URLEncoderImpl implements URLEncoder
{
static final String ENCODED_NULL = "$N";
static final String ENCODED_BLANK = "$B";
/**
- * Bit set indicating which character are safe to pass through (when encoding or decoding) as-is. All other
+ * Bit set indicating which character are safe to pass through (when encoding or decoding) as-is. All other
* characters are encoded as a kind of unicode escape.
*/
private final BitSet safe = new BitSet(128);
@@ -44,12 +43,13 @@ public class URLEncoderImpl implements U
}
}
-
public String encode(String input)
{
- if (input == null) return ENCODED_NULL;
+ if (input == null)
+ return ENCODED_NULL;
- if (input.equals("")) return ENCODED_BLANK;
+ if (input.equals(""))
+ return ENCODED_BLANK;
boolean dirty = false;
@@ -85,11 +85,13 @@ public class URLEncoderImpl implements U
public String decode(String input)
{
- Defense.notNull(input, "input");
+ assert input != null;
- if (input.equals(ENCODED_NULL)) return null;
+ if (input.equals(ENCODED_NULL))
+ return null;
- if (input.equals(ENCODED_BLANK)) return "";
+ if (input.equals(ENCODED_BLANK))
+ return "";
boolean dirty = false;
@@ -133,18 +135,16 @@ public class URLEncoderImpl implements U
}
}
- throw new IllegalArgumentException(String.format(
- "Input string '%s' is not valid; the '$' character at position %d should be followed by another '$' or a four digit hex number (a unicode value).",
- input, i + 1));
- }
-
- if (!safe.get((int) ch))
- {
throw new IllegalArgumentException(
- String.format("Input string '%s' is not valid; the character '%s' at position %d is not valid.",
- input, ch, i + 1));
+ String.format(
+ "Input string '%s' is not valid; the '$' character at position %d should be followed by another '$' or a four digit hex number (a unicode value).",
+ input, i + 1));
}
+ if (!safe.get((int) ch)) { throw new IllegalArgumentException(
+ String.format("Input string '%s' is not valid; the character '%s' at position %d is not valid.",
+ input, ch, i + 1)); }
+
output.append(ch);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/URLRewriterImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/URLRewriterImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/URLRewriterImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/URLRewriterImpl.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,8 +14,10 @@
package org.apache.tapestry5.internal.services;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.tapestry5.ioc.annotations.UsesOrderedConfiguration;
-import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.services.ComponentEventRequestParameters;
import org.apache.tapestry5.services.PageRenderRequestParameters;
import org.apache.tapestry5.services.Request;
@@ -23,9 +25,6 @@ import org.apache.tapestry5.services.URL
import org.apache.tapestry5.urlrewriter.URLRewriteContext;
import org.apache.tapestry5.urlrewriter.URLRewriterRule;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* Default {@linkplain org.apache.tapestry5.services.URLRewriter} implementation.
@@ -47,7 +46,7 @@ public class URLRewriterImpl implements
*/
public URLRewriterImpl(List<URLRewriterRule> rules)
{
- Defense.notNull(rules, "rules");
+ assert rules != null;
this.incomingRules = new ArrayList<URLRewriterRule>();
this.outgoingRules = new ArrayList<URLRewriterRule>();
for(URLRewriterRule rule : rules)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/URLRewriterRequestFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/URLRewriterRequestFilter.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/URLRewriterRequestFilter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/URLRewriterRequestFilter.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.
@@ -15,8 +15,11 @@ package org.apache.tapestry5.internal.se
import java.io.IOException;
-import org.apache.tapestry5.ioc.internal.util.Defense;
-import org.apache.tapestry5.services.*;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.RequestFilter;
+import org.apache.tapestry5.services.RequestHandler;
+import org.apache.tapestry5.services.Response;
+import org.apache.tapestry5.services.URLRewriter;
/**
* <code>RequestFilter</code> that applies the URL rewriting rules to requests.
@@ -34,7 +37,7 @@ public class URLRewriterRequestFilter im
*/
public URLRewriterRequestFilter(URLRewriter urlRewriter)
{
- Defense.notNull(urlRewriter, "urlRewriter");
+ assert urlRewriter != null;
this.urlRewriter = urlRewriter;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ValidationConstraintGeneratorImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ValidationConstraintGeneratorImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ValidationConstraintGeneratorImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ValidationConstraintGeneratorImpl.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,13 +14,13 @@
package org.apache.tapestry5.internal.services;
+import java.util.List;
+
import org.apache.tapestry5.ioc.AnnotationProvider;
import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
import org.apache.tapestry5.services.ValidationConstraintGenerator;
-import java.util.List;
-
+@SuppressWarnings("all")
public class ValidationConstraintGeneratorImpl implements ValidationConstraintGenerator
{
private final List<ValidationConstraintGenerator> configuration;
@@ -32,9 +32,8 @@ public class ValidationConstraintGenerat
public List<String> buildConstraints(Class propertyType, AnnotationProvider annotationProvider)
{
- notNull(propertyType, "propertyType");
- notNull(annotationProvider, "annotationProvider");
-
+ assert propertyType != null;
+ assert annotationProvider != null;
List<String> result = CollectionFactory.newList();
for (ValidationConstraintGenerator g : configuration)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ValueEncoderSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ValueEncoderSourceImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ValueEncoderSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ValueEncoderSourceImpl.java Wed Jul 14 15:51:30 2010
@@ -1,4 +1,4 @@
-// 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.
@@ -14,16 +14,16 @@
package org.apache.tapestry5.internal.services;
+import java.util.Map;
+
import org.apache.tapestry5.ValueEncoder;
import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.ioc.util.StrategyRegistry;
import org.apache.tapestry5.services.InvalidationListener;
import org.apache.tapestry5.services.ValueEncoderFactory;
import org.apache.tapestry5.services.ValueEncoderSource;
-import java.util.Map;
-
+@SuppressWarnings("all")
public class ValueEncoderSourceImpl implements ValueEncoderSource, InvalidationListener
{
private final StrategyRegistry<ValueEncoderFactory> registry;
@@ -38,8 +38,7 @@ public class ValueEncoderSourceImpl impl
@SuppressWarnings({"unchecked"})
public <T> ValueEncoder<T> getValueEncoder(Class<T> type)
{
- Defense.notNull(type, "type");
-
+ assert type != null;
ValueEncoder<T> result = cache.get(type);
if (result == null)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ajax/JavascriptSupportImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ajax/JavascriptSupportImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ajax/JavascriptSupportImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ajax/JavascriptSupportImpl.java Wed Jul 14 15:51:30 2010
@@ -26,7 +26,7 @@ import org.apache.tapestry5.internal.Int
import org.apache.tapestry5.internal.services.DocumentLinker;
import org.apache.tapestry5.internal.services.javascript.JavascriptStackPathConstructor;
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.Coercion;
import org.apache.tapestry5.ioc.util.IdAllocator;
import org.apache.tapestry5.json.JSONArray;
@@ -127,10 +127,9 @@ public class JavascriptSupportImpl imple
private void storeInitializerCall(InitializationPriority priority, String functionName, Object parameter)
{
- Defense.notNull(priority, "priority");
- Defense.notBlank(functionName, "functionName");
- Defense.notNull(parameter, "parameter");
-
+ assert priority != null;
+ assert parameter != null;
+ assert InternalUtils.isNonBlank(functionName);
addCoreStackIfNeeded();
JSONObject init = inits.get(priority);
@@ -170,9 +169,8 @@ public class JavascriptSupportImpl imple
public void addScript(InitializationPriority priority, String format, Object... arguments)
{
addCoreStackIfNeeded();
-
- Defense.notNull(priority, "priority");
- Defense.notBlank(format, "format");
+ assert priority != null;
+ assert InternalUtils.isNonBlank(format);
String newScript = arguments.length == 0 ? format : String.format(format, arguments);
@@ -196,8 +194,7 @@ public class JavascriptSupportImpl imple
public void importJavascriptLibrary(Asset asset)
{
- Defense.notNull(asset, "asset");
-
+ assert asset != null;
importJavascriptLibrary(asset.toClientURL());
}
@@ -237,17 +234,13 @@ public class JavascriptSupportImpl imple
public void importStylesheet(Asset stylesheet)
{
- Defense.notNull(stylesheet, "stylesheet");
-
+ assert stylesheet != null;
importStylesheet(new StylesheetLink(stylesheet));
}
public void importStylesheet(StylesheetLink stylesheetLink)
{
- Defense.notNull(stylesheetLink, "stylesheetLink");
-
- // Assumes no overlap between stack stylesheets and all other stylesheets
-
+ assert stylesheetLink != null;
String stylesheetURL = stylesheetLink.getURL();
if (importedStylesheetURLs.contains(stylesheetURL))
@@ -260,8 +253,7 @@ public class JavascriptSupportImpl imple
public void importStack(String stackName)
{
- Defense.notBlank(stackName, "stackName");
-
+ assert InternalUtils.isNonBlank(stackName);
addCoreStackIfNeeded();
addAssetsFromStack(stackName);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JavascriptStackPathConstructorImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JavascriptStackPathConstructorImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JavascriptStackPathConstructorImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JavascriptStackPathConstructorImpl.java Wed Jul 14 15:51:30 2010
@@ -23,7 +23,6 @@ import org.apache.tapestry5.func.Mapper;
import org.apache.tapestry5.internal.services.RequestConstants;
import org.apache.tapestry5.ioc.annotations.Symbol;
import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.ioc.services.ThreadLocale;
import org.apache.tapestry5.services.assets.AssetPathConstructor;
import org.apache.tapestry5.services.javascript.JavascriptStack;
@@ -73,8 +72,7 @@ public class JavascriptStackPathConstruc
private List<String> toPaths(List<Asset> assets)
{
- Defense.notNull(assets, "source");
-
+ assert assets != null;
return F.flow(assets).map(toPath).toList();
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementImpl.java Wed Jul 14 15:51:30 2010
@@ -39,7 +39,6 @@ import org.apache.tapestry5.ioc.BaseLoca
import org.apache.tapestry5.ioc.Invokable;
import org.apache.tapestry5.ioc.Location;
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.Orderer;
import org.apache.tapestry5.ioc.internal.util.TapestryException;
@@ -1067,9 +1066,8 @@ public class ComponentPageElementImpl ex
public boolean triggerContextEvent(final String eventType, final EventContext context,
final ComponentEventCallback callback)
{
- Defense.notBlank(eventType, "eventType");
- Defense.notNull(context, "context");
-
+ assert InternalUtils.isNonBlank(eventType);
+ assert context != null;
String description = String.format("Triggering event '%s' on %s", eventType, completeId);
return elementResources.invoke(description, new Invokable<Boolean>()
@@ -1219,8 +1217,7 @@ public class ComponentPageElementImpl ex
public Block findBlock(String id)
{
- Defense.notBlank(id, "id");
-
+ assert InternalUtils.isNonBlank(id);
return InternalUtils.get(blocks, id);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementResourcesImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementResourcesImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementResourcesImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementResourcesImpl.java Wed Jul 14 15:51:30 2010
@@ -14,6 +14,8 @@
package org.apache.tapestry5.internal.structure;
+import java.util.Locale;
+
import org.apache.tapestry5.ComponentResources;
import org.apache.tapestry5.Link;
import org.apache.tapestry5.internal.InternalConstants;
@@ -24,7 +26,6 @@ import org.apache.tapestry5.ioc.Invokabl
import org.apache.tapestry5.ioc.LoggerSource;
import org.apache.tapestry5.ioc.Messages;
import org.apache.tapestry5.ioc.OperationTracker;
-import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.ioc.services.PerThreadValue;
import org.apache.tapestry5.ioc.services.PerthreadManager;
import org.apache.tapestry5.ioc.services.TypeCoercer;
@@ -34,8 +35,6 @@ import org.apache.tapestry5.services.Con
import org.apache.tapestry5.services.messages.ComponentMessagesSource;
import org.slf4j.Logger;
-import java.util.Locale;
-
public class ComponentPageElementResourcesImpl implements ComponentPageElementResources
{
private final Locale locale;
@@ -109,8 +108,7 @@ public class ComponentPageElementResourc
public Link createPageRenderLink(Class pageClass, boolean override, Object... context)
{
- Defense.notNull(pageClass, "pageClass");
-
+ assert pageClass != null;
String pageName = componentClassResolver.resolvePageClassNameToPageName(pageClass.getName());
return linkSource.createPageRenderLink(pageName, override, defaulted(context));
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementResourcesSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementResourcesSourceImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementResourcesSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementResourcesSourceImpl.java Wed Jul 14 15:51:30 2010
@@ -14,22 +14,21 @@
package org.apache.tapestry5.internal.structure;
+import java.util.Locale;
+import java.util.Map;
+
import org.apache.tapestry5.internal.services.ComponentClassCache;
import org.apache.tapestry5.internal.services.LinkSource;
import org.apache.tapestry5.internal.services.RequestPageCache;
import org.apache.tapestry5.ioc.LoggerSource;
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.services.PerthreadManager;
import org.apache.tapestry5.ioc.services.TypeCoercer;
import org.apache.tapestry5.services.ComponentClassResolver;
import org.apache.tapestry5.services.ContextValueEncoder;
import org.apache.tapestry5.services.messages.ComponentMessagesSource;
-import java.util.Locale;
-import java.util.Map;
-
public class ComponentPageElementResourcesSourceImpl implements ComponentPageElementResourcesSource
{
private final Map<Locale, ComponentPageElementResources> cache = CollectionFactory.newConcurrentMap();
@@ -73,8 +72,7 @@ public class ComponentPageElementResourc
public ComponentPageElementResources get(Locale locale)
{
- Defense.notNull(locale, "locale");
-
+ assert locale != null;
ComponentPageElementResources result = cache.get(locale);
if (result == null)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImpl.java Wed Jul 14 15:51:30 2010
@@ -36,7 +36,6 @@ import org.apache.tapestry5.ioc.Messages
import org.apache.tapestry5.ioc.Resource;
import org.apache.tapestry5.ioc.internal.NullAnnotationProvider;
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.TapestryException;
import org.apache.tapestry5.ioc.services.PerThreadValue;
@@ -51,6 +50,7 @@ import org.slf4j.Logger;
* resources to the
* component, including access to its parameters, parameter bindings, and persistent field data.
*/
+@SuppressWarnings("all")
public class InternalComponentResourcesImpl implements InternalComponentResources
{
private final Page page;
@@ -490,9 +490,8 @@ public class InternalComponentResourcesI
public void storeRenderVariable(String name, Object value)
{
- Defense.notBlank(name, "name");
- Defense.notNull(value, "value");
-
+ assert InternalUtils.isNonBlank(name);
+ assert value != null;
if (!element.isRendering())
throw new IllegalStateException(StructureMessages.renderVariableSetWhenNotRendering(getCompleteId(), name));
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageImpl.java?rev=964086&r1=964085&r2=964086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageImpl.java Wed Jul 14 15:51:30 2010
@@ -20,7 +20,6 @@ import java.util.Locale;
import org.apache.tapestry5.ComponentResources;
import org.apache.tapestry5.internal.services.PersistentFieldManager;
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.PerThreadValue;
@@ -86,12 +85,7 @@ public class PageImpl implements Page
public ComponentPageElement getComponentElementByNestedId(String nestedId)
{
- Defense.notNull(nestedId, "nestedId");
-
- // TODO: Especially with the addition of all the caseless logic, and with respect to how
- // forms are implemented, it may be worthwhile to cache the key to element mapping. I think
- // we're going to do it a lot!
-
+ assert nestedId != null;
ComponentPageElement element = rootElement;
if (InternalUtils.isNonBlank(nestedId))
@@ -230,8 +224,7 @@ public class PageImpl implements Page
public void addResetListener(PageResetListener listener)
{
- Defense.notNull(listener, "listener");
-
+ assert listener != null;
lock.check();
resetListeners.add(listener);