You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2014/05/23 16:27:03 UTC
[6/7] Required Java version is now 1.6,
this applies to building as well as to using Tapestry
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/plastic/MethodDescription.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/plastic/MethodDescription.java b/plastic/src/main/java/org/apache/tapestry5/plastic/MethodDescription.java
index c2b9915..b20d4b8 100644
--- a/plastic/src/main/java/org/apache/tapestry5/plastic/MethodDescription.java
+++ b/plastic/src/main/java/org/apache/tapestry5/plastic/MethodDescription.java
@@ -115,6 +115,7 @@ public class MethodDescription implements Comparable<MethodDescription>
.toTypeNames(method.getParameterTypes()), null, PlasticUtils.toTypeNames(method.getExceptionTypes()));
}
+ @Override
public int compareTo(MethodDescription o)
{
int result = methodName.compareTo(o.methodName);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticManager.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticManager.java b/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticManager.java
index 735c9f4..e434387 100644
--- a/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticManager.java
+++ b/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticManager.java
@@ -286,11 +286,13 @@ public class PlasticManager implements PlasticClassListenerHub
return result;
}
+ @Override
public void addPlasticClassListener(PlasticClassListener listener)
{
pool.addPlasticClassListener(listener);
}
+ @Override
public void removePlasticClassListener(PlasticClassListener listener)
{
pool.removePlasticClassListener(listener);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/test/java/org/apache/tapestry5/plastic/test/NoopAdvice.java
----------------------------------------------------------------------
diff --git a/plastic/src/test/java/org/apache/tapestry5/plastic/test/NoopAdvice.java b/plastic/src/test/java/org/apache/tapestry5/plastic/test/NoopAdvice.java
index 7f2b150..46f0f25 100644
--- a/plastic/src/test/java/org/apache/tapestry5/plastic/test/NoopAdvice.java
+++ b/plastic/src/test/java/org/apache/tapestry5/plastic/test/NoopAdvice.java
@@ -20,6 +20,7 @@ import org.apache.tapestry5.plastic.MethodInvocation;
public class NoopAdvice implements MethodAdvice
{
+ @Override
public void advise(MethodInvocation invocation)
{
invocation.proceed();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/test/java/testsubjects/AccessMethodsSubject.java
----------------------------------------------------------------------
diff --git a/plastic/src/test/java/testsubjects/AccessMethodsSubject.java b/plastic/src/test/java/testsubjects/AccessMethodsSubject.java
index 98d7a6e..aa0d273 100644
--- a/plastic/src/test/java/testsubjects/AccessMethodsSubject.java
+++ b/plastic/src/test/java/testsubjects/AccessMethodsSubject.java
@@ -10,11 +10,13 @@ public class AccessMethodsSubject
{
return new IndirectAccess<String>()
{
+ @Override
public String get()
{
return value;
}
+ @Override
public void set(String newValue)
{
value = newValue;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/test/java/testsubjects/ProtectedFieldCollaborator.java
----------------------------------------------------------------------
diff --git a/plastic/src/test/java/testsubjects/ProtectedFieldCollaborator.java b/plastic/src/test/java/testsubjects/ProtectedFieldCollaborator.java
index 1344859..8d8f3da 100644
--- a/plastic/src/test/java/testsubjects/ProtectedFieldCollaborator.java
+++ b/plastic/src/test/java/testsubjects/ProtectedFieldCollaborator.java
@@ -22,6 +22,7 @@ public class ProtectedFieldCollaborator
{
return new ValueGetter()
{
+ @Override
public String getValue()
{
return delegate.protectedValue;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/test/java/testsubjects/TestInjectTransformer.java
----------------------------------------------------------------------
diff --git a/plastic/src/test/java/testsubjects/TestInjectTransformer.java b/plastic/src/test/java/testsubjects/TestInjectTransformer.java
index 853c5b4..21e00df 100644
--- a/plastic/src/test/java/testsubjects/TestInjectTransformer.java
+++ b/plastic/src/test/java/testsubjects/TestInjectTransformer.java
@@ -18,6 +18,7 @@ public class TestInjectTransformer<T> implements PlasticClassTransformer
this.fieldValue = fieldValue;
}
+ @Override
public void transform(PlasticClass plasticClass)
{
for (PlasticField f : plasticClass.getFieldsWithAnnotation(TestInject.class))
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/beanvalidator/modules/BeanValidatorModule.java
----------------------------------------------------------------------
diff --git a/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/beanvalidator/modules/BeanValidatorModule.java b/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/beanvalidator/modules/BeanValidatorModule.java
index cabd467..880242e 100644
--- a/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/beanvalidator/modules/BeanValidatorModule.java
+++ b/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/beanvalidator/modules/BeanValidatorModule.java
@@ -81,6 +81,7 @@ public class BeanValidatorModule
{
configuration.add("LocaleAwareMessageInterpolator", new BeanValidatorConfigurer()
{
+ @Override
public void configure(javax.validation.Configuration<?> configuration)
{
MessageInterpolator defaultInterpolator = configuration.getDefaultMessageInterpolator();
@@ -95,6 +96,7 @@ public class BeanValidatorModule
{
configuration.add(new BaseCCD(Max.class, "value")
{
+ @Override
public void applyClientValidation(MarkupWriter writer, String message, Map<String, Object> attributes)
{
javaScriptSupport.require("t5/core/validation");
@@ -108,6 +110,7 @@ public class BeanValidatorModule
configuration.add(new BaseCCD(Min.class, "value")
{
+ @Override
public void applyClientValidation(MarkupWriter writer, String message, Map<String, Object> attributes)
{
javaScriptSupport.require("t5/core/validation");
@@ -121,6 +124,7 @@ public class BeanValidatorModule
configuration.add(new BaseCCD(NotNull.class)
{
+ @Override
public void applyClientValidation(MarkupWriter writer, String message, Map<String, Object> attributes)
{
javaScriptSupport.require("t5/core/validation");
@@ -133,6 +137,7 @@ public class BeanValidatorModule
configuration.add(new BaseCCD(Null.class)
{
+ @Override
public void applyClientValidation(MarkupWriter writer, String message, Map<String, Object> attributes)
{
javaScriptSupport.require(MODULE_NAME);
@@ -145,6 +150,7 @@ public class BeanValidatorModule
configuration.add(new BaseCCD(Pattern.class, "regexp")
{
+ @Override
public void applyClientValidation(MarkupWriter writer, String message, Map<String, Object> attributes)
{
javaScriptSupport.require(MODULE_NAME);
@@ -157,6 +163,7 @@ public class BeanValidatorModule
configuration.add(new BaseCCD(Size.class, "min", "max")
{
+ @Override
public void applyClientValidation(MarkupWriter writer, String message, Map<String, Object> attributes)
{
javaScriptSupport.require(MODULE_NAME);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/BaseCCD.java
----------------------------------------------------------------------
diff --git a/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/BaseCCD.java b/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/BaseCCD.java
index d313a0d..78ed0de 100644
--- a/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/BaseCCD.java
+++ b/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/BaseCCD.java
@@ -47,6 +47,7 @@ public abstract class BaseCCD implements ClientConstraintDescriptor
/**
* Returns the annotation describing the constraint declaration.
*/
+ @Override
public Class getAnnotationClass()
{
return annotationClass;
@@ -57,6 +58,7 @@ public abstract class BaseCCD implements ClientConstraintDescriptor
* Attribute names of the constraint annotation to be passed (along with their values) to the JavaScript validator
* function as an {@link JSONObject}.
*/
+ @Override
public Set<String> getAttributes()
{
return attributes;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/BeanFieldValidator.java
----------------------------------------------------------------------
diff --git a/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/BeanFieldValidator.java b/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/BeanFieldValidator.java
index b26a797..febe9e9 100644
--- a/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/BeanFieldValidator.java
+++ b/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/BeanFieldValidator.java
@@ -66,11 +66,13 @@ public class BeanFieldValidator implements FieldValidator
this.environment = environment;
}
+ @Override
public boolean isRequired()
{
return false;
}
+ @Override
public void render(final MarkupWriter writer)
{
final BeanValidationContext beanValidationContext = environment.peek(BeanValidationContext.class);
@@ -124,6 +126,7 @@ public class BeanFieldValidator implements FieldValidator
}
}
+ @Override
@SuppressWarnings("unchecked")
public void validate(final Object value) throws ValidationException
{
@@ -212,11 +215,13 @@ public class BeanFieldValidator implements FieldValidator
return messageInterpolator.interpolate(messageTemplate, new Context()
{
+ @Override
public ConstraintDescriptor<?> getConstraintDescriptor()
{
return descriptor;
}
+ @Override
public Object getValidatedValue()
{
return null;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/BeanFieldValidatorDefaultSource.java
----------------------------------------------------------------------
diff --git a/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/BeanFieldValidatorDefaultSource.java b/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/BeanFieldValidatorDefaultSource.java
index 4f7d263..2bac3b3 100644
--- a/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/BeanFieldValidatorDefaultSource.java
+++ b/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/BeanFieldValidatorDefaultSource.java
@@ -56,6 +56,7 @@ public class BeanFieldValidatorDefaultSource implements FieldValidatorDefaultSou
this.environment = environment;
}
+ @Override
public FieldValidator createDefaultValidator(final Field field,
final String overrideId, final Messages overrideMessages,
final Locale locale, final Class propertyType,
@@ -73,6 +74,7 @@ public class BeanFieldValidatorDefaultSource implements FieldValidatorDefaultSou
return new CompositeFieldValidator(Arrays.asList(validator, beanValidator));
}
+ @Override
public FieldValidator createDefaultValidator(
final ComponentResources resources, final String parameterName)
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/BeanValidationGroupSourceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/BeanValidationGroupSourceImpl.java b/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/BeanValidationGroupSourceImpl.java
index 0e7584c..b1c32ae 100644
--- a/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/BeanValidationGroupSourceImpl.java
+++ b/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/BeanValidationGroupSourceImpl.java
@@ -27,6 +27,7 @@ public class BeanValidationGroupSourceImpl implements BeanValidatorGroupSource {
this.groups = groups.toArray(new Class<?>[]{});
}
+ @Override
public Class<?>[] get()
{
return groups;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/BeanValidatorSourceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/BeanValidatorSourceImpl.java b/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/BeanValidatorSourceImpl.java
index 7cfe034..3e5804e 100644
--- a/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/BeanValidatorSourceImpl.java
+++ b/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/BeanValidatorSourceImpl.java
@@ -39,11 +39,13 @@ public class BeanValidatorSourceImpl implements BeanValidatorSource
this.validatorFactory = configuration.buildValidatorFactory();
}
+ @Override
public Validator create()
{
return this.validatorFactory.getValidator();
}
+ @Override
public ValidatorFactory getValidatorFactory()
{
return this.validatorFactory;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/ClientConstraintDescriptorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/ClientConstraintDescriptorImpl.java b/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/ClientConstraintDescriptorImpl.java
index 569bcaf..72575e8 100644
--- a/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/ClientConstraintDescriptorImpl.java
+++ b/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/ClientConstraintDescriptorImpl.java
@@ -31,6 +31,7 @@ public class ClientConstraintDescriptorImpl implements ClientConstraintDescripto
this.descriptors = configuration;
}
+ @Override
public ClientConstraintDescriptor getConstraintDescriptor(final Class annotationClass)
{
for (final ClientConstraintDescriptor desc : this.descriptors)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/MessageInterpolatorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/MessageInterpolatorImpl.java b/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/MessageInterpolatorImpl.java
index 54c7021..dadeb5b 100644
--- a/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/MessageInterpolatorImpl.java
+++ b/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/MessageInterpolatorImpl.java
@@ -36,6 +36,7 @@ public class MessageInterpolatorImpl implements MessageInterpolator
/**
* @see javax.validation.MessageInterpolator#interpolate(java.lang.String, javax.validation.MessageInterpolator.Context)
*/
+ @Override
public String interpolate(String messageTemplate, Context context)
{
return interpolate(messageTemplate, context, threadLocale.getLocale());
@@ -44,6 +45,7 @@ public class MessageInterpolatorImpl implements MessageInterpolator
/**
* @see javax.validation.MessageInterpolator#interpolate(java.lang.String, javax.validation.MessageInterpolator.Context, java.util.Locale)
*/
+ @Override
public String interpolate(String messageTemplate, Context context, Locale locale)
{
return this.delegate.interpolate(messageTemplate, context, locale);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-beanvalidator/src/test/java/org/example/testapp/services/AppModule.java
----------------------------------------------------------------------
diff --git a/tapestry-beanvalidator/src/test/java/org/example/testapp/services/AppModule.java b/tapestry-beanvalidator/src/test/java/org/example/testapp/services/AppModule.java
index 20caf1a..5269702 100644
--- a/tapestry-beanvalidator/src/test/java/org/example/testapp/services/AppModule.java
+++ b/tapestry-beanvalidator/src/test/java/org/example/testapp/services/AppModule.java
@@ -36,6 +36,7 @@ public class AppModule
configuration.add("Test", new BeanValidatorConfigurer()
{
+ @Override
public void configure(javax.validation.Configuration<?> configuration)
{
configuration.ignoreXmlConfiguration();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/AnnotationMapper.java
----------------------------------------------------------------------
diff --git a/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/AnnotationMapper.java b/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/AnnotationMapper.java
index 0734fae..8f99cfd 100644
--- a/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/AnnotationMapper.java
+++ b/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/AnnotationMapper.java
@@ -22,6 +22,7 @@ import java.lang.reflect.Method;
public class AnnotationMapper implements MethodToFunctionSymbolMapper
{
+ @Override
public Symbol mapMethod(String namespace, Method method)
{
FunctionName annotation = method.getAnnotation(FunctionName.class);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/ClojureBuilderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/ClojureBuilderImpl.java b/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/ClojureBuilderImpl.java
index e9b989e..1d6184a 100644
--- a/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/ClojureBuilderImpl.java
+++ b/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/ClojureBuilderImpl.java
@@ -46,6 +46,7 @@ public class ClojureBuilderImpl implements ClojureBuilder
this.tracker = tracker;
}
+ @Override
public <T> T build(final Class<T> interfaceType)
{
assert interfaceType != null;
@@ -63,6 +64,7 @@ public class ClojureBuilderImpl implements ClojureBuilder
ClassInstantiator<T> instantiator = proxyFactory.createProxy(interfaceType, new PlasticClassTransformer()
{
+ @Override
public void transform(PlasticClass plasticClass)
{
for (final Method m : interfaceType.getMethods())
@@ -88,6 +90,7 @@ public class ClojureBuilderImpl implements ClojureBuilder
desc.toShortString(),
symbol.toString()), new Runnable()
{
+ @Override
public void run()
{
Symbol namespaceSymbol = Symbol.create(symbol.getNamespace());
@@ -100,6 +103,7 @@ public class ClojureBuilderImpl implements ClojureBuilder
plasticClass.introduceMethod(desc).changeImplementation(new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
bridgeToClojure(builder, desc, varField);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/DefaultMapper.java
----------------------------------------------------------------------
diff --git a/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/DefaultMapper.java b/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/DefaultMapper.java
index 85f1fcf..cfdf0cf 100644
--- a/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/DefaultMapper.java
+++ b/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/DefaultMapper.java
@@ -27,6 +27,7 @@ import java.util.regex.Pattern;
*/
public class DefaultMapper implements MethodToFunctionSymbolMapper
{
+ @Override
public Symbol mapMethod(String namespace, Method method)
{
return mapMethodName(namespace, method.getName());
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-func/src/main/java/org/apache/tapestry5/func/AbstractFlow.java
----------------------------------------------------------------------
diff --git a/tapestry-func/src/main/java/org/apache/tapestry5/func/AbstractFlow.java b/tapestry-func/src/main/java/org/apache/tapestry5/func/AbstractFlow.java
index e657c41..25902c8 100644
--- a/tapestry-func/src/main/java/org/apache/tapestry5/func/AbstractFlow.java
+++ b/tapestry-func/src/main/java/org/apache/tapestry5/func/AbstractFlow.java
@@ -46,17 +46,20 @@ abstract class AbstractFlow<T> implements Flow<T>
return result;
}
+ @Override
public Iterator<T> iterator()
{
return new Iterator<T>()
{
private Flow<T> current = AbstractFlow.this;
+ @Override
public boolean hasNext()
{
return !current.isEmpty();
}
+ @Override
public T next()
{
T next = current.first();
@@ -66,6 +69,7 @@ abstract class AbstractFlow<T> implements Flow<T>
return next;
}
+ @Override
public void remove()
{
throw new UnsupportedOperationException("Flows are immutable.");
@@ -74,22 +78,26 @@ abstract class AbstractFlow<T> implements Flow<T>
};
}
+ @Override
public Flow<T> concat(Collection<? extends T> collection)
{
return concat(F.flow(collection));
}
+ @Override
public <V extends T> Flow<T> append(V... values)
{
return concat(F.flow(values));
}
+ @Override
public Flow<T> concat(Flow<? extends T> other)
{
return F.lazy(new LazyConcat<T>(this, other));
}
/** Subclasses may override this for efficiency. */
+ @Override
public Flow<T> each(Worker<? super T> worker)
{
assert worker != null;
@@ -102,6 +110,7 @@ abstract class AbstractFlow<T> implements Flow<T>
return this;
}
+ @Override
public Flow<T> filter(Predicate<? super T> predicate)
{
assert predicate != null;
@@ -109,6 +118,7 @@ abstract class AbstractFlow<T> implements Flow<T>
return F.lazy(new LazyFilter<T>(predicate, this));
}
+ @Override
public <X> Flow<X> map(Mapper<T, X> mapper)
{
assert mapper != null;
@@ -116,6 +126,7 @@ abstract class AbstractFlow<T> implements Flow<T>
return F.lazy(new LazyMapper<T, X>(mapper, this));
}
+ @Override
public <X, Y> Flow<Y> map(Mapper2<T, X, Y> mapper, Flow<? extends X> flow)
{
assert mapper != null;
@@ -127,6 +138,7 @@ abstract class AbstractFlow<T> implements Flow<T>
return F.lazy(new LazyMapper2<T, X, Y>(mapper, this, flow));
}
+ @Override
public <A> A reduce(Reducer<A, T> reducer, A initial)
{
assert reducer != null;
@@ -144,6 +156,7 @@ abstract class AbstractFlow<T> implements Flow<T>
return accumulator;
}
+ @Override
public <X> Flow<X> mapcat(Mapper<T, Flow<X>> mapper)
{
Flow<Flow<X>> flows = map(mapper);
@@ -153,6 +166,7 @@ abstract class AbstractFlow<T> implements Flow<T>
return flows.rest().reduce(new Reducer<Flow<X>, Flow<X>>()
{
+ @Override
public Flow<X> reduce(Flow<X> accumulator, Flow<X> value)
{
return accumulator.concat(value);
@@ -160,6 +174,7 @@ abstract class AbstractFlow<T> implements Flow<T>
}, flows.first());
}
+ @Override
public Flow<T> remove(Predicate<? super T> predicate)
{
assert predicate != null;
@@ -167,6 +182,7 @@ abstract class AbstractFlow<T> implements Flow<T>
return filter(F.not(predicate));
}
+ @Override
public Flow<T> reverse()
{
if (isEmpty())
@@ -175,6 +191,7 @@ abstract class AbstractFlow<T> implements Flow<T>
return new ArrayFlow<T>(this).reverse();
}
+ @Override
public Flow<T> sort()
{
if (isEmpty())
@@ -183,6 +200,7 @@ abstract class AbstractFlow<T> implements Flow<T>
return new ArrayFlow<T>(this).sort();
}
+ @Override
public Flow<T> sort(Comparator<T> comparator)
{
if (isEmpty())
@@ -191,6 +209,7 @@ abstract class AbstractFlow<T> implements Flow<T>
return new ArrayFlow<T>(this).sort(comparator);
}
+ @Override
public List<T> toList()
{
if (isEmpty())
@@ -199,6 +218,7 @@ abstract class AbstractFlow<T> implements Flow<T>
return Collections.unmodifiableList(toMutableList());
}
+ @Override
@SuppressWarnings("unchecked")
public T[] toArray(Class<T> type)
{
@@ -211,6 +231,7 @@ abstract class AbstractFlow<T> implements Flow<T>
return list.toArray((T[]) array);
}
+ @Override
public int count()
{
if (isEmpty()){
@@ -223,11 +244,13 @@ abstract class AbstractFlow<T> implements Flow<T>
return count;
}
+ @Override
public Flow<T> take(int length)
{
return F.lazy(new LazyTake<T>(length, this));
}
+ @Override
public Flow<T> drop(int length)
{
assert length >= 0;
@@ -238,6 +261,7 @@ abstract class AbstractFlow<T> implements Flow<T>
return F.lazy(new LazyDrop<T>(length, this));
}
+ @Override
public Set<T> toSet()
{
Set<T> set = new HashSet<T>();
@@ -247,6 +271,7 @@ abstract class AbstractFlow<T> implements Flow<T>
return Collections.unmodifiableSet(set);
}
+ @Override
public <X> ZippedFlow<T, X> zipWith(Flow<X> otherFlow)
{
assert otherFlow != null;
@@ -256,29 +281,34 @@ abstract class AbstractFlow<T> implements Flow<T>
return ZippedFlowImpl.create(tupleFlow);
}
+ @Override
public Flow<T> removeNulls()
{
return remove(F.isNull());
}
+ @Override
public boolean isEmpty()
{
// TODO Auto-generated method stub
return false;
}
+ @Override
public T first()
{
// TODO Auto-generated method stub
return null;
}
+ @Override
public Flow<T> rest()
{
// TODO Auto-generated method stub
return null;
}
+ @Override
public Flow<T> interleave(Flow<T>... otherFlows)
{
List<Flow<T>> allFlows = new ArrayList<Flow<T>>(otherFlows.length + 1);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-func/src/main/java/org/apache/tapestry5/func/ArrayFlow.java
----------------------------------------------------------------------
diff --git a/tapestry-func/src/main/java/org/apache/tapestry5/func/ArrayFlow.java b/tapestry-func/src/main/java/org/apache/tapestry5/func/ArrayFlow.java
index 5a91c8b..2e7d6f1 100644
--- a/tapestry-func/src/main/java/org/apache/tapestry5/func/ArrayFlow.java
+++ b/tapestry-func/src/main/java/org/apache/tapestry5/func/ArrayFlow.java
@@ -60,6 +60,7 @@ class ArrayFlow<T> extends AbstractFlow<T>
this.count = count;
}
+ @Override
public Flow<T> each(Worker<? super T> worker)
{
for (int i = 0; i < count; i++)
@@ -68,6 +69,7 @@ class ArrayFlow<T> extends AbstractFlow<T>
return this;
}
+ @Override
public <A> A reduce(Reducer<A, T> reducer, A initial)
{
assert reducer != null;
@@ -84,11 +86,13 @@ class ArrayFlow<T> extends AbstractFlow<T>
return accumulator;
}
+ @Override
public List<T> toList()
{
return Arrays.asList(values).subList(start, start + count);
}
+ @Override
public Flow<T> reverse()
{
if (values.length < 2)
@@ -103,11 +107,13 @@ class ArrayFlow<T> extends AbstractFlow<T>
return new ArrayFlow<T>(newValues);
}
+ @Override
public boolean isEmpty()
{
return false;
}
+ @Override
protected List<T> toMutableList()
{
List<T> result = new ArrayList<T>(count);
@@ -120,6 +126,7 @@ class ArrayFlow<T> extends AbstractFlow<T>
return result;
}
+ @Override
@SuppressWarnings("unchecked")
public Flow<T> sort()
{
@@ -133,6 +140,7 @@ class ArrayFlow<T> extends AbstractFlow<T>
return new ArrayFlow<T>((List<T>) newValues);
}
+ @Override
public Flow<T> sort(Comparator<T> comparator)
{
assert comparator != null;
@@ -147,16 +155,19 @@ class ArrayFlow<T> extends AbstractFlow<T>
return new ArrayFlow<T>(newValues);
}
+ @Override
public Iterator<T> iterator()
{
return toList().iterator();
}
+ @Override
public T first()
{
return values[start];
}
+ @Override
public synchronized Flow<T> rest()
{
if (rest == null)
@@ -173,11 +184,13 @@ class ArrayFlow<T> extends AbstractFlow<T>
return new ArrayFlow<T>(values, start + 1, count - 1);
}
+ @Override
public int count()
{
return count;
}
+ @Override
public Flow<T> take(int length)
{
if (length < 1)
@@ -186,6 +199,7 @@ class ArrayFlow<T> extends AbstractFlow<T>
return new ArrayFlow<T>(values, start, Math.min(count, length));
}
+ @Override
public Flow<T> drop(int length)
{
assert length >= 0;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-func/src/main/java/org/apache/tapestry5/func/EmptyFlow.java
----------------------------------------------------------------------
diff --git a/tapestry-func/src/main/java/org/apache/tapestry5/func/EmptyFlow.java b/tapestry-func/src/main/java/org/apache/tapestry5/func/EmptyFlow.java
index 911a522..d140d8a 100644
--- a/tapestry-func/src/main/java/org/apache/tapestry5/func/EmptyFlow.java
+++ b/tapestry-func/src/main/java/org/apache/tapestry5/func/EmptyFlow.java
@@ -26,102 +26,120 @@ import java.util.Set;
*/
class EmptyFlow<T> extends AbstractFlow<T>
{
+ @Override
public T first()
{
return null;
}
+ @Override
public boolean isEmpty()
{
return true;
}
+ @Override
public Flow<T> rest()
{
return this;
}
/** Does nothing; returns this empty list. */
+ @Override
public Flow<T> each(Worker<? super T> worker)
{
return this;
}
/** Does nothing; returns this empty list. */
+ @Override
public Flow<T> filter(Predicate<? super T> predicate)
{
return this;
}
/** Does nothing; returns this empty list. */
+ @Override
public Flow<T> remove(Predicate<? super T> predicate)
{
return this;
}
/** Does nothing; returns this empty list (as a Flow<X>). */
+ @Override
public <X> Flow<X> map(Mapper<T, X> mapper)
{
return F.emptyFlow();
}
/** Does nothing; returns the initial value. */
+ @Override
public <A> A reduce(Reducer<A, T> reducer, A initial)
{
return initial;
}
/** Does nothing; returns this empty list. */
+ @Override
public Flow<T> reverse()
{
return this;
}
/** Does nothing; returns this empty list. */
+ @Override
public Flow<T> sort()
{
return this;
}
/** Does nothing; returns this empty list. */
+ @Override
public Flow<T> sort(Comparator<T> comparator)
{
return this;
}
/** Returns the empty list. */
+ @Override
public List<T> toList()
{
return Collections.emptyList();
}
/** Returns the other list (i.e. empty ++ other == other). */
+ @Override
@SuppressWarnings("unchecked")
public Flow<T> concat(Flow<? extends T> other)
{
return (Flow<T>) other;
}
+ @Override
public <X> Flow<X> mapcat(Mapper<T, Flow<X>> mapper)
{
return F.emptyFlow();
}
+ @Override
public int count()
{
return 0;
}
+ @Override
public Flow<T> take(int length)
{
return this;
}
+ @Override
public Flow<T> drop(int length)
{
return this;
}
+ @Override
public Set<T> toSet()
{
return Collections.emptySet();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-func/src/main/java/org/apache/tapestry5/func/F.java
----------------------------------------------------------------------
diff --git a/tapestry-func/src/main/java/org/apache/tapestry5/func/F.java b/tapestry-func/src/main/java/org/apache/tapestry5/func/F.java
index 9d91391..060d23e 100644
--- a/tapestry-func/src/main/java/org/apache/tapestry5/func/F.java
+++ b/tapestry-func/src/main/java/org/apache/tapestry5/func/F.java
@@ -54,6 +54,7 @@ public class F
{
return new Predicate<T>()
{
+ @Override
public boolean accept(T element)
{
return element.equals(value);
@@ -66,6 +67,7 @@ public class F
*/
public static Predicate<String> IS_BLANK = new Predicate<String>()
{
+ @Override
public boolean accept(String element)
{
return element == null || element.trim().length() == 0;
@@ -79,6 +81,7 @@ public class F
{
return new Predicate<T>()
{
+ @Override
public boolean accept(T element)
{
return element.compareTo(value) == 0;
@@ -93,6 +96,7 @@ public class F
{
return new Predicate<T>()
{
+ @Override
public boolean accept(T object)
{
return object.compareTo(value) != 0;
@@ -108,6 +112,7 @@ public class F
{
return new Predicate<T>()
{
+ @Override
public boolean accept(T element)
{
return element.compareTo(value) > 0;
@@ -123,6 +128,7 @@ public class F
{
return new Predicate<T>()
{
+ @Override
public boolean accept(T element)
{
return element.compareTo(value) >= 0;
@@ -155,6 +161,7 @@ public class F
{
return new Predicate<T>()
{
+ @Override
public boolean accept(T element)
{
return element == null;
@@ -177,6 +184,7 @@ public class F
{
return new Mapper<T, String>()
{
+ @Override
public String map(T value)
{
return String.valueOf(value);
@@ -192,6 +200,7 @@ public class F
{
return new Mapper<S, T>()
{
+ @Override
public T map(S input)
{
return fixedResult;
@@ -219,6 +228,7 @@ public class F
return new Mapper<S, T>()
{
+ @Override
public T map(S input)
{
Mapper<S, T> active = predicate.accept(input) ? ifAccepted : ifRejected;
@@ -255,6 +265,7 @@ public class F
{
return new Mapper<S, S>()
{
+ @Override
public S map(S input)
{
return input;
@@ -271,6 +282,7 @@ public class F
return new Predicate<S>()
{
+ @Override
public boolean accept(S object)
{
return mapper.map(object);
@@ -283,6 +295,7 @@ public class F
*/
public static Reducer<Integer, Integer> SUM_INTS = new Reducer<Integer, Integer>()
{
+ @Override
public Integer reduce(Integer accumulator, Integer value)
{
return accumulator + value;
@@ -295,6 +308,7 @@ public class F
*/
public static Mapper2<Integer, Integer, Integer> ADD_INTS = new Mapper2<Integer, Integer, Integer>()
{
+ @Override
public Integer map(Integer first, Integer second)
{
return first + second;
@@ -370,6 +384,7 @@ public class F
Flow<Tuple<A, B>> tuples = F.flow(map.entrySet()).map(new Mapper<Map.Entry<A, B>, Tuple<A, B>>()
{
+ @Override
public Tuple<A, B> map(Entry<A, B> element)
{
return Tuple.create(element.getKey(), element.getValue());
@@ -415,6 +430,7 @@ public class F
{
return new LazyFunction<T>()
{
+ @Override
public LazyContinuation<T> next()
{
final T nextValue = function.map(currentValue);
@@ -438,6 +454,7 @@ public class F
{
LazyFunction<T> head = new LazyFunction<T>()
{
+ @Override
public LazyContinuation<T> next()
{
return new LazyContinuation<T>(initial, toLazyFunction(initial, function));
@@ -456,6 +473,7 @@ public class F
{
return iterate(start, new Mapper<Integer, Integer>()
{
+ @Override
public Integer map(Integer element)
{
return element + delta;
@@ -470,6 +488,7 @@ public class F
{
return new Worker<T>()
{
+ @Override
public void work(T value)
{
coll.add(value);
@@ -504,6 +523,7 @@ public class F
{
return new Predicate<String>()
{
+ @Override
public boolean accept(String element)
{
return element.regionMatches(ignoreCase, 0, prefix, 0, prefix.length());
@@ -538,6 +558,7 @@ public class F
{
return new Predicate<String>()
{
+ @Override
public boolean accept(String element)
{
return element
@@ -556,6 +577,7 @@ public class F
{
return new Comparator<Tuple<A, B>>()
{
+ @Override
public int compare(Tuple<A, B> o1, Tuple<A, B> o2)
{
return o1.first.compareTo(o2.first);
@@ -573,6 +595,7 @@ public class F
{
return new Comparator<Tuple<A, B>>()
{
+ @Override
public int compare(Tuple<A, B> o1, Tuple<A, B> o2)
{
return o1.second.compareTo(o2.second);
@@ -594,6 +617,7 @@ public class F
return new Predicate<T>()
{
+ @Override
public boolean accept(T element)
{
return !delegate.accept(element);
@@ -618,6 +642,7 @@ public class F
return new Mapper<A, C>()
{
+ @Override
public C map(A aElement)
{
B bElement = abMapper.map(aElement);
@@ -641,6 +666,7 @@ public class F
{
return new Predicate<T>()
{
+ @Override
public boolean accept(T element)
{
for (Predicate<? super T> delegate : delegates)
@@ -667,6 +693,7 @@ public class F
{
return new Predicate<T>()
{
+ @Override
public boolean accept(T element)
{
for (Predicate<? super T> delegate : delegates)
@@ -691,6 +718,7 @@ public class F
return new Worker<T>()
{
+ @Override
public void work(T value)
{
for (Worker<? super T> delegate : delegates)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-func/src/main/java/org/apache/tapestry5/func/Interleaver.java
----------------------------------------------------------------------
diff --git a/tapestry-func/src/main/java/org/apache/tapestry5/func/Interleaver.java b/tapestry-func/src/main/java/org/apache/tapestry5/func/Interleaver.java
index 0f771a7..5477d43 100644
--- a/tapestry-func/src/main/java/org/apache/tapestry5/func/Interleaver.java
+++ b/tapestry-func/src/main/java/org/apache/tapestry5/func/Interleaver.java
@@ -33,6 +33,7 @@ class Interleaver<T> implements LazyFunction<T>
this.valueIndex = valueIndex;
}
+ @Override
public LazyContinuation<T> next()
{
if (valueIndex == 0)
@@ -54,6 +55,7 @@ class Interleaver<T> implements LazyFunction<T>
List<Flow<T>> nextFlows = F.flow(flows).map(new Mapper<Flow<T>, Flow<T>>()
{
+ @Override
public Flow<T> map(Flow<T> element)
{
return element.rest();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyConcat.java
----------------------------------------------------------------------
diff --git a/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyConcat.java b/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyConcat.java
index f55726f..aa4beec 100644
--- a/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyConcat.java
+++ b/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyConcat.java
@@ -25,6 +25,7 @@ class LazyConcat<T> implements LazyFunction<T>
this.right = (Flow<T>) second;
}
+ @Override
public LazyContinuation<T> next()
{
if (left.isEmpty())
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyDrop.java
----------------------------------------------------------------------
diff --git a/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyDrop.java b/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyDrop.java
index 41e3679..01f1af7 100644
--- a/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyDrop.java
+++ b/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyDrop.java
@@ -26,6 +26,7 @@ class LazyDrop<T> implements LazyFunction<T>
this.flow = flow;
}
+ @Override
public LazyContinuation<T> next()
{
for (int i = 0; i < length; i++)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyFilter.java
----------------------------------------------------------------------
diff --git a/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyFilter.java b/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyFilter.java
index c7daa29..bbbb9e8 100644
--- a/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyFilter.java
+++ b/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyFilter.java
@@ -26,6 +26,7 @@ class LazyFilter<T> implements LazyFunction<T>
this.flow = flow;
}
+ @Override
public LazyContinuation<T> next()
{
Flow<T> cursor = flow;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyFirst.java
----------------------------------------------------------------------
diff --git a/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyFirst.java b/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyFirst.java
index 595cf1c..183323c 100644
--- a/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyFirst.java
+++ b/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyFirst.java
@@ -23,6 +23,7 @@ class LazyFirst<T> implements LazyValue<T>
this.flow = flow;
}
+ @Override
public T get()
{
return flow.first();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyFlow.java
----------------------------------------------------------------------
diff --git a/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyFlow.java b/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyFlow.java
index dc9944f..1d56abd 100644
--- a/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyFlow.java
+++ b/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyFlow.java
@@ -39,6 +39,7 @@ class LazyFlow<T> extends AbstractFlow<T>
this.lazyFunction = lazyFunction;
}
+ @Override
public synchronized T first()
{
resolve();
@@ -56,6 +57,7 @@ class LazyFlow<T> extends AbstractFlow<T>
return first;
}
+ @Override
public synchronized boolean isEmpty()
{
resolve();
@@ -63,6 +65,7 @@ class LazyFlow<T> extends AbstractFlow<T>
return empty;
}
+ @Override
public synchronized Flow<T> rest()
{
resolve();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyIterator.java
----------------------------------------------------------------------
diff --git a/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyIterator.java b/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyIterator.java
index 2d4b419..3692caa 100644
--- a/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyIterator.java
+++ b/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyIterator.java
@@ -30,6 +30,7 @@ class LazyIterator<T> implements LazyFunction<T>
this.iterator = iterator;
}
+ @Override
public LazyContinuation<T> next()
{
if (!iterator.hasNext())
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyMapped2Value.java
----------------------------------------------------------------------
diff --git a/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyMapped2Value.java b/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyMapped2Value.java
index ea11f7d..9150edd 100644
--- a/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyMapped2Value.java
+++ b/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyMapped2Value.java
@@ -29,6 +29,7 @@ class LazyMapped2Value<T, X, Y> implements LazyValue<Y>
this.mapper = mapper;
}
+ @Override
public Y get()
{
return mapper.map(left.first(), right.first());
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyMappedValue.java
----------------------------------------------------------------------
diff --git a/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyMappedValue.java b/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyMappedValue.java
index d418447..7b09886 100644
--- a/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyMappedValue.java
+++ b/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyMappedValue.java
@@ -26,6 +26,7 @@ class LazyMappedValue<T, X> implements LazyValue<X>
this.mapper = mapper;
}
+ @Override
public X get()
{
return mapper.map(flow.first());
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyMapper.java
----------------------------------------------------------------------
diff --git a/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyMapper.java b/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyMapper.java
index 52bc33e..45b0a52 100644
--- a/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyMapper.java
+++ b/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyMapper.java
@@ -26,6 +26,7 @@ class LazyMapper<T, X> implements LazyFunction<X>
this.flow = flow;
}
+ @Override
public LazyContinuation<X> next()
{
if (flow.isEmpty())
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyMapper2.java
----------------------------------------------------------------------
diff --git a/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyMapper2.java b/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyMapper2.java
index 3a66f59..97b4816 100644
--- a/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyMapper2.java
+++ b/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyMapper2.java
@@ -30,6 +30,7 @@ class LazyMapper2<T, X, Y> implements LazyFunction<Y>
this.right = (Flow<X>) right;
}
+ @Override
public LazyContinuation<Y> next()
{
if (left.isEmpty() || right.isEmpty())
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyRange.java
----------------------------------------------------------------------
diff --git a/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyRange.java b/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyRange.java
index bf7016b..d3e51f4 100644
--- a/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyRange.java
+++ b/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyRange.java
@@ -25,6 +25,7 @@ class LazyRange implements LazyFunction<Integer>
this.delta = delta;
}
+ @Override
public LazyContinuation<Integer> next()
{
if (delta < 0 && lower + delta < upper)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyTake.java
----------------------------------------------------------------------
diff --git a/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyTake.java b/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyTake.java
index 1abab12..6cb6511 100644
--- a/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyTake.java
+++ b/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyTake.java
@@ -26,6 +26,7 @@ class LazyTake<T> implements LazyFunction<T>
this.flow = flow;
}
+ @Override
public LazyContinuation<T> next()
{
if (flow.isEmpty() || length < 1)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyWalk.java
----------------------------------------------------------------------
diff --git a/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyWalk.java b/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyWalk.java
index 65307a1..e4c4562 100644
--- a/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyWalk.java
+++ b/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyWalk.java
@@ -26,6 +26,7 @@ class LazyWalk<T> implements LazyFunction<T>
this.flow = flow;
}
+ @Override
public LazyContinuation<T> next()
{
if (flow.isEmpty())
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyZip.java
----------------------------------------------------------------------
diff --git a/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyZip.java b/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyZip.java
index 422317a..403ab16 100644
--- a/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyZip.java
+++ b/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyZip.java
@@ -26,6 +26,7 @@ class LazyZip<A, B> implements LazyFunction<Tuple<A, B>>
this.bFlow = bFlow;
}
+ @Override
public LazyContinuation<Tuple<A, B>> next()
{
if (aFlow.isEmpty() || bFlow.isEmpty())
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyZipValue.java
----------------------------------------------------------------------
diff --git a/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyZipValue.java b/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyZipValue.java
index ed6bfd5..62b5e22 100644
--- a/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyZipValue.java
+++ b/tapestry-func/src/main/java/org/apache/tapestry5/func/LazyZipValue.java
@@ -26,6 +26,7 @@ public class LazyZipValue<A, B> implements LazyValue<Tuple<A, B>>
this.bFlow = bFlow;
}
+ @Override
public Tuple<A, B> get()
{
return new Tuple<A, B>(aFlow.first(), bFlow.first());
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-func/src/main/java/org/apache/tapestry5/func/StaticValue.java
----------------------------------------------------------------------
diff --git a/tapestry-func/src/main/java/org/apache/tapestry5/func/StaticValue.java b/tapestry-func/src/main/java/org/apache/tapestry5/func/StaticValue.java
index 75fd254..84530c3 100644
--- a/tapestry-func/src/main/java/org/apache/tapestry5/func/StaticValue.java
+++ b/tapestry-func/src/main/java/org/apache/tapestry5/func/StaticValue.java
@@ -23,6 +23,7 @@ class StaticValue<T> implements LazyValue<T>
this.nextValue = nextValue;
}
+ @Override
public T get()
{
return nextValue;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-func/src/main/java/org/apache/tapestry5/func/ZippedFlowImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-func/src/main/java/org/apache/tapestry5/func/ZippedFlowImpl.java b/tapestry-func/src/main/java/org/apache/tapestry5/func/ZippedFlowImpl.java
index fce1cc7..f2a286d 100644
--- a/tapestry-func/src/main/java/org/apache/tapestry5/func/ZippedFlowImpl.java
+++ b/tapestry-func/src/main/java/org/apache/tapestry5/func/ZippedFlowImpl.java
@@ -35,6 +35,7 @@ class ZippedFlowImpl<A, B> implements ZippedFlow<A, B>
this.tupleFlow = tupleFlow;
}
+ @Override
public Tuple<Flow<A>, Flow<B>> unzip()
{
return Tuple.create(firsts(), seconds());
@@ -47,16 +48,19 @@ class ZippedFlowImpl<A, B> implements ZippedFlow<A, B>
return new ZippedFlowImpl<X, Y>(wrappedTupleFlow);
}
+ @Override
public ZippedFlow<A, B> filter(Predicate<? super Tuple<A, B>> predicate)
{
return create(tupleFlow.filter(predicate));
}
+ @Override
public ZippedFlow<A, B> remove(Predicate<? super Tuple<A, B>> predicate)
{
return create(tupleFlow.remove(predicate));
}
+ @Override
public ZippedFlow<A, B> each(Worker<? super Tuple<A, B>> worker)
{
tupleFlow.each(worker);
@@ -64,80 +68,96 @@ class ZippedFlowImpl<A, B> implements ZippedFlow<A, B>
return this;
}
+ @Override
public List<Tuple<A, B>> toList()
{
return tupleFlow.toList();
}
+ @Override
public Set<Tuple<A, B>> toSet()
{
return tupleFlow.toSet();
}
+ @Override
public ZippedFlow<A, B> reverse()
{
return create(tupleFlow.reverse());
}
+ @Override
public boolean isEmpty()
{
return tupleFlow.isEmpty();
}
+ @Override
public Tuple<A, B> first()
{
return tupleFlow.first();
}
+ @Override
public ZippedFlow<A, B> rest()
{
return create(tupleFlow.rest());
}
+ @Override
public int count()
{
return tupleFlow.count();
}
+ @Override
public ZippedFlow<A, B> sort(Comparator<Tuple<A, B>> comparator)
{
return create(tupleFlow.sort(comparator));
}
+ @Override
public ZippedFlow<A, B> take(int length)
{
return create(tupleFlow.take(length));
}
+ @Override
public ZippedFlow<A, B> drop(int length)
{
return create(tupleFlow.drop(length));
}
+ @Override
public ZippedFlow<A, B> concat(Collection<? extends Tuple<A, B>> collection)
{
return create(tupleFlow.concat(collection));
}
+ @Override
public Iterator<Tuple<A, B>> iterator()
{
return tupleFlow.iterator();
}
+ @Override
public <O> O reduce(Reducer<O, Tuple<A, B>> reducer, O initial)
{
return tupleFlow.reduce(reducer, initial);
}
+ @Override
public <X, Y> ZippedFlow<X, Y> mapTuples(Mapper<Tuple<A, B>, Tuple<X, Y>> mapper)
{
return create(tupleFlow.map(mapper));
}
+ @Override
public Flow<A> firsts()
{
return tupleFlow.map(new Mapper<Tuple<A, B>, A>()
{
+ @Override
public A map(Tuple<A, B> value)
{
return value.first;
@@ -145,15 +165,18 @@ class ZippedFlowImpl<A, B> implements ZippedFlow<A, B>
});
}
+ @Override
public ZippedFlow<A, B> removeNulls()
{
return create(tupleFlow.removeNulls());
}
+ @Override
public Flow<B> seconds()
{
return tupleFlow.map(new Mapper<Tuple<A, B>, B>()
{
+ @Override
public B map(Tuple<A, B> value)
{
return value.second;
@@ -161,12 +184,14 @@ class ZippedFlowImpl<A, B> implements ZippedFlow<A, B>
});
}
+ @Override
public ZippedFlow<A, B> filterOnFirst(final Predicate<? super A> predicate)
{
assert predicate != null;
return filter(new Predicate<Tuple<A, B>>()
{
+ @Override
public boolean accept(Tuple<A, B> element)
{
return predicate.accept(element.first);
@@ -174,12 +199,14 @@ class ZippedFlowImpl<A, B> implements ZippedFlow<A, B>
});
}
+ @Override
public ZippedFlow<A, B> filterOnSecond(final Predicate<? super B> predicate)
{
assert predicate != null;
return filter(new Predicate<Tuple<A, B>>()
{
+ @Override
public boolean accept(Tuple<A, B> element)
{
return predicate.accept(element.second);
@@ -187,6 +214,7 @@ class ZippedFlowImpl<A, B> implements ZippedFlow<A, B>
});
}
+ @Override
public ZippedFlow<A, B> removeOnFirst(Predicate<? super A> predicate)
{
assert predicate != null;
@@ -194,6 +222,7 @@ class ZippedFlowImpl<A, B> implements ZippedFlow<A, B>
return filterOnFirst(F.not(predicate));
}
+ @Override
public ZippedFlow<A, B> removeOnSecond(Predicate<? super B> predicate)
{
assert predicate != null;
@@ -201,12 +230,14 @@ class ZippedFlowImpl<A, B> implements ZippedFlow<A, B>
return filterOnSecond(F.not(predicate));
}
+ @Override
public Map<A, B> toMap()
{
final Map<A, B> result = new HashMap<A, B>();
tupleFlow.each(new Worker<Tuple<A, B>>()
{
+ @Override
public void work(Tuple<A, B> value)
{
result.put(value.first, value.second);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-func/src/test/java/org/apache/tapestry5/func/BaseFuncTest.java
----------------------------------------------------------------------
diff --git a/tapestry-func/src/test/java/org/apache/tapestry5/func/BaseFuncTest.java b/tapestry-func/src/test/java/org/apache/tapestry5/func/BaseFuncTest.java
index 903b315..bed7e2f 100644
--- a/tapestry-func/src/test/java/org/apache/tapestry5/func/BaseFuncTest.java
+++ b/tapestry-func/src/test/java/org/apache/tapestry5/func/BaseFuncTest.java
@@ -24,6 +24,7 @@ public class BaseFuncTest extends Assert
protected Mapper<String, Integer> stringToLength = new Mapper<String, Integer>()
{
+ @Override
public Integer map(String input)
{
return input.length();
@@ -32,6 +33,7 @@ public class BaseFuncTest extends Assert
protected Mapper<Integer, Boolean> toEven = new Mapper<Integer, Boolean>()
{
+ @Override
public Boolean map(Integer input)
{
return evenp.accept(input);
@@ -40,6 +42,7 @@ public class BaseFuncTest extends Assert
protected Predicate<Number> evenp = new Predicate<Number>()
{
+ @Override
public boolean accept(Number object)
{
return object.longValue() % 2 == 0;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-func/src/test/java/org/apache/tapestry5/func/FuncTest.java
----------------------------------------------------------------------
diff --git a/tapestry-func/src/test/java/org/apache/tapestry5/func/FuncTest.java b/tapestry-func/src/test/java/org/apache/tapestry5/func/FuncTest.java
index a9f2dc6..0d63d02 100644
--- a/tapestry-func/src/test/java/org/apache/tapestry5/func/FuncTest.java
+++ b/tapestry-func/src/test/java/org/apache/tapestry5/func/FuncTest.java
@@ -60,6 +60,7 @@ public class FuncTest extends BaseFuncTest
Worker<String> worker = new Worker<String>()
{
+ @Override
public void work(String value)
{
if (buffer.length() > 0)
@@ -83,6 +84,7 @@ public class FuncTest extends BaseFuncTest
Worker<String> worker = new Worker<String>()
{
+ @Override
public void work(String value)
{
if (buffer.length() > 0)
@@ -94,6 +96,7 @@ public class FuncTest extends BaseFuncTest
F.flow(source).filter(new Predicate<String>()
{
+ @Override
public boolean accept(String object)
{
return object.contains("a");
@@ -112,6 +115,7 @@ public class FuncTest extends BaseFuncTest
Worker<String> worker = new Worker<String>()
{
+ @Override
public void work(String value)
{
if (buffer.length() > 0)
@@ -133,6 +137,7 @@ public class FuncTest extends BaseFuncTest
Worker<String> appendWorker = new Worker<String>()
{
+ @Override
public void work(String value)
{
if (buffer.length() > 0)
@@ -144,6 +149,7 @@ public class FuncTest extends BaseFuncTest
Worker<String> appendLength = new Worker<String>()
{
+ @Override
public void work(String value)
{
buffer.append("(");
@@ -354,6 +360,7 @@ public class FuncTest extends BaseFuncTest
Comparator<String> comparator = new Comparator<String>()
{
+ @Override
public int compare(String o1, String o2)
{
return o1.length() - o2.length();
@@ -375,6 +382,7 @@ public class FuncTest extends BaseFuncTest
Flow<String> flow = F.flow("a", "eeeee", "ccc", "bb", "dddd");
Comparator<String> comparator = new Comparator<String>()
{
+ @Override
public int compare(String o1, String o2)
{
return o1.length() - o2.length();
@@ -453,6 +461,7 @@ public class FuncTest extends BaseFuncTest
assertSame(filteredEmpty.sort(), F.EMPTY_FLOW);
assertSame(filteredEmpty.sort(new Comparator<Integer>()
{
+ @Override
public int compare(Integer o1, Integer o2)
{
unreachable();
@@ -494,12 +503,14 @@ public class FuncTest extends BaseFuncTest
List<String> result = flow.filter(new Predicate<String>()
{
+ @Override
public boolean accept(String object)
{
return object.contains("a");
}
}).sort(new Comparator<String>()
{
+ @Override
public int compare(String o1, String o2)
{
return o1.length() - o2.length();
@@ -517,6 +528,7 @@ public class FuncTest extends BaseFuncTest
assertSame(flow.each(new Worker<Integer>()
{
+ @Override
public void work(Integer value)
{
unreachable();
@@ -540,6 +552,7 @@ public class FuncTest extends BaseFuncTest
assertSame(flow.reduce(new Reducer<Integer, Integer>()
{
+ @Override
public Integer reduce(Integer accumulator, Integer value)
{
unreachable();
@@ -601,6 +614,7 @@ public class FuncTest extends BaseFuncTest
Iterable<Integer> iterable = new Iterable<Integer>()
{
+ @Override
public Iterator<Integer> iterator()
{
return Arrays.asList(9, 7, 1).iterator();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-func/src/test/java/org/apache/tapestry5/func/MapperTest.java
----------------------------------------------------------------------
diff --git a/tapestry-func/src/test/java/org/apache/tapestry5/func/MapperTest.java b/tapestry-func/src/test/java/org/apache/tapestry5/func/MapperTest.java
index ceb6885..6144fa7 100644
--- a/tapestry-func/src/test/java/org/apache/tapestry5/func/MapperTest.java
+++ b/tapestry-func/src/test/java/org/apache/tapestry5/func/MapperTest.java
@@ -25,6 +25,7 @@ public class MapperTest extends BaseFuncTest
protected Mapper<Integer, Flow<Integer>> sequencer = new Mapper<Integer, Flow<Integer>>()
{
+ @Override
public Flow<Integer> map(Integer value)
{
Flow<Integer> flow = F.flow();
@@ -57,6 +58,7 @@ public class MapperTest extends BaseFuncTest
{
assertTrue(filteredEmpty.map(new Mapper<Integer, Integer>()
{
+ @Override
public Integer map(Integer value)
{
unreachable();
@@ -108,6 +110,7 @@ public class MapperTest extends BaseFuncTest
Mapper<Integer, Integer> doubler = new Mapper<Integer, Integer>()
{
+ @Override
public Integer map(Integer value)
{
count.incrementAndGet();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-func/src/test/java/org/apache/tapestry5/func/RangeTests.java
----------------------------------------------------------------------
diff --git a/tapestry-func/src/test/java/org/apache/tapestry5/func/RangeTests.java b/tapestry-func/src/test/java/org/apache/tapestry5/func/RangeTests.java
index 4c76838..9a8c4b2 100644
--- a/tapestry-func/src/test/java/org/apache/tapestry5/func/RangeTests.java
+++ b/tapestry-func/src/test/java/org/apache/tapestry5/func/RangeTests.java
@@ -58,6 +58,7 @@ public class RangeTests extends BaseFuncTest
{
Mapper<Integer, Integer> times2 = new Mapper<Integer, Integer>()
{
+ @Override
public Integer map(Integer value)
{
return 2 * value;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-func/src/test/java/org/apache/tapestry5/func/ZippedFlowTests.java
----------------------------------------------------------------------
diff --git a/tapestry-func/src/test/java/org/apache/tapestry5/func/ZippedFlowTests.java b/tapestry-func/src/test/java/org/apache/tapestry5/func/ZippedFlowTests.java
index 8ae3712..a4b8ee6 100644
--- a/tapestry-func/src/test/java/org/apache/tapestry5/func/ZippedFlowTests.java
+++ b/tapestry-func/src/test/java/org/apache/tapestry5/func/ZippedFlowTests.java
@@ -155,6 +155,7 @@ public class ZippedFlowTests extends BaseFuncTest
zipped.each(new Worker<Tuple<Integer, String>>()
{
+ @Override
public void work(Tuple<Integer, String> value)
{
count.addAndGet(value.second.length());
@@ -170,6 +171,7 @@ public class ZippedFlowTests extends BaseFuncTest
{
int totalLength = zipped.reduce(new Reducer<Integer, Tuple<Integer, String>>()
{
+ @Override
public Integer reduce(Integer accumulator, Tuple<Integer, String> value)
{
return accumulator + value.second.length();
@@ -218,6 +220,7 @@ public class ZippedFlowTests extends BaseFuncTest
{
Tuple<String, String> firstTuple = zipped.mapTuples(new Mapper<Tuple<Integer, String>, Tuple<String, String>>()
{
+ @Override
public Tuple<String, String> map(Tuple<Integer, String> value)
{
return Tuple.create(StringUtils.reverse(value.second),
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/modules/HibernateCoreModule.java
----------------------------------------------------------------------
diff --git a/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/modules/HibernateCoreModule.java b/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/modules/HibernateCoreModule.java
index e759a33..1f4ca6b 100644
--- a/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/modules/HibernateCoreModule.java
+++ b/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/modules/HibernateCoreModule.java
@@ -62,6 +62,7 @@ public class HibernateCoreModule
{
configuration.add("HibernateStartup", new Runnable()
{
+ @Override
public void run()
{
if (earlyStartup)
@@ -75,6 +76,7 @@ public class HibernateCoreModule
{
return new HibernateEntityPackageManager()
{
+ @Override
public Collection<String> getPackageNames()
{
return packageNames;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/DefaultHibernateConfigurer.java
----------------------------------------------------------------------
diff --git a/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/DefaultHibernateConfigurer.java b/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/DefaultHibernateConfigurer.java
index 348c71f..a9a2cb0 100644
--- a/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/DefaultHibernateConfigurer.java
+++ b/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/DefaultHibernateConfigurer.java
@@ -33,6 +33,7 @@ public final class DefaultHibernateConfigurer implements HibernateConfigurer
this.defaultConfiguration = defaultConfiguration;
}
+ @Override
public void configure(Configuration configuration)
{
if (defaultConfiguration) configuration.configure();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateSessionManagerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateSessionManagerImpl.java b/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateSessionManagerImpl.java
index cdcf56f..7dd1476 100644
--- a/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateSessionManagerImpl.java
+++ b/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateSessionManagerImpl.java
@@ -38,18 +38,21 @@ public class HibernateSessionManagerImpl implements HibernateSessionManager, Thr
transaction = session.beginTransaction();
}
+ @Override
public void abort()
{
transaction.rollback();
startNewTransaction();
}
+ @Override
public void commit()
{
transaction.commit();
startNewTransaction();
}
+ @Override
public Session getSession()
{
return session;
@@ -60,6 +63,7 @@ public class HibernateSessionManagerImpl implements HibernateSessionManager, Thr
* changes are lost; code should inject the HSM and invoke {@link #commit()} after making any changes, if they
* should persist.
*/
+ @Override
public void threadDidCleanup()
{
transaction.rollback();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateSessionSourceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateSessionSourceImpl.java b/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateSessionSourceImpl.java
index 615016e..abe08d2 100644
--- a/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateSessionSourceImpl.java
+++ b/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateSessionSourceImpl.java
@@ -57,6 +57,7 @@ public class HibernateSessionSourceImpl implements HibernateSessionSource
{
hub.addRegistryShutdownListener(new Runnable()
{
+ @Override
public void run()
{
sessionFactory.close();
@@ -64,16 +65,19 @@ public class HibernateSessionSourceImpl implements HibernateSessionSource
});
}
+ @Override
public Session create()
{
return sessionFactory.openSession();
}
+ @Override
public SessionFactory getSessionFactory()
{
return sessionFactory;
}
+ @Override
public Configuration getConfiguration()
{
return configuration;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateTransactionAdvisorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateTransactionAdvisorImpl.java b/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateTransactionAdvisorImpl.java
index 293c08a..68c0ec3 100644
--- a/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateTransactionAdvisorImpl.java
+++ b/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateTransactionAdvisorImpl.java
@@ -33,6 +33,7 @@ public class HibernateTransactionAdvisorImpl implements HibernateTransactionAdvi
*/
private final MethodAdvice advice = new MethodAdvice()
{
+ @Override
public void advise(MethodInvocation invocation)
{
try
@@ -57,6 +58,7 @@ public class HibernateTransactionAdvisorImpl implements HibernateTransactionAdvi
this.manager = manager;
}
+ @Override
public void addTransactionCommitAdvice(MethodAdviceReceiver receiver)
{
for (Method m : receiver.getInterface().getMethods())
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateTransactionDecoratorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateTransactionDecoratorImpl.java b/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateTransactionDecoratorImpl.java
index c848844..151ad99 100644
--- a/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateTransactionDecoratorImpl.java
+++ b/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateTransactionDecoratorImpl.java
@@ -32,6 +32,7 @@ public class HibernateTransactionDecoratorImpl implements HibernateTransactionDe
this.advisor = advisor;
}
+ @Override
public <T> T build(Class<T> serviceInterface, T delegate, String serviceId)
{
assert serviceInterface != null;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/PackageNameHibernateConfigurer.java
----------------------------------------------------------------------
diff --git a/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/PackageNameHibernateConfigurer.java b/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/PackageNameHibernateConfigurer.java
index a371ab5..ea1cbd0 100644
--- a/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/PackageNameHibernateConfigurer.java
+++ b/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/PackageNameHibernateConfigurer.java
@@ -36,6 +36,7 @@ public final class PackageNameHibernateConfigurer implements HibernateConfigurer
this.classNameLocator = classNameLocator;
}
+ @Override
public void configure(Configuration configuration)
{
ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-hibernate-core/src/test/java/org/apache/tapestry5/internal/hibernate/HibernateSessionSourceImplTest.java
----------------------------------------------------------------------
diff --git a/tapestry-hibernate-core/src/test/java/org/apache/tapestry5/internal/hibernate/HibernateSessionSourceImplTest.java b/tapestry-hibernate-core/src/test/java/org/apache/tapestry5/internal/hibernate/HibernateSessionSourceImplTest.java
index 0ea7d6a..514b3e5 100644
--- a/tapestry-hibernate-core/src/test/java/org/apache/tapestry5/internal/hibernate/HibernateSessionSourceImplTest.java
+++ b/tapestry-hibernate-core/src/test/java/org/apache/tapestry5/internal/hibernate/HibernateSessionSourceImplTest.java
@@ -74,6 +74,7 @@ public class HibernateSessionSourceImplTest extends IOCTestCase
{
HibernateConfigurer configurer = new HibernateConfigurer()
{
+ @Override
public void configure(Configuration configuration)
{
configuration.setProperty("foo", "bar");
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-hibernate-core/src/test/java/org/apache/tapestry5/internal/hibernate/HibernateTransactionDecoratorImplTest.java
----------------------------------------------------------------------
diff --git a/tapestry-hibernate-core/src/test/java/org/apache/tapestry5/internal/hibernate/HibernateTransactionDecoratorImplTest.java b/tapestry-hibernate-core/src/test/java/org/apache/tapestry5/internal/hibernate/HibernateTransactionDecoratorImplTest.java
index 6e5830e..6bbd5e0 100644
--- a/tapestry-hibernate-core/src/test/java/org/apache/tapestry5/internal/hibernate/HibernateTransactionDecoratorImplTest.java
+++ b/tapestry-hibernate-core/src/test/java/org/apache/tapestry5/internal/hibernate/HibernateTransactionDecoratorImplTest.java
@@ -220,16 +220,19 @@ public class HibernateTransactionDecoratorImplTest extends IOCTestCase
return new ReturnTypeService()
{
+ @Override
public String returnTypeMethod()
{
return "Foo";
}
+ @Override
public int returnTypeMethodWithParam(int first, int second)
{
return first + second;
}
+ @Override
public String toString()
{
return "Baz";
@@ -245,6 +248,7 @@ public class HibernateTransactionDecoratorImplTest extends IOCTestCase
@CommitAfter
int returnTypeMethodWithParam(int first, int second);
+ @Override
String toString();
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateGridDataSource.java
----------------------------------------------------------------------
diff --git a/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateGridDataSource.java b/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateGridDataSource.java
index 0a2df60..14aafab 100644
--- a/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateGridDataSource.java
+++ b/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateGridDataSource.java
@@ -53,6 +53,7 @@ public class HibernateGridDataSource implements GridDataSource
/**
* Returns the total number of rows for the configured entity type.
*/
+ @Override
public int getAvailableRows()
{
Criteria criteria = session.createCriteria(entityType);
@@ -74,6 +75,7 @@ public class HibernateGridDataSource implements GridDataSource
* @param endIndex index, from zero, of the last item to be retrieved
* @param sortConstraints zero or more constraints used to set the order of the returned values
*/
+ @Override
public void prepare(int startIndex, int endIndex, List<SortConstraint> sortConstraints)
{
assert sortConstraints != null;
@@ -125,6 +127,7 @@ public class HibernateGridDataSource implements GridDataSource
* @param index of object
* @return object at that index
*/
+ @Override
public Object getRowValue(int index)
{
return preparedResults.get(index - startIndex);
@@ -133,6 +136,7 @@ public class HibernateGridDataSource implements GridDataSource
/**
* Returns the entity type, as provided via the constructor.
*/
+ @Override
public Class getRowType()
{
return entityType;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/modules/HibernateModule.java
----------------------------------------------------------------------
diff --git a/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/modules/HibernateModule.java b/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/modules/HibernateModule.java
index 4df4c39..39b1f0a 100644
--- a/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/modules/HibernateModule.java
+++ b/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/modules/HibernateModule.java
@@ -102,6 +102,7 @@ public class HibernateModule
{
ValueEncoderFactory factory = new ValueEncoderFactory()
{
+ @Override
public ValueEncoder create(Class type)
{
return new HibernateEntityValueEncoder(entityClass, persistentClass, session, propertyAccess,
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/CommitAfterWorker.java
----------------------------------------------------------------------
diff --git a/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/CommitAfterWorker.java b/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/CommitAfterWorker.java
index e9751ee..ccf3b75 100644
--- a/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/CommitAfterWorker.java
+++ b/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/CommitAfterWorker.java
@@ -46,6 +46,7 @@ public class CommitAfterWorker implements ComponentClassTransformWorker2
}
}
+ @Override
public void advise(MethodInvocation invocation)
{
try
@@ -69,6 +70,7 @@ public class CommitAfterWorker implements ComponentClassTransformWorker2
this.manager = manager;
}
+ @Override
public void transform(PlasticClass plasticClass, TransformationSupport support, MutableComponentModel model)
{
for (PlasticMethod method : plasticClass.getMethodsWithAnnotation(CommitAfter.class))
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/EntityApplicationStatePersistenceStrategy.java
----------------------------------------------------------------------
diff --git a/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/EntityApplicationStatePersistenceStrategy.java b/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/EntityApplicationStatePersistenceStrategy.java
index 82d1f47..411ad61 100644
--- a/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/EntityApplicationStatePersistenceStrategy.java
+++ b/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/EntityApplicationStatePersistenceStrategy.java
@@ -36,6 +36,7 @@ public class EntityApplicationStatePersistenceStrategy extends SessionApplicatio
delegate = new EntityPersistentFieldStrategy(hibernateSession, null);
}
+ @Override
@SuppressWarnings("unchecked")
public <T> T get(Class<T> ssoClass, ApplicationStateCreator<T> creator)
{
@@ -58,6 +59,7 @@ public class EntityApplicationStatePersistenceStrategy extends SessionApplicatio
return (T) persistedValue;
}
+ @Override
public <T> void set(Class<T> ssoClass, T sso)
{
final String key = buildKey(ssoClass);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateEntityValueEncoder.java
----------------------------------------------------------------------
diff --git a/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateEntityValueEncoder.java b/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateEntityValueEncoder.java
index e7e3849..00bd68b 100644
--- a/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateEntityValueEncoder.java
+++ b/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateEntityValueEncoder.java
@@ -52,6 +52,7 @@ public final class HibernateEntityValueEncoder<E> implements ValueEncoder<E>
propertyAdapter = propertyAccess.getAdapter(this.entityClass).getPropertyAdapter(property.getName());
}
+ @Override
public String toClient(E value)
{
if (value == null)
@@ -67,6 +68,7 @@ public final class HibernateEntityValueEncoder<E> implements ValueEncoder<E>
return typeCoercer.coerce(id, String.class);
}
+ @Override
@SuppressWarnings("unchecked")
public E toValue(String clientValue)
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/PersistedEntity.java
----------------------------------------------------------------------
diff --git a/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/PersistedEntity.java b/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/PersistedEntity.java
index a4d5fb2..46b3476 100644
--- a/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/PersistedEntity.java
+++ b/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/PersistedEntity.java
@@ -41,6 +41,7 @@ public class PersistedEntity implements SessionRestorable
this.id = id;
}
+ @Override
public Object restoreWithSession(Session session)
{
try