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:02 UTC
[5/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/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/PersistedTransientEntity.java
----------------------------------------------------------------------
diff --git a/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/PersistedTransientEntity.java b/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/PersistedTransientEntity.java
index 78977b0..e66401d 100644
--- a/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/PersistedTransientEntity.java
+++ b/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/PersistedTransientEntity.java
@@ -27,6 +27,7 @@ public class PersistedTransientEntity implements SessionRestorable
this.transientEntity = transientEntity;
}
+ @Override
public Object restoreWithSession(Session session)
{
return transientEntity;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-hibernate/src/test/java/org/example/app0/services/AppModule.java
----------------------------------------------------------------------
diff --git a/tapestry-hibernate/src/test/java/org/example/app0/services/AppModule.java b/tapestry-hibernate/src/test/java/org/example/app0/services/AppModule.java
index 1eb52ed..b5bfccd 100644
--- a/tapestry-hibernate/src/test/java/org/example/app0/services/AppModule.java
+++ b/tapestry-hibernate/src/test/java/org/example/app0/services/AppModule.java
@@ -57,6 +57,7 @@ public class AppModule
configuration.add("TestAnalyzer", new WhitelistAnalyzer()
{
+ @Override
public boolean isRequestOnWhitelist(Request request)
{
return true;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-hibernate/src/test/java/org/example/app0/services/UserDAOImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-hibernate/src/test/java/org/example/app0/services/UserDAOImpl.java b/tapestry-hibernate/src/test/java/org/example/app0/services/UserDAOImpl.java
index f0d0cbc..a0f0f37 100644
--- a/tapestry-hibernate/src/test/java/org/example/app0/services/UserDAOImpl.java
+++ b/tapestry-hibernate/src/test/java/org/example/app0/services/UserDAOImpl.java
@@ -28,22 +28,26 @@ public class UserDAOImpl implements UserDAO
this.session = session;
}
+ @Override
public void add(User user)
{
session.save(user);
}
+ @Override
@SuppressWarnings({ "unchecked" })
public List<User> findAll()
{
return (List<User>) session.createQuery("from User").list();
}
+ @Override
public void delete(User... users)
{
for (User user : users) session.delete(user);
}
+ @Override
public void deleteAll()
{
for (User u : findAll())
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc-test/src/main/java/org/apache/tapestry5/ioc/test/TapestryIOCJUnit4ClassRunner.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc-test/src/main/java/org/apache/tapestry5/ioc/test/TapestryIOCJUnit4ClassRunner.java b/tapestry-ioc-test/src/main/java/org/apache/tapestry5/ioc/test/TapestryIOCJUnit4ClassRunner.java
index 01e6bad..54d33af 100644
--- a/tapestry-ioc-test/src/main/java/org/apache/tapestry5/ioc/test/TapestryIOCJUnit4ClassRunner.java
+++ b/tapestry-ioc-test/src/main/java/org/apache/tapestry5/ioc/test/TapestryIOCJUnit4ClassRunner.java
@@ -70,6 +70,7 @@ public class TapestryIOCJUnit4ClassRunner extends BlockJUnit4ClassRunner {
protected Statement withAfterClasses(Statement statement) {
final Statement superStatement = super.withAfterClasses(statement);
return new Statement() {
+ @Override
public void evaluate() throws Throwable {
superStatement.evaluate();
registryManager.afterTestClass();
@@ -93,47 +94,58 @@ public class TapestryIOCJUnit4ClassRunner extends BlockJUnit4ClassRunner {
this.registryManager = registryManager;
}
+ @Override
public void addListener(RunListener listener) {
delegate.addListener(listener);
}
+ @Override
public void removeListener(RunListener listener) {
delegate.removeListener(listener);
}
+ @Override
public void fireTestRunStarted(Description description) {
delegate.fireTestRunStarted(description);
}
+ @Override
public void fireTestRunFinished(Result result) {
delegate.fireTestRunFinished(result);
}
+ @Override
public void fireTestStarted(Description description) throws StoppedByUserException {
delegate.fireTestStarted(description);
}
+ @Override
public void fireTestFailure(Failure failure) {
delegate.fireTestFailure(failure);
}
+ @Override
public void fireTestAssumptionFailed(Failure failure) {
delegate.fireTestAssumptionFailed(failure);
}
+ @Override
public void fireTestIgnored(Description description) {
delegate.fireTestIgnored(description);
}
+ @Override
public void fireTestFinished(Description description) {
registryManager.afterTestMethod();
delegate.fireTestFinished(description);
}
+ @Override
public void pleaseStop() {
delegate.pleaseStop();
}
+ @Override
public void addFirstListener(RunListener listener) {
delegate.addFirstListener(listener);
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc-test/src/test/java/org/apache/tapestry5/ioc/test/MapModuleDef.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc-test/src/test/java/org/apache/tapestry5/ioc/test/MapModuleDef.java b/tapestry-ioc-test/src/test/java/org/apache/tapestry5/ioc/test/MapModuleDef.java
index 2b14812..6001b2c 100644
--- a/tapestry-ioc-test/src/test/java/org/apache/tapestry5/ioc/test/MapModuleDef.java
+++ b/tapestry-ioc-test/src/test/java/org/apache/tapestry5/ioc/test/MapModuleDef.java
@@ -38,26 +38,32 @@ public class MapModuleDef implements ModuleDef {
this.map = map;
}
+ @Override
public Class getBuilderClass() {
return null;
}
+ @Override
public Set<ContributionDef> getContributionDefs() {
return Collections.emptySet();
}
+ @Override
public Set<DecoratorDef> getDecoratorDefs() {
return Collections.emptySet();
}
+ @Override
public String getLoggerName() {
return "MapModuleDef";
}
+ @Override
public Set<String> getServiceIds() {
return map.keySet();
}
+ @Override
public ServiceDef getServiceDef(String serviceId) {
return new MapServiceDef(map, serviceId);
}
@@ -72,30 +78,37 @@ public class MapModuleDef implements ModuleDef {
this.serviceId = serviceId;
}
+ @Override
public ObjectCreator createServiceCreator(ServiceBuilderResources resources) {
return new ObjectCreator() {
+ @Override
public Object createObject() {
return map.get(serviceId);
}
};
}
+ @Override
public String getServiceId() {
return serviceId;
}
+ @Override
public Set<Class> getMarkers() {
return Collections.emptySet();
}
+ @Override
public Class getServiceInterface() {
return map.get(serviceId).getClass();
}
+ @Override
public String getServiceScope() {
return ScopeConstants.DEFAULT;
}
+ @Override
public boolean isEagerLoad() {
return false;
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/BaseLocatable.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/BaseLocatable.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/BaseLocatable.java
index 2e2d953..fa942ed 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/BaseLocatable.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/BaseLocatable.java
@@ -26,6 +26,7 @@ public class BaseLocatable implements Locatable
this.location = location;
}
+ @Override
public final Location getLocation()
{
return location;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractReloadableObjectCreator.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractReloadableObjectCreator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractReloadableObjectCreator.java
index 3c1ddfc..1bc2c91 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractReloadableObjectCreator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractReloadableObjectCreator.java
@@ -76,6 +76,7 @@ public abstract class AbstractReloadableObjectCreator implements ObjectCreator,
this.tracker = tracker;
}
+ @Override
public synchronized void checkForUpdates()
{
if (instance == null || !changeTracker.containsChanges())
@@ -112,6 +113,7 @@ public abstract class AbstractReloadableObjectCreator implements ObjectCreator,
return false;
}
+ @Override
public synchronized Object createObject()
{
if (instance == null)
@@ -126,6 +128,7 @@ public abstract class AbstractReloadableObjectCreator implements ObjectCreator,
{
return tracker.invoke(String.format("Reloading class %s.", implementationClassName), new Invokable<Object>()
{
+ @Override
public Object invoke()
{
Class reloadedClass = reloadImplementationClass();
@@ -180,11 +183,13 @@ public abstract class AbstractReloadableObjectCreator implements ObjectCreator,
}
}
+ @Override
public boolean shouldInterceptClassLoading(String className)
{
return classesToLoad.contains(className);
}
+ @Override
public Class<?> loadAndTransformClass(String className) throws ClassNotFoundException
{
logger.debug(String.format("BEGIN Analyzing %s", className));
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractServiceCreator.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractServiceCreator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractServiceCreator.java
index c98f0d6..b254f0f 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractServiceCreator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractServiceCreator.java
@@ -80,6 +80,7 @@ public abstract class AbstractServiceCreator implements ObjectCreator
{
private boolean seenOne;
+ @Override
public <T> T findResource(Class<T> resourceType, Type genericType)
{
ConfigurationType thisType = PARAMETER_TYPE_TO_CONFIGURATION_TYPE.get(resourceType);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AdvisorDefImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AdvisorDefImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AdvisorDefImpl.java
index 2bb1426..e27ca90 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AdvisorDefImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AdvisorDefImpl.java
@@ -37,11 +37,13 @@ public class AdvisorDefImpl extends AbstractServiceInstrumenter implements Advis
this.advisorId = advisorId;
}
+ @Override
public ServiceAdvisor createAdvisor(ModuleBuilderSource moduleSource, ServiceResources resources)
{
return new ServiceAdvisorImpl(moduleSource, method, resources, proxyFactory);
}
+ @Override
public String getAdvisorId()
{
return advisorId;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AdvisorStackBuilder.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AdvisorStackBuilder.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AdvisorStackBuilder.java
index 9a9a889..ac24e05 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AdvisorStackBuilder.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AdvisorStackBuilder.java
@@ -58,6 +58,7 @@ public class AdvisorStackBuilder implements ObjectCreator
this.aspectDecorator = aspectDecorator;
}
+ @Override
public Object createObject()
{
Object service = delegate.createObject();
@@ -75,6 +76,7 @@ public class AdvisorStackBuilder implements ObjectCreator
{
registry.run("Invoking " + advisor, new Runnable()
{
+ @Override
public void run()
{
advisor.advise(builder);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AnnotationAccessImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AnnotationAccessImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AnnotationAccessImpl.java
index a970c4d..b088cb9 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AnnotationAccessImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AnnotationAccessImpl.java
@@ -32,11 +32,13 @@ public class AnnotationAccessImpl implements AnnotationAccess
this.type = type;
}
+ @Override
public AnnotationProvider getClassAnnotationProvider()
{
return InternalUtils.toAnnotationProvider(type);
}
+ @Override
public AnnotationProvider getMethodAnnotationProvider(String methodName, Class... parameterTypes)
{
return InternalUtils.toAnnotationProvider(InternalUtils.findMethod(type, methodName, parameterTypes));
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ConstructorServiceCreator.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ConstructorServiceCreator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ConstructorServiceCreator.java
index 0335679..e3405dc 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ConstructorServiceCreator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ConstructorServiceCreator.java
@@ -56,6 +56,7 @@ public class ConstructorServiceCreator extends AbstractServiceCreator
return plan;
}
+ @Override
public Object createObject()
{
return getPlan().createObject();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ContributionDefImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ContributionDefImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ContributionDefImpl.java
index c7b0012..ce52b94 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ContributionDefImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ContributionDefImpl.java
@@ -59,27 +59,32 @@ public class ContributionDefImpl implements ContributionDef3
return InternalUtils.asString(contributorMethod, proxyFactory);
}
+ @Override
public boolean isOptional()
{
return optional;
}
+ @Override
public String getServiceId()
{
return serviceId;
}
+ @Override
public void contribute(ModuleBuilderSource moduleSource, ServiceResources resources, Configuration configuration)
{
invokeMethod(moduleSource, resources, Configuration.class, configuration);
}
+ @Override
public void contribute(ModuleBuilderSource moduleSource, ServiceResources resources,
OrderedConfiguration configuration)
{
invokeMethod(moduleSource, resources, OrderedConfiguration.class, configuration);
}
+ @Override
public void contribute(ModuleBuilderSource moduleSource, ServiceResources resources,
MappedConfiguration configuration)
{
@@ -130,11 +135,13 @@ public class ContributionDefImpl implements ContributionDef3
throw new RuntimeException(IOCMessages.contributionMethodError(contributorMethod, fail), fail);
}
+ @Override
public Set<Class> getMarkers()
{
return markers;
}
+ @Override
public Class getServiceInterface()
{
return serviceInterface;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DecoratorDefImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DecoratorDefImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DecoratorDefImpl.java
index 3905ad4..3398b88 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DecoratorDefImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DecoratorDefImpl.java
@@ -38,11 +38,13 @@ public class DecoratorDefImpl extends AbstractServiceInstrumenter implements Dec
}
+ @Override
public ServiceDecorator createDecorator(ModuleBuilderSource moduleSource, ServiceResources resources)
{
return new ServiceDecoratorImpl(method, moduleSource, resources, proxyFactory);
}
+ @Override
public String getDecoratorId()
{
return decoratorId;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DefaultModuleDefImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DefaultModuleDefImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DefaultModuleDefImpl.java
index f7d9a9c..55e993d 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DefaultModuleDefImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DefaultModuleDefImpl.java
@@ -176,16 +176,19 @@ public class DefaultModuleDefImpl implements ModuleDef2, ServiceDefAccumulator
return String.format("ModuleDef[%s %s]", moduleClass.getName(), InternalUtils.joinSorted(serviceDefs.keySet()));
}
+ @Override
public Class getBuilderClass()
{
return moduleClass;
}
+ @Override
public Set<String> getServiceIds()
{
return serviceDefs.keySet();
}
+ @Override
public ServiceDef getServiceDef(String serviceId)
{
return serviceDefs.get(serviceId);
@@ -214,6 +217,7 @@ public class DefaultModuleDefImpl implements ModuleDef2, ServiceDefAccumulator
{
// By name, ascending, then by parameter count, descending.
+ @Override
public int compare(Method o1, Method o2)
{
int result = o1.getName().compareTo(o2.getName());
@@ -462,11 +466,13 @@ public class DefaultModuleDefImpl implements ModuleDef2, ServiceDefAccumulator
ObjectCreatorSource source = new ObjectCreatorSource()
{
+ @Override
public ObjectCreator constructCreator(ServiceBuilderResources resources)
{
return new ServiceBuilderMethodInvoker(resources, getDescription(), method);
}
+ @Override
public String getDescription()
{
return DefaultModuleDefImpl.this.toString(method);
@@ -497,12 +503,14 @@ public class DefaultModuleDefImpl implements ModuleDef2, ServiceDefAccumulator
{
return F.flow(method.getAnnotations()).map(new Mapper<Annotation, Class>()
{
+ @Override
public Class map(Annotation value)
{
return value.annotationType();
}
}).filter(new Predicate<Class>()
{
+ @Override
public boolean accept(Class element)
{
for (Class skip : annotationClassesToSkip)
@@ -518,6 +526,7 @@ public class DefaultModuleDefImpl implements ModuleDef2, ServiceDefAccumulator
}).toSet();
}
+ @Override
public void addServiceDef(ServiceDef serviceDef)
{
String serviceId = serviceDef.getServiceId();
@@ -538,16 +547,19 @@ public class DefaultModuleDefImpl implements ModuleDef2, ServiceDefAccumulator
return scope != null ? scope.value() : ScopeConstants.DEFAULT;
}
+ @Override
public Set<DecoratorDef> getDecoratorDefs()
{
return toSet(decoratorDefs);
}
+ @Override
public Set<ContributionDef> getContributionDefs()
{
return contributionDefs;
}
+ @Override
public String getLoggerName()
{
return moduleClass.getName();
@@ -606,6 +618,7 @@ public class DefaultModuleDefImpl implements ModuleDef2, ServiceDefAccumulator
throw new RuntimeException(IOCMessages.errorInBindMethod(methodId, failure), failure);
}
+ @Override
public Set<AdvisorDef> getAdvisorDefs()
{
return toSet(advisorDefs);
@@ -616,6 +629,7 @@ public class DefaultModuleDefImpl implements ModuleDef2, ServiceDefAccumulator
return CollectionFactory.newSet(map.values());
}
+ @Override
public Set<StartupDef> getStartups()
{
return startups;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/IdMatcherImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/IdMatcherImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/IdMatcherImpl.java
index a2fe889..dbd7f1c 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/IdMatcherImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/IdMatcherImpl.java
@@ -28,6 +28,7 @@ public class IdMatcherImpl implements IdMatcher
globMatcher = new GlobPatternMatcher(pattern);
}
+ @Override
public boolean matches(String id)
{
return globMatcher.matches(id);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/InterceptorStackBuilder.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/InterceptorStackBuilder.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/InterceptorStackBuilder.java
index 08fe3ee..78ea2ee 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/InterceptorStackBuilder.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/InterceptorStackBuilder.java
@@ -49,6 +49,7 @@ public class InterceptorStackBuilder implements ObjectCreator
this.registry = registry;
}
+ @Override
public Object createObject()
{
Object current = delegate.createObject();
@@ -66,6 +67,7 @@ public class InterceptorStackBuilder implements ObjectCreator
Object interceptor = registry.invoke("Invoking " + decorator, new Invokable<Object>()
{
+ @Override
public Object invoke()
{
return decorator.createInterceptor(delegate);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/LifecycleWrappedServiceCreator.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/LifecycleWrappedServiceCreator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/LifecycleWrappedServiceCreator.java
index 3717b9c..9fc350c 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/LifecycleWrappedServiceCreator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/LifecycleWrappedServiceCreator.java
@@ -41,6 +41,7 @@ public class LifecycleWrappedServiceCreator implements ObjectCreator
/**
* Passes the resources and the service creator through the {@link org.apache.tapestry5.ioc.ServiceLifecycle}.
*/
+ @Override
public Object createObject()
{
return lifecycle.createService(resources, creator);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/LoggerSourceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/LoggerSourceImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/LoggerSourceImpl.java
index 4e90c8e..49cd03a 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/LoggerSourceImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/LoggerSourceImpl.java
@@ -25,11 +25,13 @@ import org.slf4j.LoggerFactory;
*/
public class LoggerSourceImpl implements LoggerSource
{
+ @Override
public Logger getLogger(Class clazz)
{
return LoggerFactory.getLogger(clazz);
}
+ @Override
public Logger getLogger(String name)
{
return LoggerFactory.getLogger(name);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ModuleImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ModuleImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ModuleImpl.java
index 69b8d4d..48bf24d 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ModuleImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ModuleImpl.java
@@ -99,6 +99,7 @@ public class ModuleImpl implements Module
}
}
+ @Override
public <T> T getService(String serviceId, Class<T> serviceInterface)
{
assert InternalUtils.isNonBlank(serviceId);
@@ -124,6 +125,7 @@ public class ModuleImpl implements Module
}
}
+ @Override
public Set<DecoratorDef> findMatchingDecoratorDefs(ServiceDef serviceDef)
{
Set<DecoratorDef> result = CollectionFactory.newSet();
@@ -137,6 +139,7 @@ public class ModuleImpl implements Module
return result;
}
+ @Override
public Set<AdvisorDef> findMatchingServiceAdvisors(ServiceDef serviceDef)
{
Set<AdvisorDef> result = CollectionFactory.newSet();
@@ -150,6 +153,7 @@ public class ModuleImpl implements Module
return result;
}
+ @Override
@SuppressWarnings("unchecked")
public Collection<String> findServiceIdsForInterface(Class serviceInterface)
{
@@ -178,6 +182,7 @@ public class ModuleImpl implements Module
final Invokable create = new Invokable()
{
+ @Override
public Object invoke()
{
// In a race condition, two threads may try to create the same service simulatenously.
@@ -201,6 +206,7 @@ public class ModuleImpl implements Module
Invokable find = new Invokable()
{
+ @Override
public Object invoke()
{
Object result = services.get(key);
@@ -215,10 +221,12 @@ public class ModuleImpl implements Module
return BARRIER.withRead(find);
}
+ @Override
public void collectEagerLoadServices(final Collection<EagerLoadServiceProxy> proxies)
{
Runnable work = new Runnable()
{
+ @Override
public void run()
{
for (ServiceDef3 def : serviceDefs.values())
@@ -256,6 +264,7 @@ public class ModuleImpl implements Module
Invokable operation = new Invokable()
{
+ @Override
public Object invoke()
{
try
@@ -339,6 +348,7 @@ public class ModuleImpl implements Module
{
return registry.invoke("Obtaining AspectDecorator service", new Invokable<AspectDecorator>()
{
+ @Override
public AspectDecorator invoke()
{
return registry.getService(AspectDecorator.class);
@@ -348,11 +358,13 @@ public class ModuleImpl implements Module
private final Runnable instantiateModule = new Runnable()
{
+ @Override
public void run()
{
moduleInstance = registry.invoke("Constructing module class " + moduleDef.getBuilderClass().getName(),
new Invokable()
{
+ @Override
public Object invoke()
{
return instantiateModuleInstance();
@@ -363,6 +375,7 @@ public class ModuleImpl implements Module
private final Invokable provideModuleInstance = new Invokable<Object>()
{
+ @Override
public Object invoke()
{
if (moduleInstance == null)
@@ -372,6 +385,7 @@ public class ModuleImpl implements Module
}
};
+ @Override
public Object getModuleBuilder()
{
return BARRIER.withRead(provideModuleInstance);
@@ -394,6 +408,7 @@ public class ModuleImpl implements Module
Comparator<Constructor> comparator = new Comparator<Constructor>()
{
+ @Override
public int compare(Constructor c1, Constructor c2)
{
return c2.getParameterTypes().length - c1.getParameterTypes().length;
@@ -468,6 +483,7 @@ public class ModuleImpl implements Module
{
ClassInstantiator instantiator = proxyFactory.createProxy(serviceInterface, serviceImplementation, new PlasticClassTransformer()
{
+ @Override
public void transform(final PlasticClass plasticClass)
{
plasticClass.introduceInterface(Serializable.class);
@@ -484,6 +500,7 @@ public class ModuleImpl implements Module
// If not concerned with efficiency, this might be done with method advice instead.
delegateMethod.changeImplementation(new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadThis().getField(creatorField);
@@ -499,6 +516,7 @@ public class ModuleImpl implements Module
plasticClass.introduceMethod(WRITE_REPLACE).changeImplementation(new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadThis().getField(tokenField).returnResult();
@@ -512,6 +530,7 @@ public class ModuleImpl implements Module
return instantiator.newInstance();
}
+ @Override
@SuppressWarnings("all")
public Set<ContributionDef2> getContributorDefsForService(ServiceDef serviceDef)
{
@@ -576,11 +595,13 @@ public class ModuleImpl implements Module
return serviceDefs.containsKey(serviceDef.getServiceId());
}
+ @Override
public ServiceDef3 getServiceDef(String serviceId)
{
return serviceDefs.get(serviceId);
}
+ @Override
public String getLoggerName()
{
return moduleDef.getLoggerName();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/NullAnnotationProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/NullAnnotationProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/NullAnnotationProvider.java
index 0034fef..716b7c6 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/NullAnnotationProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/NullAnnotationProvider.java
@@ -26,6 +26,7 @@ public class NullAnnotationProvider implements AnnotationProvider
/**
* Always returns null.
*/
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationClass)
{
return null;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ObjectLocatorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ObjectLocatorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ObjectLocatorImpl.java
index d9203b0..26f4d08 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ObjectLocatorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ObjectLocatorImpl.java
@@ -35,6 +35,7 @@ public class ObjectLocatorImpl implements ObjectLocator
this.module = module;
}
+ @Override
public <T> T getService(String serviceId, Class<T> serviceInterface)
{
String expandedServiceId = registry.expandSymbols(serviceId);
@@ -42,31 +43,37 @@ public class ObjectLocatorImpl implements ObjectLocator
return registry.getService(expandedServiceId, serviceInterface);
}
+ @Override
public <T> T getService(Class<T> serviceInterface)
{
return registry.getService(serviceInterface);
}
+ @Override
public <T> T getService(Class<T> serviceInterface, Class<? extends Annotation>... markerTypes)
{
return registry.getService(serviceInterface, markerTypes);
}
+ @Override
public <T> T getObject(Class<T> objectType, AnnotationProvider annotationProvider)
{
return registry.getObject(objectType, annotationProvider, this, module);
}
+ @Override
public <T> T autobuild(Class<T> clazz)
{
return registry.autobuild(clazz);
}
+ @Override
public <T> T autobuild(String description, Class<T> clazz)
{
return registry.autobuild(description, clazz);
}
+ @Override
public <T> T proxy(Class<T> interfaceClass, Class<? extends T> implementationClass)
{
return registry.proxy(interfaceClass, implementationClass, this);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/OperationTrackerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/OperationTrackerImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/OperationTrackerImpl.java
index 703617c..6bc462b 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/OperationTrackerImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/OperationTrackerImpl.java
@@ -43,6 +43,7 @@ public class OperationTrackerImpl implements OperationTracker
this.logger = logger;
}
+ @Override
public void run(String description, final Runnable operation)
{
assert InternalUtils.isNonBlank(description);
@@ -68,6 +69,7 @@ public class OperationTrackerImpl implements OperationTracker
}
}
+ @Override
public <T> T invoke(String description, Invokable<T> operation)
{
assert InternalUtils.isNonBlank(description);
@@ -95,6 +97,7 @@ public class OperationTrackerImpl implements OperationTracker
}
}
+ @Override
public <T> T perform(String description, IOOperation<T> operation) throws IOException
{
InternalUtils.isNonBlank(description);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/OperationTrackingObjectCreator.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/OperationTrackingObjectCreator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/OperationTrackingObjectCreator.java
index 7a0e0ba..1f34e44 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/OperationTrackingObjectCreator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/OperationTrackingObjectCreator.java
@@ -36,10 +36,12 @@ public class OperationTrackingObjectCreator implements ObjectCreator
this.delegate = delegate;
}
+ @Override
public Object createObject()
{
Invokable<Object> operation = new Invokable<Object>()
{
+ @Override
public Object invoke()
{
return delegate.createObject();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/OrIdMatcher.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/OrIdMatcher.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/OrIdMatcher.java
index 57d1378..b3de320 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/OrIdMatcher.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/OrIdMatcher.java
@@ -30,6 +30,7 @@ public final class OrIdMatcher implements IdMatcher
this.matchers = matchers.toArray(new IdMatcher[matchers.size()]);
}
+ @Override
public boolean matches(String id)
{
for (IdMatcher m : matchers)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/PerThreadOperationTracker.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/PerThreadOperationTracker.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/PerThreadOperationTracker.java
index 7674357..4e0e57f 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/PerThreadOperationTracker.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/PerThreadOperationTracker.java
@@ -71,6 +71,7 @@ public class PerThreadOperationTracker implements OperationTracker
}
}
+ @Override
public void run(String description, Runnable operation)
{
try
@@ -82,6 +83,7 @@ public class PerThreadOperationTracker implements OperationTracker
}
}
+ @Override
public <T> T invoke(String description, Invokable<T> operation)
{
try
@@ -93,6 +95,7 @@ public class PerThreadOperationTracker implements OperationTracker
}
}
+ @Override
public <T> T perform(String description, IOOperation<T> operation) throws IOException
{
try
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/QuietOperationTracker.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/QuietOperationTracker.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/QuietOperationTracker.java
index 141397c..9fd32ea 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/QuietOperationTracker.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/QuietOperationTracker.java
@@ -25,16 +25,19 @@ import java.io.IOException;
*/
public class QuietOperationTracker implements OperationTracker
{
+ @Override
public void run(String description, Runnable operation)
{
operation.run();
}
+ @Override
public <T> T invoke(String description, Invokable<T> operation)
{
return operation.invoke();
}
+ @Override
public <T> T perform(String description, IOOperation<T> operation) throws IOException
{
return operation.perform();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RecursiveServiceCreationCheckWrapper.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RecursiveServiceCreationCheckWrapper.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RecursiveServiceCreationCheckWrapper.java
index ed956b9..4a3fdf1 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RecursiveServiceCreationCheckWrapper.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RecursiveServiceCreationCheckWrapper.java
@@ -46,6 +46,7 @@ public class RecursiveServiceCreationCheckWrapper implements ObjectCreator
* We could make this method synchronized, but in the context of creating a service for a proxy, it will already be
* synchronized (inside the proxy).
*/
+ @Override
public Object createObject()
{
if (locked)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java
index bde916b..7de7428 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java
@@ -153,6 +153,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
registryShutdownHub.addRegistryShutdownListener(new Runnable()
{
+ @Override
public void run()
{
scoreboardAndTracker.shutdown();
@@ -214,6 +215,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
startups.add(new Runnable()
{
+ @Override
public void run()
{
startup.invoke(module, RegistryImpl.this, RegistryImpl.this, logger);
@@ -284,12 +286,14 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
Flow<ServiceDef2> filtered = serviceDefs.filter(F.and(new Predicate<ServiceDef2>()
{
+ @Override
public boolean accept(ServiceDef2 object)
{
return object.getServiceInterface().equals(cd.getServiceInterface());
}
}, new Predicate<ServiceDef2>()
{
+ @Override
public boolean accept(ServiceDef2 serviceDef)
{
return serviceDef.getMarkers().containsAll(contributionMarkers);
@@ -307,6 +311,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
{
return F.flow(moduleDef.getServiceIds()).map(new Mapper<String, ServiceDef2>()
{
+ @Override
public ServiceDef2 map(String value)
{
return InternalUtils.toServiceDef2(moduleDef.getServiceDef(value));
@@ -321,6 +326,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
* eager loading of
* services out to its own method should ensure thread safety.
*/
+ @Override
public void performRegistryStartup()
{
eagerLoadLock.lock();
@@ -348,6 +354,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
cleanupThread();
}
+ @Override
public Logger getServiceLogger(String serviceId)
{
Module module = serviceIdToModule.get(serviceId);
@@ -372,36 +379,43 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
ServiceDef2 serviceDef = new ServiceDef2()
{
+ @Override
public ObjectCreator createServiceCreator(ServiceBuilderResources resources)
{
return null;
}
+ @Override
public Set<Class> getMarkers()
{
return BUILTIN;
}
+ @Override
public String getServiceId()
{
return serviceId;
}
+ @Override
public Class getServiceInterface()
{
return serviceInterface;
}
+ @Override
public String getServiceScope()
{
return ScopeConstants.DEFAULT;
}
+ @Override
public boolean isEagerLoad()
{
return false;
}
+ @Override
public boolean isPreventDecoration()
{
return true;
@@ -417,6 +431,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
tracker.define(serviceDef, Status.BUILTIN);
}
+ @Override
public synchronized void shutdown()
{
lock.lock();
@@ -426,6 +441,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
SerializationSupport.clearProvider(this);
}
+ @Override
public <T> T getService(String serviceId, Class<T> serviceInterface)
{
lock.check();
@@ -459,6 +475,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
}
}
+ @Override
public void cleanupThread()
{
lock.check();
@@ -477,6 +494,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
return module;
}
+ @Override
public <T> Collection<T> getUnorderedConfiguration(ServiceDef3 serviceDef, Class<T> objectType)
{
lock.check();
@@ -489,6 +507,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
return result;
}
+ @Override
@SuppressWarnings("unchecked")
public <T> List<T> getOrderedConfiguration(ServiceDef3 serviceDef, Class<T> objectType)
{
@@ -510,6 +529,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
{
ObjectProvider contribution = new ObjectProvider()
{
+ @Override
public <T> T provide(Class<T> objectType, AnnotationProvider annotationProvider, ObjectLocator locator)
{
return findServiceByMarkerAndType(objectType, annotationProvider, null);
@@ -525,6 +545,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
return orderer.getOrdered();
}
+ @Override
public <K, V> Map<K, V> getMappedConfiguration(ServiceDef3 serviceDef, Class<K> keyType, Class<V> objectType)
{
lock.check();
@@ -584,6 +605,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
operationTracker.run(description, new Runnable()
{
+ @Override
public void run()
{
def.contribute(module, resources, validating);
@@ -616,6 +638,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
operationTracker.run(description, new Runnable()
{
+ @Override
public void run()
{
def.contribute(module, resources, validating);
@@ -649,6 +672,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
operationTracker.run(description, new Runnable()
{
+ @Override
public void run()
{
def.contribute(module, resources, validating);
@@ -657,6 +681,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
}
}
+ @Override
public <T> T getService(Class<T> serviceInterface)
{
lock.check();
@@ -664,6 +689,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
return getServiceByTypeAndMarkers(serviceInterface);
}
+ @Override
public <T> T getService(Class<T> serviceInterface, Class<? extends Annotation>... markerTypes)
{
lock.check();
@@ -726,6 +752,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
return new AnnotationProvider()
{
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationClass)
{
return annotationClass.cast(map.get(annotationClass));
@@ -743,6 +770,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
InvocationHandler handler = new InvocationHandler()
{
+ @Override
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
{
if (method.getName().equals("annotationType"))
@@ -782,6 +810,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
return result;
}
+ @Override
public ServiceLifecycle2 getServiceLifecycle(String scope)
{
lock.check();
@@ -801,6 +830,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
return InternalUtils.toServiceLifecycle2(result);
}
+ @Override
public List<ServiceDecorator> findDecoratorsForService(ServiceDef3 serviceDef)
{
lock.check();
@@ -831,6 +861,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
return orderer.getOrdered();
}
+ @Override
public List<ServiceAdvisor> findAdvisorsForService(ServiceDef3 serviceDef)
{
lock.check();
@@ -861,6 +892,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
return orderer.getOrdered();
}
+ @Override
public <T> T getObject(Class<T> objectType, AnnotationProvider annotationProvider, ObjectLocator locator,
Module localModule)
{
@@ -987,11 +1019,13 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
}
}
+ @Override
public <T> T getObject(Class<T> objectType, AnnotationProvider annotationProvider)
{
return getObject(objectType, annotationProvider, this, null);
}
+ @Override
public void addRegistryShutdownListener(RegistryShutdownListener listener)
{
lock.check();
@@ -999,6 +1033,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
registryShutdownHub.addRegistryShutdownListener(listener);
}
+ @Override
public void addRegistryShutdownListener(Runnable listener)
{
lock.check();
@@ -1006,6 +1041,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
registryShutdownHub.addRegistryShutdownListener(listener);
}
+ @Override
public void addRegistryWillShutdownListener(Runnable listener)
{
lock.check();
@@ -1013,6 +1049,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
registryShutdownHub.addRegistryWillShutdownListener(listener);
}
+ @Override
public String expandSymbols(String input)
{
lock.check();
@@ -1036,10 +1073,12 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
return symbolSource;
}
+ @Override
public <T> T autobuild(String description, final Class<T> clazz)
{
return invoke(description, new Invokable<T>()
{
+ @Override
public T invoke()
{
return autobuild(clazz);
@@ -1047,6 +1086,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
});
}
+ @Override
public <T> T autobuild(final Class<T> clazz)
{
assert clazz != null;
@@ -1067,11 +1107,13 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
return plan.createObject();
}
+ @Override
public <T> T proxy(Class<T> interfaceClass, Class<? extends T> implementationClass)
{
return proxy(interfaceClass, implementationClass, this);
}
+ @Override
public <T> T proxy(Class<T> interfaceClass, Class<? extends T> implementationClass, ObjectLocator locator)
{
assert interfaceClass != null;
@@ -1088,6 +1130,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
{
final ObjectCreator<T> autobuildCreator = new ObjectCreator<T>()
{
+ @Override
public T createObject()
{
return locator.autobuild(implementationClass);
@@ -1098,6 +1141,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
{
private T delegate;
+ @Override
public synchronized T createObject()
{
if (delegate == null)
@@ -1123,26 +1167,31 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
String.format("<Autoreload proxy %s(%s)>", implementationClass.getName(), interfaceClass.getName()));
}
+ @Override
public Object provideServiceProxy(String serviceId)
{
return getService(serviceId, Object.class);
}
+ @Override
public void run(String description, Runnable operation)
{
operationTracker.run(description, operation);
}
+ @Override
public <T> T invoke(String description, Invokable<T> operation)
{
return operationTracker.invoke(description, operation);
}
+ @Override
public <T> T perform(String description, IOOperation<T> operation) throws IOException
{
return operationTracker.perform(description, operation);
}
+ @Override
public Set<Class> getMarkerAnnotations()
{
return markerToServiceDef.keySet();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryWrapper.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryWrapper.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryWrapper.java
index 3f25686..519b193 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryWrapper.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryWrapper.java
@@ -33,21 +33,25 @@ public class RegistryWrapper implements Registry
this.registry = registry;
}
+ @Override
public void cleanupThread()
{
registry.cleanupThread();
}
+ @Override
public void shutdown()
{
registry.shutdown();
}
+ @Override
public <T> T getObject(Class<T> objectType, AnnotationProvider annotationProvider)
{
return registry.getObject(objectType, annotationProvider);
}
+ @Override
public <T> T getService(String serviceId, Class<T> serviceInterface)
{
String expandedServiceId = registry.expandSymbols(serviceId);
@@ -55,31 +59,37 @@ public class RegistryWrapper implements Registry
return registry.getService(expandedServiceId, serviceInterface);
}
+ @Override
public <T> T getService(Class<T> serviceInterface)
{
return registry.getService(serviceInterface);
}
+ @Override
public <T> T getService(Class<T> serviceInterface, Class<? extends Annotation>... markerTypes)
{
return registry.getService(serviceInterface, markerTypes);
}
+ @Override
public <T> T autobuild(Class<T> clazz)
{
return registry.autobuild(clazz);
}
+ @Override
public <T> T autobuild(String description, Class<T> clazz)
{
return registry.autobuild(description, clazz);
}
+ @Override
public void performRegistryStartup()
{
registry.performRegistryStartup();
}
+ @Override
public <T> T proxy(Class<T> interfaceClass, Class<? extends T> implementationClass)
{
return registry.proxy(interfaceClass, implementationClass);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ReloadableObjectCreatorSource.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ReloadableObjectCreatorSource.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ReloadableObjectCreatorSource.java
index 2473a29..da28873 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ReloadableObjectCreatorSource.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ReloadableObjectCreatorSource.java
@@ -48,10 +48,12 @@ public class ReloadableObjectCreatorSource implements ObjectCreatorSource
}
+ @Override
public ObjectCreator constructCreator(final ServiceBuilderResources resources)
{
return new ObjectCreator()
{
+ @Override
public Object createObject()
{
return createReloadableProxy(resources);
@@ -65,6 +67,7 @@ public class ReloadableObjectCreatorSource implements ObjectCreatorSource
};
}
+ @Override
public String getDescription()
{
return String.format("Reloadable %s via %s", serviceImplementationClass.getName(),
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ReloadableServiceImplementationObjectCreator.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ReloadableServiceImplementationObjectCreator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ReloadableServiceImplementationObjectCreator.java
index 93baf33..12ec8ed 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ReloadableServiceImplementationObjectCreator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ReloadableServiceImplementationObjectCreator.java
@@ -39,6 +39,7 @@ public class ReloadableServiceImplementationObjectCreator extends AbstractReload
this.resources = resources;
}
+ @Override
protected Object createInstance(Class clazz)
{
final Constructor constructor = InternalUtils.findAutobuildConstructor(clazz);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceActivityTrackerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceActivityTrackerImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceActivityTrackerImpl.java
index afcdacd..34e745f 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceActivityTrackerImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceActivityTrackerImpl.java
@@ -52,21 +52,25 @@ public class ServiceActivityTrackerImpl implements ServiceActivityScoreboard,
}
}
+ @Override
public String getServiceId()
{
return serviceDef.getServiceId();
}
+ @Override
public Class getServiceInterface()
{
return serviceDef.getServiceInterface();
}
+ @Override
public String getScope()
{
return serviceDef.getServiceScope();
}
+ @Override
public Set<Class> getMarkers()
{
return serviceDef.getMarkers();
@@ -74,6 +78,7 @@ public class ServiceActivityTrackerImpl implements ServiceActivityScoreboard,
// Mutable properties must be synchronized
+ @Override
public synchronized Status getStatus()
{
if (perThreadStatus != null) {
@@ -101,6 +106,7 @@ public class ServiceActivityTrackerImpl implements ServiceActivityScoreboard,
*/
private final Map<String, MutableServiceActivity> serviceIdToServiceStatus = new TreeMap<String, MutableServiceActivity>();
+ @Override
public synchronized List<ServiceActivity> getServiceActivity()
{
// Need to wrap the values in a new list because
@@ -127,12 +133,14 @@ public class ServiceActivityTrackerImpl implements ServiceActivityScoreboard,
// Does nothing, first pass does not use a worker thread
}
+ @Override
public synchronized void define(ServiceDef serviceDef, Status initialStatus)
{
serviceIdToServiceStatus.put(serviceDef.getServiceId(), new MutableServiceActivity(
serviceDef, perthreadManager, initialStatus));
}
+ @Override
public synchronized void setStatus(String serviceId, Status status)
{
serviceIdToServiceStatus.get(serviceId).setStatus(status);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceAdvisorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceAdvisorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceAdvisorImpl.java
index e371d09..f828cc7 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceAdvisorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceAdvisorImpl.java
@@ -38,6 +38,7 @@ public class ServiceAdvisorImpl extends AbstractMethodInvokingInstrumenter imple
* Invokes the configured method, passing the builder. The method will always take, as a parameter, a
* MethodAdvisor.
*/
+ @Override
public void advise(MethodAdviceReceiver methodAdviceReceiver)
{
Map<Class, Object> resources = CollectionFactory.newMap(this.resourcesDefaults);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBinderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBinderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBinderImpl.java
index b77bb88..e7ec9e1 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBinderImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBinderImpl.java
@@ -147,11 +147,13 @@ public class ServiceBinderImpl implements ServiceBinder, ServiceBindingOptions
return new ObjectCreatorSource()
{
+ @Override
public ObjectCreator constructCreator(ServiceBuilderResources resources)
{
return new ConstructorServiceCreator(resources, getDescription(), constructor);
}
+ @Override
public String getDescription()
{
return String.format("%s via %s", proxyFactory.getConstructorLocation(constructor),
@@ -166,6 +168,7 @@ public class ServiceBinderImpl implements ServiceBinder, ServiceBindingOptions
eagerLoad);
}
+ @Override
@SuppressWarnings("unchecked")
public <T> ServiceBindingOptions bind(Class<T> serviceClass)
{
@@ -195,6 +198,7 @@ public class ServiceBinderImpl implements ServiceBinder, ServiceBindingOptions
return bind(serviceClass, serviceClass);
}
+ @Override
public <T> ServiceBindingOptions bind(Class<T> serviceInterface, final ServiceBuilder<T> builder)
{
assert serviceInterface != null;
@@ -210,10 +214,12 @@ public class ServiceBinderImpl implements ServiceBinder, ServiceBindingOptions
this.source = new ObjectCreatorSource()
{
+ @Override
public ObjectCreator constructCreator(final ServiceBuilderResources resources)
{
return new ObjectCreator()
{
+ @Override
public Object createObject()
{
return builder.buildService(resources);
@@ -221,6 +227,7 @@ public class ServiceBinderImpl implements ServiceBinder, ServiceBindingOptions
};
}
+ @Override
public String getDescription()
{
return proxyFactory.getMethodLocation(bindMethod).toString();
@@ -230,6 +237,7 @@ public class ServiceBinderImpl implements ServiceBinder, ServiceBindingOptions
return this;
}
+ @Override
public <T> ServiceBindingOptions bind(Class<T> serviceInterface, Class<? extends T> serviceImplementation)
{
assert serviceInterface != null;
@@ -270,6 +278,7 @@ public class ServiceBinderImpl implements ServiceBinder, ServiceBindingOptions
return this;
}
+ @Override
public ServiceBindingOptions eagerLoad()
{
lock.check();
@@ -279,6 +288,7 @@ public class ServiceBinderImpl implements ServiceBinder, ServiceBindingOptions
return this;
}
+ @Override
public ServiceBindingOptions preventDecoration()
{
lock.check();
@@ -288,6 +298,7 @@ public class ServiceBinderImpl implements ServiceBinder, ServiceBindingOptions
return this;
}
+ @Override
public ServiceBindingOptions preventReloading()
{
lock.check();
@@ -297,6 +308,7 @@ public class ServiceBinderImpl implements ServiceBinder, ServiceBindingOptions
return this;
}
+ @Override
public ServiceBindingOptions withId(String id)
{
assert InternalUtils.isNonBlank(id);
@@ -307,6 +319,7 @@ public class ServiceBinderImpl implements ServiceBinder, ServiceBindingOptions
return this;
}
+ @Override
public ServiceBindingOptions withSimpleId()
{
if (serviceImplementation == null)
@@ -317,6 +330,7 @@ public class ServiceBinderImpl implements ServiceBinder, ServiceBindingOptions
return withId(serviceImplementation.getSimpleName());
}
+ @Override
public ServiceBindingOptions scope(String scope)
{
assert InternalUtils.isNonBlank(scope);
@@ -327,6 +341,7 @@ public class ServiceBinderImpl implements ServiceBinder, ServiceBindingOptions
return this;
}
+ @Override
public ServiceBindingOptions withMarker(Class<? extends Annotation>... marker)
{
lock.check();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodInvoker.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodInvoker.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodInvoker.java
index 036aaf3..8179b22 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodInvoker.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodInvoker.java
@@ -55,6 +55,7 @@ public class ServiceBuilderMethodInvoker extends AbstractServiceCreator
/**
* Invoked from the proxy to create the actual service implementation.
*/
+ @Override
public Object createObject()
{
Object result = getPlan().createObject();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceDecoratorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceDecoratorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceDecoratorImpl.java
index bee7cb5..c4b6d0c 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceDecoratorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceDecoratorImpl.java
@@ -37,6 +37,7 @@ public class ServiceDecoratorImpl extends AbstractMethodInvokingInstrumenter imp
super(moduleSource, method, resources, proxyFactory);
}
+ @Override
public Object createInterceptor(Object delegate)
{
// Create a copy of the parameters map so that Object.class points to the delegate instance.
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceDefImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceDefImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceDefImpl.java
index 9575f32..7e35746 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceDefImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceDefImpl.java
@@ -84,41 +84,49 @@ public class ServiceDefImpl implements ServiceDef3
return source.getDescription();
}
+ @Override
public ObjectCreator createServiceCreator(ServiceBuilderResources resources)
{
return source.constructCreator(resources);
}
+ @Override
public String getServiceId()
{
return serviceId;
}
+ @Override
public Class getServiceInterface()
{
return serviceInterface;
}
+ @Override
public Class getServiceImplementation()
{
return serviceImplementation;
}
+ @Override
public String getServiceScope()
{
return scope;
}
+ @Override
public boolean isEagerLoad()
{
return eagerLoad;
}
+ @Override
public Set<Class> getMarkers()
{
return markers;
}
+ @Override
public boolean isPreventDecoration()
{
return preventDecoration;
@@ -129,15 +137,18 @@ public class ServiceDefImpl implements ServiceDef3
return F.flow(serviceImplementation, serviceInterface).removeNulls();
}
+ @Override
public AnnotationProvider getClassAnnotationProvider()
{
return AnnotationProviderChain.create(searchPath().map(InternalUtils.CLASS_TO_AP_MAPPER).toList());
}
+ @Override
public AnnotationProvider getMethodAnnotationProvider(final String methodName, final Class... argumentTypes)
{
return AnnotationProviderChain.create(searchPath().map(new Mapper<Class, Method>()
{
+ @Override
public Method map(Class element)
{
return InternalUtils.findMethod(element, methodName, argumentTypes);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceResourcesImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceResourcesImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceResourcesImpl.java
index 8f5aebe..4862896 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceResourcesImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceResourcesImpl.java
@@ -62,32 +62,38 @@ public class ServiceResourcesImpl extends ObjectLocatorImpl implements ServiceBu
this.logger = logger;
}
+ @Override
public String getServiceId()
{
return serviceDef.getServiceId();
}
+ @Override
public Class getServiceInterface()
{
return serviceDef.getServiceInterface();
}
+ @Override
public Class getServiceImplementation()
{
return serviceDef.getServiceImplementation();
}
+ @Override
public Logger getLogger()
{
return logger;
}
+ @Override
public <T> Collection<T> getUnorderedConfiguration(final Class<T> valueType)
{
Collection<T> result = registry.invoke(
"Collecting unordered configuration for service " + serviceDef.getServiceId(),
new Invokable<Collection<T>>()
{
+ @Override
public Collection<T> invoke()
{
return registry.getUnorderedConfiguration(serviceDef, valueType);
@@ -105,11 +111,13 @@ public class ServiceResourcesImpl extends ObjectLocatorImpl implements ServiceBu
logger.debug(IOCMessages.constructedConfiguration(configuration));
}
+ @Override
public <T> List<T> getOrderedConfiguration(final Class<T> valueType)
{
List<T> result = registry.invoke("Collecting ordered configuration for service " + serviceDef.getServiceId(),
new Invokable<List<T>>()
{
+ @Override
public List<T> invoke()
{
return registry.getOrderedConfiguration(serviceDef, valueType);
@@ -121,11 +129,13 @@ public class ServiceResourcesImpl extends ObjectLocatorImpl implements ServiceBu
return result;
}
+ @Override
public <K, V> Map<K, V> getMappedConfiguration(final Class<K> keyType, final Class<V> valueType)
{
Map<K, V> result = registry.invoke("Collecting mapped configuration for service " + serviceDef.getServiceId(),
new Invokable<Map<K, V>>()
{
+ @Override
public Map<K, V> invoke()
{
return registry.getMappedConfiguration(serviceDef, keyType, valueType);
@@ -138,6 +148,7 @@ public class ServiceResourcesImpl extends ObjectLocatorImpl implements ServiceBu
return result;
}
+ @Override
public Object getModuleBuilder()
{
return module.getModuleBuilder();
@@ -150,6 +161,7 @@ public class ServiceResourcesImpl extends ObjectLocatorImpl implements ServiceBu
return registry.invoke(description, new Invokable<T>()
{
+ @Override
public T invoke()
{
Constructor constructor = InternalUtils.findAutobuildConstructor(clazz);
@@ -175,6 +187,7 @@ public class ServiceResourcesImpl extends ObjectLocatorImpl implements ServiceBu
return autobuild("Autobuilding instance of class " + clazz.getName(), clazz);
}
+ @Override
public OperationTracker getTracker()
{
return registry;
@@ -185,11 +198,13 @@ public class ServiceResourcesImpl extends ObjectLocatorImpl implements ServiceBu
return null;
}
+ @Override
public AnnotationProvider getClassAnnotationProvider()
{
return serviceDef.getClassAnnotationProvider();
}
+ @Override
public AnnotationProvider getMethodAnnotationProvider(String methodName, Class... parameterTypes)
{
return serviceDef.getMethodAnnotationProvider(methodName, parameterTypes);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/SingletonServiceLifecycle.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/SingletonServiceLifecycle.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/SingletonServiceLifecycle.java
index 3a838cf..be287d1 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/SingletonServiceLifecycle.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/SingletonServiceLifecycle.java
@@ -24,16 +24,19 @@ import org.apache.tapestry5.ioc.ServiceResources;
*/
public class SingletonServiceLifecycle implements ServiceLifecycle2
{
+ @Override
public Object createService(ServiceResources resources, ObjectCreator creator)
{
return creator.createObject();
}
+ @Override
public boolean isSingleton()
{
return true;
}
+ @Override
public boolean requiresProxy()
{
return false;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/StartupDefImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/StartupDefImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/StartupDefImpl.java
index 82dfa10..c71a581 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/StartupDefImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/StartupDefImpl.java
@@ -38,6 +38,7 @@ public class StartupDefImpl implements StartupDef
this.startupMethod = contributorMethod;
}
+ @Override
public void invoke(final ModuleBuilderSource moduleBuilderSource,
final OperationTracker tracker,
final ObjectLocator locator,
@@ -47,6 +48,7 @@ public class StartupDefImpl implements StartupDef
tracker.run(String.format("Invoking startup method %s.", InternalUtils.asString(startupMethod)),
new Runnable()
{
+ @Override
public void run()
{
Map<Class, Object> resourceMap = CollectionFactory.newMap();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/TypeCoercerProxyImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/TypeCoercerProxyImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/TypeCoercerProxyImpl.java
index 1a21fdc..cb089eb 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/TypeCoercerProxyImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/TypeCoercerProxyImpl.java
@@ -41,6 +41,7 @@ public final class TypeCoercerProxyImpl implements TypeCoercerProxy
return delegate;
}
+ @Override
public <S, T> T coerce(S input, Class<T> targetType)
{
if (targetType.isInstance(input))
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingConfigurationWrapper.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingConfigurationWrapper.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingConfigurationWrapper.java
index c693add..ae83279 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingConfigurationWrapper.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingConfigurationWrapper.java
@@ -44,6 +44,7 @@ public class ValidatingConfigurationWrapper<T> extends AbstractConfigurationImpl
this.expectedType = expectedType;
}
+ @Override
public void add(T object)
{
if (object == null)
@@ -54,6 +55,7 @@ public class ValidatingConfigurationWrapper<T> extends AbstractConfigurationImpl
collection.add(coerced);
}
+ @Override
public void addInstance(Class<? extends T> clazz)
{
add(instantiate(clazz));
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingMappedConfigurationWrapper.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingMappedConfigurationWrapper.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingMappedConfigurationWrapper.java
index d382eff..f88c47c 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingMappedConfigurationWrapper.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingMappedConfigurationWrapper.java
@@ -72,6 +72,7 @@ public class ValidatingMappedConfigurationWrapper<K, V> extends AbstractConfigur
this.keyToContributor = keyToContributor;
}
+ @Override
public void add(K key, V value)
{
validateKey(key);
@@ -107,11 +108,13 @@ public class ValidatingMappedConfigurationWrapper<K, V> extends AbstractConfigur
expectedKeyType));
}
+ @Override
public void addInstance(K key, Class<? extends V> clazz)
{
add(key, instantiate(clazz));
}
+ @Override
public void override(K key, V value)
{
validateKey(key);
@@ -127,6 +130,7 @@ public class ValidatingMappedConfigurationWrapper<K, V> extends AbstractConfigur
overrides.put(key, new MappedConfigurationOverride<K, V>(contributionDef, map, key, coerced));
}
+ @Override
public void overrideInstance(K key, Class<? extends V> clazz)
{
override(key, instantiate(clazz));
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingOrderedConfigurationWrapper.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingOrderedConfigurationWrapper.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingOrderedConfigurationWrapper.java
index 7b9ea3c..d07be6b 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingOrderedConfigurationWrapper.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingOrderedConfigurationWrapper.java
@@ -57,6 +57,7 @@ public class ValidatingOrderedConfigurationWrapper<T> extends AbstractConfigurat
this.expectedType = expectedType;
}
+ @Override
public void add(String id, T object, String... constraints)
{
T coerced = object == null ? null : typeCoercer.coerce(object, expectedType);
@@ -75,6 +76,7 @@ public class ValidatingOrderedConfigurationWrapper<T> extends AbstractConfigurat
priorId = id;
}
+ @Override
public void override(String id, T object, String... constraints)
{
assert InternalUtils.isNonBlank(id);
@@ -90,11 +92,13 @@ public class ValidatingOrderedConfigurationWrapper<T> extends AbstractConfigurat
overrides.put(id, new OrderedConfigurationOverride<T>(orderer, id, coerced, constraints, contribDef));
}
+ @Override
public void addInstance(String id, Class<? extends T> clazz, String... constraints)
{
add(id, instantiate(clazz), constraints);
}
+ @Override
public void overrideInstance(String id, Class<? extends T> clazz, String... constraints)
{
override(id, instantiate(clazz), constraints);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AbtractAspectInterceptorBuilder.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AbtractAspectInterceptorBuilder.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AbtractAspectInterceptorBuilder.java
index 4662511..4fd68c2 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AbtractAspectInterceptorBuilder.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AbtractAspectInterceptorBuilder.java
@@ -30,16 +30,19 @@ public abstract class AbtractAspectInterceptorBuilder<T> implements AspectInterc
this.annotationAccess = annotationAccess;
}
+ @Override
public AnnotationProvider getClassAnnotationProvider()
{
return annotationAccess.getClassAnnotationProvider();
}
+ @Override
public AnnotationProvider getMethodAnnotationProvider(String methodName, Class... parameterTypes)
{
return annotationAccess.getMethodAnnotationProvider(methodName, parameterTypes);
}
+ @Override
public <T extends Annotation> T getMethodAnnotation(Method method, Class<T> annotationType)
{
return getMethodAnnotationProvider(method.getName(), method.getParameterTypes()).getAnnotation(annotationType);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AccessableObjectAnnotationProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AccessableObjectAnnotationProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AccessableObjectAnnotationProvider.java
index ea34e2a..2acfd0d 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AccessableObjectAnnotationProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AccessableObjectAnnotationProvider.java
@@ -32,6 +32,7 @@ public class AccessableObjectAnnotationProvider implements AnnotationProvider
this.object = object;
}
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationClass)
{
return object.getAnnotation(annotationClass);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AnnotationProviderChain.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AnnotationProviderChain.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AnnotationProviderChain.java
index 7e40327..49b0b15 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AnnotationProviderChain.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AnnotationProviderChain.java
@@ -44,6 +44,7 @@ public class AnnotationProviderChain implements AnnotationProvider
return new AnnotationProviderChain(providers.toArray(new AnnotationProvider[providers.size()]));
}
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationClass)
{
for (AnnotationProvider p : providers)