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:26:58 UTC
[1/7] Required Java version is now 1.6,
this applies to building as well as to using Tapestry
Repository: tapestry-5
Updated Branches:
refs/heads/master 5f8deb1fc -> b553edf0c
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/SpringModuleDef.java
----------------------------------------------------------------------
diff --git a/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/SpringModuleDef.java b/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/SpringModuleDef.java
index 6c4c0c4..efd706c 100644
--- a/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/SpringModuleDef.java
+++ b/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/SpringModuleDef.java
@@ -109,6 +109,7 @@ public class SpringModuleDef implements ModuleDef
ServiceDef applicationContextServiceDef = new ServiceDef()
{
+ @Override
public ObjectCreator createServiceCreator(final ServiceBuilderResources resources)
{
if (compatibilityMode)
@@ -121,27 +122,32 @@ public class SpringModuleDef implements ModuleDef
return constructObjectCreatorForApplicationContext(resources, customizer);
}
+ @Override
public String getServiceId()
{
return SERVICE_ID;
}
+ @Override
public Set<Class> getMarkers()
{
return Collections.emptySet();
}
+ @Override
public Class getServiceInterface()
{
return compatibilityMode ? externalContext.getClass()
: ConfigurableWebApplicationContext.class;
}
+ @Override
public String getServiceScope()
{
return ScopeConstants.DEFAULT;
}
+ @Override
public boolean isEagerLoad()
{
return false;
@@ -169,6 +175,7 @@ public class SpringModuleDef implements ModuleDef
final Runnable shutdownListener = new Runnable()
{
+ @Override
public void run()
{
loader.closeWebApplicationContext(servletContext);
@@ -179,12 +186,14 @@ public class SpringModuleDef implements ModuleDef
return new ObjectCreator()
{
+ @Override
public Object createObject()
{
return resources.getTracker().invoke(
"Creating Spring ApplicationContext via ContextLoader",
new Invokable<Object>()
{
+ @Override
public Object invoke()
{
resources.getLogger().info(
@@ -211,6 +220,7 @@ public class SpringModuleDef implements ModuleDef
};
}
+ @Override
public Class getBuilderClass()
{
return null;
@@ -221,6 +231,7 @@ public class SpringModuleDef implements ModuleDef
* after the built-in
* contributions.
*/
+ @Override
public Set<ContributionDef> getContributionDefs()
{
ContributionDef def = createContributionToMasterObjectProvider();
@@ -233,6 +244,7 @@ public class SpringModuleDef implements ModuleDef
ContributionDef def = new AbstractContributionDef()
{
+ @Override
public String getServiceId()
{
return "MasterObjectProvider";
@@ -249,6 +261,7 @@ public class SpringModuleDef implements ModuleDef
final ObjectProvider springBeanProvider = new ObjectProvider()
{
+ @Override
public <T> T provide(Class<T> objectType,
AnnotationProvider annotationProvider, ObjectLocator locator)
{
@@ -281,6 +294,7 @@ public class SpringModuleDef implements ModuleDef
final ObjectProvider springBeanProviderInvoker = new ObjectProvider()
{
+ @Override
public <T> T provide(final Class<T> objectType,
final AnnotationProvider annotationProvider, final ObjectLocator locator)
{
@@ -288,6 +302,7 @@ public class SpringModuleDef implements ModuleDef
"Resolving dependency by searching Spring ApplicationContext",
new Invokable<T>()
{
+ @Override
public T invoke()
{
return springBeanProvider.provide(objectType,
@@ -299,6 +314,7 @@ public class SpringModuleDef implements ModuleDef
ObjectProvider outerCheck = new ObjectProvider()
{
+ @Override
public <T> T provide(Class<T> objectType,
AnnotationProvider annotationProvider, ObjectLocator locator)
{
@@ -325,21 +341,25 @@ public class SpringModuleDef implements ModuleDef
/**
* Returns an empty set.
*/
+ @Override
public Set<DecoratorDef> getDecoratorDefs()
{
return Collections.emptySet();
}
+ @Override
public String getLoggerName()
{
return SpringModuleDef.class.getName();
}
+ @Override
public ServiceDef getServiceDef(String serviceId)
{
return services.get(serviceId);
}
+ @Override
public Set<String> getServiceIds()
{
return services.keySet();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/StaticObjectCreator.java
----------------------------------------------------------------------
diff --git a/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/StaticObjectCreator.java b/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/StaticObjectCreator.java
index 0177b2f..5699fc9 100644
--- a/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/StaticObjectCreator.java
+++ b/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/StaticObjectCreator.java
@@ -32,6 +32,7 @@ public class StaticObjectCreator implements ObjectCreator
this.description = description;
}
+ @Override
public Object createObject()
{
return object;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/TapestryBeanFactory.java
----------------------------------------------------------------------
diff --git a/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/TapestryBeanFactory.java b/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/TapestryBeanFactory.java
index fa2faf7..2b43d86 100644
--- a/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/TapestryBeanFactory.java
+++ b/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/TapestryBeanFactory.java
@@ -57,6 +57,7 @@ public class TapestryBeanFactory extends DefaultListableBeanFactory
{
AnnotationProvider provider = new AnnotationProvider()
{
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationClass)
{
for (Object a : annotations)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-spring/src/main/java/org/apache/tapestry5/spring/modules/SpringModule.java
----------------------------------------------------------------------
diff --git a/tapestry-spring/src/main/java/org/apache/tapestry5/spring/modules/SpringModule.java b/tapestry-spring/src/main/java/org/apache/tapestry5/spring/modules/SpringModule.java
index e26fb7f..19b82ab 100644
--- a/tapestry-spring/src/main/java/org/apache/tapestry5/spring/modules/SpringModule.java
+++ b/tapestry-spring/src/main/java/org/apache/tapestry5/spring/modules/SpringModule.java
@@ -58,6 +58,7 @@ public class SpringModule
{
ApplicationInitializerFilter filter = new ApplicationInitializerFilter()
{
+ @Override
public void initializeApplication(Context context, ApplicationInitializer initializer)
{
logger.info(String.format("Spring version %s with %,d defined beans.",
@@ -99,6 +100,7 @@ public class SpringModule
ApplicationContextCustomizer beanFactoryPostProcessorCustomizer = new ApplicationContextCustomizer()
{
+ @Override
public void customizeApplicationContext(ServletContext servletContext,
ConfigurableWebApplicationContext applicationContext)
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-spring/src/test/java/org/example/testapp/services/AppModule.java
----------------------------------------------------------------------
diff --git a/tapestry-spring/src/test/java/org/example/testapp/services/AppModule.java b/tapestry-spring/src/test/java/org/example/testapp/services/AppModule.java
index 5000527..a10f8b4 100644
--- a/tapestry-spring/src/test/java/org/example/testapp/services/AppModule.java
+++ b/tapestry-spring/src/test/java/org/example/testapp/services/AppModule.java
@@ -41,6 +41,7 @@ public class AppModule
{
configuration.add("WasInvoked", new ApplicationContextCustomizer()
{
+ @Override
public void customizeApplicationContext(ServletContext servletContext,
ConfigurableWebApplicationContext applicationContext)
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-spring/src/test/java/org/example/testapp/services/FlintstoneImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-spring/src/test/java/org/example/testapp/services/FlintstoneImpl.java b/tapestry-spring/src/test/java/org/example/testapp/services/FlintstoneImpl.java
index ed7b61c..9321afa 100644
--- a/tapestry-spring/src/test/java/org/example/testapp/services/FlintstoneImpl.java
+++ b/tapestry-spring/src/test/java/org/example/testapp/services/FlintstoneImpl.java
@@ -16,6 +16,7 @@ package org.example.testapp.services;
public class FlintstoneImpl implements Flintstone
{
+ @Override
public void bam()
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-spring/src/test/java/org/example/testapp/services/SpringStatusProviderFactory.java
----------------------------------------------------------------------
diff --git a/tapestry-spring/src/test/java/org/example/testapp/services/SpringStatusProviderFactory.java b/tapestry-spring/src/test/java/org/example/testapp/services/SpringStatusProviderFactory.java
index 5413168..631ec1e 100644
--- a/tapestry-spring/src/test/java/org/example/testapp/services/SpringStatusProviderFactory.java
+++ b/tapestry-spring/src/test/java/org/example/testapp/services/SpringStatusProviderFactory.java
@@ -18,16 +18,19 @@ import org.springframework.beans.factory.FactoryBean;
public class SpringStatusProviderFactory implements FactoryBean
{
+ @Override
public Object getObject() throws Exception
{
return null;
}
+ @Override
public Class getObjectType()
{
return null;
}
+ @Override
public boolean isSingleton()
{
return false;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-spring/src/test/java/org/example/testapp/services/UpcaseImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-spring/src/test/java/org/example/testapp/services/UpcaseImpl.java b/tapestry-spring/src/test/java/org/example/testapp/services/UpcaseImpl.java
index d0242d6..21ab171 100644
--- a/tapestry-spring/src/test/java/org/example/testapp/services/UpcaseImpl.java
+++ b/tapestry-spring/src/test/java/org/example/testapp/services/UpcaseImpl.java
@@ -27,6 +27,7 @@ public class UpcaseImpl implements Upcase
this.transformer = transformer;
}
+ @Override
public String toUpperCase(String input)
{
return transformer.transform(input);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-spring/src/test/java/org/example/testapp/services/UpcaseStringTransformerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-spring/src/test/java/org/example/testapp/services/UpcaseStringTransformerImpl.java b/tapestry-spring/src/test/java/org/example/testapp/services/UpcaseStringTransformerImpl.java
index feba202..3e3fe0c 100644
--- a/tapestry-spring/src/test/java/org/example/testapp/services/UpcaseStringTransformerImpl.java
+++ b/tapestry-spring/src/test/java/org/example/testapp/services/UpcaseStringTransformerImpl.java
@@ -16,6 +16,7 @@ package org.example.testapp.services;
public class UpcaseStringTransformerImpl implements StringTransformer
{
+ @Override
public String transform(String input)
{
return input.toUpperCase();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-spring/src/test/java/org/example/testapp/services/ViaFactoryFactory.java
----------------------------------------------------------------------
diff --git a/tapestry-spring/src/test/java/org/example/testapp/services/ViaFactoryFactory.java b/tapestry-spring/src/test/java/org/example/testapp/services/ViaFactoryFactory.java
index f0507c5..9d03f46 100644
--- a/tapestry-spring/src/test/java/org/example/testapp/services/ViaFactoryFactory.java
+++ b/tapestry-spring/src/test/java/org/example/testapp/services/ViaFactoryFactory.java
@@ -18,10 +18,12 @@ import org.springframework.beans.factory.FactoryBean;
public class ViaFactoryFactory implements FactoryBean
{
+ @Override
public Object getObject() throws Exception
{
return new ViaFactory()
{
+ @Override
public String getMessage()
{
return "Instantiated via a factory bean.";
@@ -29,11 +31,13 @@ public class ViaFactoryFactory implements FactoryBean
};
}
+ @Override
public Class getObjectType()
{
return ViaFactory.class;
}
+ @Override
public boolean isSingleton()
{
return true;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReporterImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReporterImpl.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReporterImpl.java
index fe75289..ef44a61 100644
--- a/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReporterImpl.java
+++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReporterImpl.java
@@ -66,6 +66,7 @@ public class ErrorReporterImpl implements ErrorReporter
}
+ @Override
public void writeErrorReport(String reportText)
{
String htmlSource = commandProcessor.getString("getHtmlSource", new String[]
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReportingCommandProcessor.java
----------------------------------------------------------------------
diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReportingCommandProcessor.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReportingCommandProcessor.java
index b2749e0..af3e7b8 100644
--- a/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReportingCommandProcessor.java
+++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReportingCommandProcessor.java
@@ -83,6 +83,7 @@ public class ErrorReportingCommandProcessor implements CommandProcessor
errorReporter.writeErrorReport(report);
}
+ @Override
public String doCommand(String command, String[] args)
{
try
@@ -95,6 +96,7 @@ public class ErrorReportingCommandProcessor implements CommandProcessor
}
}
+ @Override
public boolean getBoolean(String string, String[] strings)
{
try
@@ -107,6 +109,7 @@ public class ErrorReportingCommandProcessor implements CommandProcessor
}
}
+ @Override
public boolean[] getBooleanArray(String string, String[] strings)
{
try
@@ -119,6 +122,7 @@ public class ErrorReportingCommandProcessor implements CommandProcessor
}
}
+ @Override
public Number getNumber(String string, String[] strings)
{
try
@@ -131,6 +135,7 @@ public class ErrorReportingCommandProcessor implements CommandProcessor
}
}
+ @Override
public Number[] getNumberArray(String string, String[] strings)
{
try
@@ -143,6 +148,7 @@ public class ErrorReportingCommandProcessor implements CommandProcessor
}
}
+ @Override
public String getString(String string, String[] strings)
{
try
@@ -155,6 +161,7 @@ public class ErrorReportingCommandProcessor implements CommandProcessor
}
}
+ @Override
public String[] getStringArray(String string, String[] strings)
{
try
@@ -167,11 +174,13 @@ public class ErrorReportingCommandProcessor implements CommandProcessor
}
}
+ @Override
public void start()
{
delegate.start();
}
+ @Override
public void stop()
{
delegate.stop();
@@ -180,6 +189,7 @@ public class ErrorReportingCommandProcessor implements CommandProcessor
/**
* @since 5.1.0.0
*/
+ @Override
public String getRemoteControlServerLocation()
{
return delegate.getRemoteControlServerLocation();
@@ -188,6 +198,7 @@ public class ErrorReportingCommandProcessor implements CommandProcessor
/**
* @since 5.1.0.0
*/
+ @Override
public void setExtensionJs(String extensionJs)
{
delegate.setExtensionJs(extensionJs);
@@ -196,6 +207,7 @@ public class ErrorReportingCommandProcessor implements CommandProcessor
/**
* @since 5.1.0.0
*/
+ @Override
public void start(String optionsString)
{
delegate.start(optionsString);
@@ -204,6 +216,7 @@ public class ErrorReportingCommandProcessor implements CommandProcessor
/**
* @since 5.1.0.0
*/
+ @Override
public void start(Object optionsObject)
{
delegate.start(optionsObject);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
----------------------------------------------------------------------
diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
index 5369406..b0b2020 100644
--- a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
+++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
@@ -222,6 +222,7 @@ public abstract class SeleniumTestCase extends Assert implements Selenium
testContext.setAttribute(TapestryTestConstants.SHUTDOWN_ATTRIBUTE, new Runnable()
{
+ @Override
public void run()
{
try
@@ -333,6 +334,7 @@ public abstract class SeleniumTestCase extends Assert implements Selenium
return new Runnable()
{
+ @Override
public void run()
{
runner.stop();
@@ -421,751 +423,901 @@ public abstract class SeleniumTestCase extends Assert implements Selenium
// refactoring.
// ---------------------------------------------------------------------
+ @Override
public void addCustomRequestHeader(String key, String value)
{
selenium.addCustomRequestHeader(key, value);
}
+ @Override
public void addLocationStrategy(String strategyName, String functionDefinition)
{
selenium.addLocationStrategy(strategyName, functionDefinition);
}
+ @Override
public void addScript(String scriptContent, String scriptTagId)
{
selenium.addScript(scriptContent, scriptTagId);
}
+ @Override
public void addSelection(String locator, String optionLocator)
{
selenium.addSelection(locator, optionLocator);
}
+ @Override
public void allowNativeXpath(String allow)
{
selenium.allowNativeXpath(allow);
}
+ @Override
public void altKeyDown()
{
selenium.altKeyDown();
}
+ @Override
public void altKeyUp()
{
selenium.altKeyUp();
}
+ @Override
public void answerOnNextPrompt(String answer)
{
selenium.answerOnNextPrompt(answer);
}
+ @Override
public void assignId(String locator, String identifier)
{
selenium.assignId(locator, identifier);
}
+ @Override
public void attachFile(String fieldLocator, String fileLocator)
{
selenium.attachFile(fieldLocator, fileLocator);
}
+ @Override
public void captureEntirePageScreenshot(String filename, String kwargs)
{
selenium.captureEntirePageScreenshot(filename, kwargs);
}
+ @Override
public String captureEntirePageScreenshotToString(String kwargs)
{
return selenium.captureEntirePageScreenshotToString(kwargs);
}
+ @Override
public String captureNetworkTraffic(String type)
{
return selenium.captureNetworkTraffic(type);
}
+ @Override
public void captureScreenshot(String filename)
{
selenium.captureScreenshot(filename);
}
+ @Override
public String captureScreenshotToString()
{
return selenium.captureScreenshotToString();
}
+ @Override
public void check(String locator)
{
selenium.check(locator);
}
+ @Override
public void chooseCancelOnNextConfirmation()
{
selenium.chooseCancelOnNextConfirmation();
}
+ @Override
public void chooseOkOnNextConfirmation()
{
selenium.chooseOkOnNextConfirmation();
}
+ @Override
public void click(String locator)
{
selenium.click(locator);
}
+ @Override
public void clickAt(String locator, String coordString)
{
selenium.clickAt(locator, coordString);
}
+ @Override
public void close()
{
selenium.close();
}
+ @Override
public void contextMenu(String locator)
{
selenium.contextMenu(locator);
}
+ @Override
public void contextMenuAt(String locator, String coordString)
{
selenium.contextMenuAt(locator, coordString);
}
+ @Override
public void controlKeyDown()
{
selenium.controlKeyDown();
}
+ @Override
public void controlKeyUp()
{
selenium.controlKeyUp();
}
+ @Override
public void createCookie(String nameValuePair, String optionsString)
{
selenium.createCookie(nameValuePair, optionsString);
}
+ @Override
public void deleteAllVisibleCookies()
{
selenium.deleteAllVisibleCookies();
}
+ @Override
public void deleteCookie(String name, String optionsString)
{
selenium.deleteCookie(name, optionsString);
}
+ @Override
public void deselectPopUp()
{
selenium.deselectPopUp();
}
+ @Override
public void doubleClick(String locator)
{
selenium.doubleClick(locator);
}
+ @Override
public void doubleClickAt(String locator, String coordString)
{
selenium.doubleClickAt(locator, coordString);
}
+ @Override
public void dragAndDrop(String locator, String movementsString)
{
selenium.dragAndDrop(locator, movementsString);
}
+ @Override
public void dragAndDropToObject(String locatorOfObjectToBeDragged, String locatorOfDragDestinationObject)
{
selenium.dragAndDropToObject(locatorOfObjectToBeDragged, locatorOfDragDestinationObject);
}
+ @Override
public void dragdrop(String locator, String movementsString)
{
selenium.dragdrop(locator, movementsString);
}
+ @Override
public void fireEvent(String locator, String eventName)
{
selenium.fireEvent(locator, eventName);
}
+ @Override
public void focus(String locator)
{
selenium.focus(locator);
}
+ @Override
public String getAlert()
{
return selenium.getAlert();
}
+ @Override
public String[] getAllButtons()
{
return selenium.getAllButtons();
}
+ @Override
public String[] getAllFields()
{
return selenium.getAllFields();
}
+ @Override
public String[] getAllLinks()
{
return selenium.getAllLinks();
}
+ @Override
public String[] getAllWindowIds()
{
return selenium.getAllWindowIds();
}
+ @Override
public String[] getAllWindowNames()
{
return selenium.getAllWindowNames();
}
+ @Override
public String[] getAllWindowTitles()
{
return selenium.getAllWindowTitles();
}
+ @Override
public String getAttribute(String attributeLocator)
{
return selenium.getAttribute(attributeLocator);
}
+ @Override
public String[] getAttributeFromAllWindows(String attributeName)
{
return selenium.getAttributeFromAllWindows(attributeName);
}
+ @Override
public String getBodyText()
{
return selenium.getBodyText();
}
+ @Override
public String getConfirmation()
{
return selenium.getConfirmation();
}
+ @Override
public String getCookie()
{
return selenium.getCookie();
}
+ @Override
public String getCookieByName(String name)
{
return selenium.getCookieByName(name);
}
+ @Override
public Number getCursorPosition(String locator)
{
return selenium.getCursorPosition(locator);
}
+ @Override
public Number getElementHeight(String locator)
{
return selenium.getElementHeight(locator);
}
+ @Override
public Number getElementIndex(String locator)
{
return selenium.getElementIndex(locator);
}
+ @Override
public Number getElementPositionLeft(String locator)
{
return selenium.getElementPositionLeft(locator);
}
+ @Override
public Number getElementPositionTop(String locator)
{
return selenium.getElementPositionTop(locator);
}
+ @Override
public Number getElementWidth(String locator)
{
return selenium.getElementWidth(locator);
}
+ @Override
public String getEval(String script)
{
return selenium.getEval(script);
}
+ @Override
public String getExpression(String expression)
{
return selenium.getExpression(expression);
}
+ @Override
public String getHtmlSource()
{
return selenium.getHtmlSource();
}
+ @Override
public String getLocation()
{
return selenium.getLocation();
}
+ @Override
public String getLog()
{
return selenium.getLog();
}
+ @Override
public Number getMouseSpeed()
{
return selenium.getMouseSpeed();
}
+ @Override
public String getPrompt()
{
return selenium.getPrompt();
}
+ @Override
public String getSelectedId(String selectLocator)
{
return selenium.getSelectedId(selectLocator);
}
+ @Override
public String[] getSelectedIds(String selectLocator)
{
return selenium.getSelectedIds(selectLocator);
}
+ @Override
public String getSelectedIndex(String selectLocator)
{
return selenium.getSelectedIndex(selectLocator);
}
+ @Override
public String[] getSelectedIndexes(String selectLocator)
{
return selenium.getSelectedIndexes(selectLocator);
}
+ @Override
public String getSelectedLabel(String selectLocator)
{
return selenium.getSelectedLabel(selectLocator);
}
+ @Override
public String[] getSelectedLabels(String selectLocator)
{
return selenium.getSelectedLabels(selectLocator);
}
+ @Override
public String getSelectedValue(String selectLocator)
{
return selenium.getSelectedValue(selectLocator);
}
+ @Override
public String[] getSelectedValues(String selectLocator)
{
return selenium.getSelectedValues(selectLocator);
}
+ @Override
public String[] getSelectOptions(String selectLocator)
{
return selenium.getSelectOptions(selectLocator);
}
+ @Override
public String getSpeed()
{
return selenium.getSpeed();
}
+ @Override
public String getTable(String tableCellAddress)
{
return selenium.getTable(tableCellAddress);
}
+ @Override
public String getText(String locator)
{
return selenium.getText(locator);
}
+ @Override
public String getTitle()
{
return selenium.getTitle();
}
+ @Override
public String getValue(String locator)
{
return selenium.getValue(locator);
}
+ @Override
public boolean getWhetherThisFrameMatchFrameExpression(String currentFrameString, String target)
{
return selenium.getWhetherThisFrameMatchFrameExpression(currentFrameString, target);
}
+ @Override
public boolean getWhetherThisWindowMatchWindowExpression(String currentWindowString, String target)
{
return selenium.getWhetherThisWindowMatchWindowExpression(currentWindowString, target);
}
+ @Override
public Number getXpathCount(String xpath)
{
return selenium.getXpathCount(xpath);
}
+ @Override
public void goBack()
{
selenium.goBack();
}
+ @Override
public void highlight(String locator)
{
selenium.highlight(locator);
}
+ @Override
public void ignoreAttributesWithoutValue(String ignore)
{
selenium.ignoreAttributesWithoutValue(ignore);
}
+ @Override
public boolean isAlertPresent()
{
return selenium.isAlertPresent();
}
+ @Override
public boolean isChecked(String locator)
{
return selenium.isChecked(locator);
}
+ @Override
public boolean isConfirmationPresent()
{
return selenium.isConfirmationPresent();
}
+ @Override
public boolean isCookiePresent(String name)
{
return selenium.isCookiePresent(name);
}
+ @Override
public boolean isEditable(String locator)
{
return selenium.isEditable(locator);
}
+ @Override
public boolean isElementPresent(String locator)
{
return selenium.isElementPresent(locator);
}
+ @Override
public boolean isOrdered(String locator1, String locator2)
{
return selenium.isOrdered(locator1, locator2);
}
+ @Override
public boolean isPromptPresent()
{
return selenium.isPromptPresent();
}
+ @Override
public boolean isSomethingSelected(String selectLocator)
{
return selenium.isSomethingSelected(selectLocator);
}
+ @Override
public boolean isTextPresent(String pattern)
{
return selenium.isTextPresent(pattern);
}
+ @Override
public boolean isVisible(String locator)
{
return selenium.isVisible(locator);
}
+ @Override
public void keyDown(String locator, String keySequence)
{
selenium.keyDown(locator, keySequence);
}
+ @Override
public void keyDownNative(String keycode)
{
selenium.keyDownNative(keycode);
}
+ @Override
public void keyPress(String locator, String keySequence)
{
selenium.keyPress(locator, keySequence);
}
+ @Override
public void keyPressNative(String keycode)
{
selenium.keyPressNative(keycode);
}
+ @Override
public void keyUp(String locator, String keySequence)
{
selenium.keyUp(locator, keySequence);
}
+ @Override
public void keyUpNative(String keycode)
{
selenium.keyUpNative(keycode);
}
+ @Override
public void metaKeyDown()
{
selenium.metaKeyDown();
}
+ @Override
public void metaKeyUp()
{
selenium.metaKeyUp();
}
+ @Override
public void mouseDown(String locator)
{
selenium.mouseDown(locator);
}
+ @Override
public void mouseDownAt(String locator, String coordString)
{
selenium.mouseDownAt(locator, coordString);
}
+ @Override
public void mouseDownRight(String locator)
{
selenium.mouseDownRight(locator);
}
+ @Override
public void mouseDownRightAt(String locator, String coordString)
{
selenium.mouseDownRightAt(locator, coordString);
}
+ @Override
public void mouseMove(String locator)
{
selenium.mouseMove(locator);
}
+ @Override
public void mouseMoveAt(String locator, String coordString)
{
selenium.mouseMoveAt(locator, coordString);
}
+ @Override
public void mouseOut(String locator)
{
selenium.mouseOut(locator);
}
+ @Override
public void mouseOver(String locator)
{
selenium.mouseOver(locator);
}
+ @Override
public void mouseUp(String locator)
{
selenium.mouseUp(locator);
}
+ @Override
public void mouseUpAt(String locator, String coordString)
{
selenium.mouseUpAt(locator, coordString);
}
+ @Override
public void mouseUpRight(String locator)
{
selenium.mouseUpRight(locator);
}
+ @Override
public void mouseUpRightAt(String locator, String coordString)
{
selenium.mouseUpRightAt(locator, coordString);
}
+ @Override
public void open(String url)
{
selenium.open(url);
}
+ @Override
public void open(String url, String ignoreResponseCode)
{
selenium.open(url, ignoreResponseCode);
}
+ @Override
public void openWindow(String url, String windowID)
{
selenium.openWindow(url, windowID);
}
+ @Override
public void refresh()
{
selenium.refresh();
}
+ @Override
public void removeAllSelections(String locator)
{
selenium.removeAllSelections(locator);
}
+ @Override
public void removeScript(String scriptTagId)
{
selenium.removeScript(scriptTagId);
}
+ @Override
public void removeSelection(String locator, String optionLocator)
{
selenium.removeSelection(locator, optionLocator);
}
+ @Override
public String retrieveLastRemoteControlLogs()
{
return selenium.retrieveLastRemoteControlLogs();
}
+ @Override
public void rollup(String rollupName, String kwargs)
{
selenium.rollup(rollupName, kwargs);
}
+ @Override
public void runScript(String script)
{
selenium.runScript(script);
}
+ @Override
public void select(String selectLocator, String optionLocator)
{
selenium.select(selectLocator, optionLocator);
}
+ @Override
public void selectFrame(String locator)
{
selenium.selectFrame(locator);
}
+ @Override
public void selectPopUp(String windowID)
{
selenium.selectPopUp(windowID);
}
+ @Override
public void selectWindow(String windowID)
{
selenium.selectWindow(windowID);
}
+ @Override
public void setBrowserLogLevel(String logLevel)
{
selenium.setBrowserLogLevel(logLevel);
}
+ @Override
public void setContext(String context)
{
selenium.setContext(context);
}
+ @Override
public void setCursorPosition(String locator, String position)
{
selenium.setCursorPosition(locator, position);
}
+ @Override
public void setExtensionJs(String extensionJs)
{
selenium.setExtensionJs(extensionJs);
}
+ @Override
public void setMouseSpeed(String pixels)
{
selenium.setMouseSpeed(pixels);
}
+ @Override
public void setSpeed(String value)
{
selenium.setSpeed(value);
}
+ @Override
public void setTimeout(String timeout)
{
selenium.setTimeout(timeout);
}
+ @Override
public void shiftKeyDown()
{
selenium.shiftKeyDown();
}
+ @Override
public void shiftKeyUp()
{
selenium.shiftKeyUp();
}
+ @Override
public void showContextualBanner()
{
selenium.showContextualBanner();
}
+ @Override
public void showContextualBanner(String className, String methodName)
{
selenium.showContextualBanner(className, methodName);
}
+ @Override
public void shutDownSeleniumServer()
{
selenium.shutDownSeleniumServer();
}
+ @Override
public void start()
{
selenium.start();
}
+ @Override
public void start(Object optionsObject)
{
selenium.start(optionsObject);
}
+ @Override
public void start(String optionsString)
{
selenium.start(optionsString);
}
+ @Override
public void stop()
{
selenium.stop();
}
+ @Override
public void submit(String formLocator)
{
selenium.submit(formLocator);
}
+ @Override
public void type(String locator, String value)
{
selenium.type(locator, value);
}
+ @Override
public void typeKeys(String locator, String value)
{
selenium.typeKeys(locator, value);
}
+ @Override
public void uncheck(String locator)
{
selenium.uncheck(locator);
}
+ @Override
public void useXpathLibrary(String libraryName)
{
selenium.useXpathLibrary(libraryName);
}
+ @Override
public void waitForCondition(String script, String timeout)
{
selenium.waitForCondition(script, timeout);
}
+ @Override
public void waitForFrameToLoad(String frameAddress, String timeout)
{
selenium.waitForFrameToLoad(frameAddress, timeout);
@@ -1176,6 +1328,7 @@ public abstract class SeleniumTestCase extends Assert implements Selenium
* being set to true on the body element. Polls at increasing intervals, for up-to 30 seconds (that's extraordinarily long, but helps sometimes
* when manually debugging a page that doesn't have the floating console enabled)..
*/
+ @Override
public void waitForPageToLoad(String timeout)
{
selenium.waitForPageToLoad(timeout);
@@ -1211,16 +1364,19 @@ public abstract class SeleniumTestCase extends Assert implements Selenium
}
}
+ @Override
public void waitForPopUp(String windowID, String timeout)
{
selenium.waitForPopUp(windowID, timeout);
}
+ @Override
public void windowFocus()
{
selenium.windowFocus();
}
+ @Override
public void windowMaximize()
{
selenium.windowMaximize();
@@ -1600,6 +1756,7 @@ public abstract class SeleniumTestCase extends Assert implements Selenium
reportAndThrowAssertionError("Body 'data-ajax-active' attribute never reverted to 'false'.");
}
+ @Override
public Number getCssCount(String str)
{
return selenium.getCssCount(str);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-test/src/test/java/org/apache/tapestry5/test/integration/SanityCheckTestSuite.java
----------------------------------------------------------------------
diff --git a/tapestry-test/src/test/java/org/apache/tapestry5/test/integration/SanityCheckTestSuite.java b/tapestry-test/src/test/java/org/apache/tapestry5/test/integration/SanityCheckTestSuite.java
index 6c4365f..d4dd3a3 100644
--- a/tapestry-test/src/test/java/org/apache/tapestry5/test/integration/SanityCheckTestSuite.java
+++ b/tapestry-test/src/test/java/org/apache/tapestry5/test/integration/SanityCheckTestSuite.java
@@ -53,6 +53,7 @@ public class SanityCheckTestSuite extends SeleniumTestCase
assertNotNull(context.getAttribute(TapestryTestConstants.COMMAND_PROCESSOR_ATTRIBUTE));
}
+ @Override
public Number getCssCount(String str) {
return selenium.getCssCount(str);
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/MultipartDecoderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/MultipartDecoderImpl.java b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/MultipartDecoderImpl.java
index 95ea295..8a9f399 100755
--- a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/MultipartDecoderImpl.java
+++ b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/MultipartDecoderImpl.java
@@ -68,11 +68,13 @@ public class MultipartDecoderImpl implements MultipartDecoder, ThreadCleanupList
this.requestEncoding = requestEncoding;
}
+ @Override
public UploadedFile getFileUpload(String parameterName)
{
return uploads.get(parameterName);
}
+ @Override
public HttpServletRequest decode(HttpServletRequest request)
{
try
@@ -88,6 +90,7 @@ public class MultipartDecoderImpl implements MultipartDecoder, ThreadCleanupList
return processFileItems(request, fileItems);
}
+ @Override
public void threadDidCleanup()
{
for (UploadedFileItem uploaded : uploads.values())
@@ -169,6 +172,7 @@ public class MultipartDecoderImpl implements MultipartDecoder, ThreadCleanupList
uploads.put(name, file);
}
+ @Override
public FileUploadException getUploadException()
{
return uploadException;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/MultipartServletRequestFilter.java
----------------------------------------------------------------------
diff --git a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/MultipartServletRequestFilter.java b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/MultipartServletRequestFilter.java
index 3b3e402..59e85e4 100755
--- a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/MultipartServletRequestFilter.java
+++ b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/MultipartServletRequestFilter.java
@@ -35,6 +35,7 @@ public class MultipartServletRequestFilter implements HttpServletRequestFilter
decoder = multipartDecoder;
}
+ @Override
public boolean service(HttpServletRequest request, HttpServletResponse response, HttpServletRequestHandler handler)
throws IOException
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/UploadExceptionFilter.java
----------------------------------------------------------------------
diff --git a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/UploadExceptionFilter.java b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/UploadExceptionFilter.java
index 33a6a28..0ae3537 100644
--- a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/UploadExceptionFilter.java
+++ b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/UploadExceptionFilter.java
@@ -47,6 +47,7 @@ public class UploadExceptionFilter implements ComponentEventRequestFilter
this.componentSource = componentSource;
}
+ @Override
public void handle(ComponentEventRequestParameters parameters, ComponentEventRequestHandler handler)
throws IOException
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/UploadedFileItem.java
----------------------------------------------------------------------
diff --git a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/UploadedFileItem.java b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/UploadedFileItem.java
index d4d4e0c..d3c29ba 100755
--- a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/UploadedFileItem.java
+++ b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/UploadedFileItem.java
@@ -34,26 +34,31 @@ public class UploadedFileItem implements UploadedFile
this.item = item;
}
+ @Override
public String getContentType()
{
return item.getContentType();
}
+ @Override
public String getFileName()
{
return FilenameUtils.getName(getFilePath());
}
+ @Override
public String getFilePath()
{
return item.getName();
}
+ @Override
public long getSize()
{
return item.getSize();
}
+ @Override
public InputStream getStream()
{
try
@@ -66,11 +71,13 @@ public class UploadedFileItem implements UploadedFile
}
}
+ @Override
public boolean isInMemory()
{
return item.isInMemory();
}
+ @Override
public void write(File file)
{
try
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-upload/src/main/java/org/apache/tapestry5/upload/modules/UploadModule.java
----------------------------------------------------------------------
diff --git a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/modules/UploadModule.java b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/modules/UploadModule.java
index c9de59a..9402e56 100755
--- a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/modules/UploadModule.java
+++ b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/modules/UploadModule.java
@@ -68,6 +68,7 @@ public class UploadModule
{
shutdownHub.addRegistryShutdownListener(new Runnable()
{
+ @Override
public void run()
{
FileCleaner.exitWhenFinished();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/StubFileItem.java
----------------------------------------------------------------------
diff --git a/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/StubFileItem.java b/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/StubFileItem.java
index af14526..49dbe11 100755
--- a/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/StubFileItem.java
+++ b/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/StubFileItem.java
@@ -42,77 +42,92 @@ public class StubFileItem implements FileItem
this.fieldName = fieldName;
}
+ @Override
public InputStream getInputStream() throws IOException
{
return null;
}
+ @Override
public String getContentType()
{
return null;
}
+ @Override
public String getName()
{
return fileName;
}
+ @Override
public boolean isInMemory()
{
return true;
}
+ @Override
public long getSize()
{
return 10;
}
+ @Override
public byte[] get()
{
return new byte[0]; // To change body of implemented methods use File | Settings | File
// Templates.
}
+ @Override
public String getString(String string) throws UnsupportedEncodingException
{
return getString();
}
+ @Override
public String getString()
{
return value;
}
+ @Override
public void write(File file) throws Exception
{
}
+ @Override
public void delete()
{
isDeleted = true;
}
+ @Override
public String getFieldName()
{
return fieldName; // To change body of implemented methods use File | Settings | File
// Templates.
}
+ @Override
public void setFieldName(String fieldName)
{
this.fieldName = fieldName;
}
+ @Override
public boolean isFormField()
{
return formField;
}
+ @Override
public void setFormField(boolean formField)
{
this.formField = formField;
}
+ @Override
public OutputStream getOutputStream() throws IOException
{
return null;
@@ -134,12 +149,14 @@ public class StubFileItem implements FileItem
}
/* unused method but required by FileItem interface */
+ @Override
public FileItemHeaders getHeaders()
{
return null;
}
/* unused method but required by FileItem interface */
+ @Override
public void setHeaders(FileItemHeaders headers)
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/AbstractMinimizer.java
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/AbstractMinimizer.java b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/AbstractMinimizer.java
index 50fcd01..b2bb015 100644
--- a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/AbstractMinimizer.java
+++ b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/AbstractMinimizer.java
@@ -54,6 +54,7 @@ public abstract class AbstractMinimizer implements ResourceMinimizer
this.checksumGenerator = checksumGenerator;
}
+ @Override
public StreamableResource minimize(final StreamableResource input) throws IOException
{
long startNanos = System.nanoTime();
@@ -62,6 +63,7 @@ public abstract class AbstractMinimizer implements ResourceMinimizer
tracker.perform("Minimizing " + input, new IOOperation<Void>()
{
+ @Override
public Void perform() throws IOException
{
InputStream in = doMinimize(input);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/CoffeeScriptCompiler.java
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/CoffeeScriptCompiler.java b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/CoffeeScriptCompiler.java
index 571530d..1f11579 100644
--- a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/CoffeeScriptCompiler.java
+++ b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/CoffeeScriptCompiler.java
@@ -35,6 +35,7 @@ public class CoffeeScriptCompiler implements ResourceTransformer
private final RhinoExecutorPool executorPool;
+ @Override
public String getTransformedContentType()
{
return "text/javascript";
@@ -69,6 +70,7 @@ public class CoffeeScriptCompiler implements ResourceTransformer
}
+ @Override
public InputStream transform(Resource source, ResourceDependencies dependencies) throws IOException
{
InputStream is = null;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/ContentChangeTracker.java
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/ContentChangeTracker.java b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/ContentChangeTracker.java
index cff26f8..e05abe0 100644
--- a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/ContentChangeTracker.java
+++ b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/ContentChangeTracker.java
@@ -30,6 +30,7 @@ public class ContentChangeTracker implements ResourceDependencies
{
private final Map<Resource, Long> checksums = CollectionFactory.newMap();
+ @Override
public void addDependency(Resource dependency)
{
long checksum = ResourceTransformUtils.toChecksum(dependency);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/LessResourceTransformer.java
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/LessResourceTransformer.java b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/LessResourceTransformer.java
index d2397ce..1c88958 100644
--- a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/LessResourceTransformer.java
+++ b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/LessResourceTransformer.java
@@ -35,6 +35,7 @@ public class LessResourceTransformer implements ResourceTransformer
{
private final LessCompiler compiler = new DefaultLessCompiler();
+ @Override
public String getTransformedContentType()
{
return "text/css";
@@ -91,6 +92,7 @@ public class LessResourceTransformer implements ResourceTransformer
}
}
+ @Override
public byte[] getBytes() throws FileNotFound, CannotReadFile
{
Reader input = null;
@@ -114,6 +116,7 @@ public class LessResourceTransformer implements ResourceTransformer
}
+ @Override
public InputStream transform(Resource source, ResourceDependencies dependencies) throws IOException
{
BytestreamCache compiled = invokeLessCompiler(source, dependencies);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/ResourceDependenciesSplitter.java
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/ResourceDependenciesSplitter.java b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/ResourceDependenciesSplitter.java
index 6363a7a..32c212f 100644
--- a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/ResourceDependenciesSplitter.java
+++ b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/ResourceDependenciesSplitter.java
@@ -32,6 +32,7 @@ public class ResourceDependenciesSplitter implements ResourceDependencies
this.right = right;
}
+ @Override
public void addDependency(Resource dependency)
{
left.addDependency(dependency);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/ResourceTransformerFactoryImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/ResourceTransformerFactoryImpl.java b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/ResourceTransformerFactoryImpl.java
index 157ffcf..5fea1d9 100644
--- a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/ResourceTransformerFactoryImpl.java
+++ b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/ResourceTransformerFactoryImpl.java
@@ -93,6 +93,7 @@ public class ResourceTransformerFactoryImpl implements ResourceTransformerFactor
}
+ @Override
public ResourceTransformer createCompiler(String contentType, String sourceName, String targetName, ResourceTransformer transformer, CacheMode cacheMode)
{
ResourceTransformer trackingCompiler = wrapWithTracking(sourceName, targetName, transformer);
@@ -128,17 +129,20 @@ public class ResourceTransformerFactoryImpl implements ResourceTransformerFactor
{
return new ResourceTransformer()
{
+ @Override
public String getTransformedContentType()
{
return core.getTransformedContentType();
}
+ @Override
public InputStream transform(final Resource source, final ResourceDependencies dependencies) throws IOException
{
final String description = String.format("Compiling %s from %s to %s", source, sourceName, targetName);
return tracker.perform(description, new IOOperation<InputStream>()
{
+ @Override
public InputStream perform() throws IOException
{
return core.transform(source, dependencies);
@@ -152,11 +156,13 @@ public class ResourceTransformerFactoryImpl implements ResourceTransformerFactor
{
return new ResourceTransformer()
{
+ @Override
public String getTransformedContentType()
{
return coreCompiler.getTransformedContentType();
}
+ @Override
public InputStream transform(final Resource source, final ResourceDependencies dependencies) throws IOException
{
final long startTime = System.nanoTime();
@@ -187,11 +193,13 @@ public class ResourceTransformerFactoryImpl implements ResourceTransformerFactor
{
final Map<Resource, Compiled> cache = CollectionFactory.newConcurrentMap();
+ @Override
public String getTransformedContentType()
{
return core.getTransformedContentType();
}
+ @Override
public InputStream transform(Resource source, ResourceDependencies dependencies) throws IOException
{
Compiled compiled = cache.get(source);
@@ -223,11 +231,13 @@ public class ResourceTransformerFactoryImpl implements ResourceTransformerFactor
{
return new ResourceTransformer()
{
+ @Override
public String getTransformedContentType()
{
return core.getTransformedContentType();
}
+ @Override
public InputStream transform(Resource source, ResourceDependencies dependencies) throws IOException
{
long checksum = ResourceTransformUtils.toChecksum(source);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/RhinoExecutorPool.java
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/RhinoExecutorPool.java b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/RhinoExecutorPool.java
index f85c092..ae25313 100644
--- a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/RhinoExecutorPool.java
+++ b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/RhinoExecutorPool.java
@@ -79,6 +79,7 @@ public class RhinoExecutorPool
InternalUtils.join(scripts)),
new Invokable<RhinoExecutor>()
{
+ @Override
public RhinoExecutor invoke()
{
final Context context = contextFactory.enterContext();
@@ -101,6 +102,7 @@ public class RhinoExecutorPool
return new RhinoExecutor()
{
+ @Override
public ScriptableObject invokeFunction(String functionName, Object... arguments)
{
contextFactory.enterContext(context);
@@ -116,6 +118,7 @@ public class RhinoExecutorPool
}
}
+ @Override
public void discard()
{
put(this);
@@ -130,6 +133,7 @@ public class RhinoExecutorPool
tracker.run(String.format("Loading script %s.", script),
new Runnable()
{
+ @Override
public void run()
{
InputStream in = null;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-webresources/src/main/java/org/apache/tapestry5/webresources/modules/WebResourcesModule.java
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/main/java/org/apache/tapestry5/webresources/modules/WebResourcesModule.java b/tapestry-webresources/src/main/java/org/apache/tapestry5/webresources/modules/WebResourcesModule.java
index 1948873..a3d387e 100644
--- a/tapestry-webresources/src/main/java/org/apache/tapestry5/webresources/modules/WebResourcesModule.java
+++ b/tapestry-webresources/src/main/java/org/apache/tapestry5/webresources/modules/WebResourcesModule.java
@@ -96,6 +96,7 @@ public class WebResourcesModule
{
configuration.add(LessCompiler.Problem.class, new ObjectRenderer<LessCompiler.Problem>()
{
+ @Override
public void render(LessCompiler.Problem problem, MarkupWriter writer)
{
List<String> strings = CollectionFactory.newList();
[6/7] Required Java version is now 1.6,
this applies to building as well as to using Tapestry
Posted by jk...@apache.org.
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
[4/7] Required Java version is now 1.6,
this applies to building as well as to using Tapestry
Posted by jk...@apache.org.
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectDecoratorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectDecoratorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectDecoratorImpl.java
index 66b3685..18aa888 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectDecoratorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectDecoratorImpl.java
@@ -36,11 +36,13 @@ public class AspectDecoratorImpl implements AspectDecorator
this.proxyFactory = proxyFactory;
}
+ @Override
public <T> AspectInterceptorBuilder<T> createBuilder(Class<T> serviceInterface, final T delegate, String description)
{
return createBuilder(serviceInterface, delegate, new AnnotationAccessImpl(delegate.getClass()), description);
}
+ @Override
public <T> AspectInterceptorBuilder<T> createBuilder(final Class<T> serviceInterface, final T delegate,
AnnotationAccess annotationAccess, final String description)
{
@@ -55,21 +57,25 @@ public class AspectDecoratorImpl implements AspectDecorator
{
private AspectInterceptorBuilder<T> builder;
+ @Override
public void adviseMethod(Method method, org.apache.tapestry5.plastic.MethodAdvice advice)
{
getBuilder().adviseMethod(method, advice);
}
+ @Override
public void adviseAllMethods(org.apache.tapestry5.plastic.MethodAdvice advice)
{
getBuilder().adviseAllMethods(advice);
}
+ @Override
public Class getInterface()
{
return serviceInterface;
}
+ @Override
public T build()
{
return builder == null ? delegate : builder.build();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectInterceptorBuilderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectInterceptorBuilderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectInterceptorBuilderImpl.java
index e93288d..95fb1f6 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectInterceptorBuilderImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectInterceptorBuilderImpl.java
@@ -67,6 +67,7 @@ public class AspectInterceptorBuilderImpl<T> extends AbtractAspectInterceptorBui
new MethodDescription(delegateTypeName, PlasticProxyFactoryImpl.INTERNAL_GET_DELEGATE);
plasticClass.introduceMethod(getDelegateMethodDescription, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadThis().getField(delegateField);
@@ -75,6 +76,7 @@ public class AspectInterceptorBuilderImpl<T> extends AbtractAspectInterceptorBui
});
}
+ @Override
public void adviseMethod(Method method, org.apache.tapestry5.plastic.MethodAdvice advice)
{
assert method != null;
@@ -87,6 +89,7 @@ public class AspectInterceptorBuilderImpl<T> extends AbtractAspectInterceptorBui
plasticClass.introduceMethod(method).addAdvice(advice);
}
+ @Override
public void adviseAllMethods(org.apache.tapestry5.plastic.MethodAdvice advice)
{
for (Method m : serviceInterface.getMethods())
@@ -95,11 +98,13 @@ public class AspectInterceptorBuilderImpl<T> extends AbtractAspectInterceptorBui
}
}
+ @Override
public Class getInterface()
{
return serviceInterface;
}
+ @Override
public T build()
{
return (T) transformation.createInstantiator().newInstance();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AutobuildObjectProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AutobuildObjectProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AutobuildObjectProvider.java
index 6f0dafd..a36657c 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AutobuildObjectProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AutobuildObjectProvider.java
@@ -25,6 +25,7 @@ import org.apache.tapestry5.ioc.annotations.Autobuild;
*/
public class AutobuildObjectProvider implements ObjectProvider
{
+ @Override
public <T> T provide(Class<T> objectType, AnnotationProvider annotationProvider,
ObjectLocator locator)
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilder.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilder.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilder.java
index 8ff4762..64dc84b 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilder.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilder.java
@@ -72,6 +72,7 @@ public class BridgeBuilder<S, F>
{
instantiator = proxyFactory.createProxy(serviceInterface, new PlasticClassTransformer()
{
+ @Override
public void transform(PlasticClass plasticClass)
{
PlasticField filterField = plasticClass.introduceField(filterInterface, "filter")
@@ -158,6 +159,7 @@ public class BridgeBuilder<S, F>
method.changeImplementation(new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
String message = String.format("Method %s has no match in filter interface %s.", ms, filterInterface.getName());
@@ -174,6 +176,7 @@ public class BridgeBuilder<S, F>
{
method.changeImplementation(new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadThis().getField(filterField);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CachingObjectCreator.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CachingObjectCreator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CachingObjectCreator.java
index 8a0cb22..b89ac09 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CachingObjectCreator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CachingObjectCreator.java
@@ -34,6 +34,7 @@ public class CachingObjectCreator<T> extends LockSupport implements ObjectCreato
this.delegate = delegate;
}
+ @Override
public T createObject()
{
try
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ChainBuilderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ChainBuilderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ChainBuilderImpl.java
index 8d7e9c7..07be24f 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ChainBuilderImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ChainBuilderImpl.java
@@ -40,6 +40,7 @@ public class ChainBuilderImpl implements ChainBuilder
this.proxyFactory = proxyFactory;
}
+ @Override
@SuppressWarnings("unchecked")
public <T> T build(final Class<T> commandInterface, List<T> commands)
{
@@ -51,6 +52,7 @@ public class ChainBuilderImpl implements ChainBuilder
ClassInstantiator<T> instantiator = proxyFactory.createProxy(commandInterface, new PlasticClassTransformer()
{
+ @Override
public void transform(PlasticClass plasticClass)
{
PlasticField commandsField = plasticClass.introduceField(commandsArray.getClass(), "commands").inject(
@@ -72,10 +74,12 @@ public class ChainBuilderImpl implements ChainBuilder
{
plasticClass.introduceMethod(method).changeImplementation(new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadThis().getField(commandsField).iterateArray(new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
// The command is on the stack; add the elements and invoke the method.
@@ -113,11 +117,13 @@ public class ChainBuilderImpl implements ChainBuilder
builder.when(condition, new WhenCallback()
{
+ @Override
public void ifTrue(InstructionBuilder builder)
{
builder.returnResult();
}
+ @Override
public void ifFalse(InstructionBuilder builder)
{
if (wide)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java
index 0168515..19b00ee 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java
@@ -37,6 +37,7 @@ public class ClassNameLocatorImpl implements ClassNameLocator
*/
private final ClasspathMatcher CLASS_NAME_MATCHER = new ClasspathMatcher()
{
+ @Override
public boolean matches(String packagePath, String fileName)
{
if (!CLASS_NAME_PATTERN.matcher(fileName).matches())
@@ -60,6 +61,7 @@ public class ClassNameLocatorImpl implements ClassNameLocator
*/
private final Mapper<String, String> CLASS_NAME_MAPPER = new Mapper<String, String>()
{
+ @Override
public String map(String element)
{
return element.substring(0, element.length() - 6).replace('/', '.');
@@ -75,6 +77,7 @@ public class ClassNameLocatorImpl implements ClassNameLocator
/**
* Synchronization should not be necessary, but perhaps the underlying ClassLoader's are sensitive to threading.
*/
+ @Override
public synchronized Collection<String> locateClassNames(String packageName)
{
String packagePath = packageName.replace('.', '/') + "/";
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java
index a7858cf..9e032e6 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java
@@ -73,6 +73,7 @@ public class ClassPropertyAdapterImpl implements ClassPropertyAdapter
}
}
+ @Override
public Class getBeanType()
{
return beanType;
@@ -86,26 +87,31 @@ public class ClassPropertyAdapterImpl implements ClassPropertyAdapter
return String.format("<ClassPropertyAdaptor %s: %s>", beanType.getName(), names);
}
+ @Override
public List<String> getPropertyNames()
{
return InternalUtils.sortedKeys(adapters);
}
+ @Override
public PropertyAdapter getPropertyAdapter(String name)
{
return adapters.get(name);
}
+ @Override
public Object get(Object instance, String propertyName)
{
return adaptorFor(propertyName).get(instance);
}
+ @Override
public void set(Object instance, String propertyName, Object value)
{
adaptorFor(propertyName).set(instance, value);
}
+ @Override
public Annotation getAnnotation(Object instance, String propertyName, Class<? extends Annotation> annotationClass) {
return adaptorFor(propertyName).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/ClasspathScannerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClasspathScannerImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClasspathScannerImpl.java
index 775bf97..55ac8cb 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClasspathScannerImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClasspathScannerImpl.java
@@ -56,6 +56,7 @@ public class ClasspathScannerImpl implements ClasspathScanner
* @return collection of matching paths, in no specified order
* @throws java.io.IOException
*/
+ @Override
public Set<String> scan(String packagePath, ClasspathMatcher matcher) throws IOException
{
assert packagePath != null && packagePath.endsWith("/");
@@ -205,6 +206,7 @@ public class ClasspathScannerImpl implements ClasspathScanner
{
queue.push(new IOWork()
{
+ @Override
public void run() throws IOException
{
scanDirStream(packagePath, url);
@@ -241,6 +243,7 @@ public class ClasspathScannerImpl implements ClasspathScanner
queue.push(new IOWork()
{
+ @Override
public void run() throws IOException
{
scanDir(nestedPackagePath, file);
@@ -299,6 +302,7 @@ public class ClasspathScannerImpl implements ClasspathScanner
queue.push(new IOWork()
{
+ @Override
public void run() throws IOException
{
scanURL(nestedPackagePath, newURL);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClasspathURLConverterImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClasspathURLConverterImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClasspathURLConverterImpl.java
index a0336fe..9c710fa 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClasspathURLConverterImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClasspathURLConverterImpl.java
@@ -23,6 +23,7 @@ import java.net.URL;
*/
public class ClasspathURLConverterImpl implements ClasspathURLConverter
{
+ @Override
public URL convert(URL url)
{
return url;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CompoundCoercion.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CompoundCoercion.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CompoundCoercion.java
index 071551e..4a5dece 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CompoundCoercion.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CompoundCoercion.java
@@ -35,6 +35,7 @@ public class CompoundCoercion<S, I, T> implements Coercion<S, T>
this.op2 = op2;
}
+ @Override
public T coerce(S input)
{
// Run the input through the first operation (S --> I), then run the result of that through
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/DefaultImplementationBuilderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/DefaultImplementationBuilderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/DefaultImplementationBuilderImpl.java
index 8512128..34c7bf2 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/DefaultImplementationBuilderImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/DefaultImplementationBuilderImpl.java
@@ -36,6 +36,7 @@ public class DefaultImplementationBuilderImpl implements DefaultImplementationBu
this.proxyFactory = proxyFactory;
}
+ @Override
public <S> S createDefaultImplementation(Class<S> serviceInterface)
{
S instance = serviceInterface.cast(cache.get(serviceInterface));
@@ -56,6 +57,7 @@ public class DefaultImplementationBuilderImpl implements DefaultImplementationBu
{
ClassInstantiator instantiator = proxyFactory.createProxy(serviceInterface, new PlasticClassTransformer()
{
+ @Override
public void transform(PlasticClass plasticClass)
{
plasticClass.addToString(String.format("<NoOp %s>", serviceInterface.getName()));
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalysisImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalysisImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalysisImpl.java
index 48a153a..928d3b9 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalysisImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalysisImpl.java
@@ -32,6 +32,7 @@ public class ExceptionAnalysisImpl implements ExceptionAnalysis
this.infos = unmodifiableList(infos);
}
+ @Override
public List<ExceptionInfo> getExceptionInfos()
{
return infos;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalyzerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalyzerImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalyzerImpl.java
index 002d338..a0e1359 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalyzerImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalyzerImpl.java
@@ -49,6 +49,7 @@ public class ExceptionAnalyzerImpl implements ExceptionAnalyzer
.getPropertyNames());
}
+ @Override
public ExceptionAnalysis analyze(Throwable rootException)
{
List<ExceptionInfo> list = CollectionFactory.newList();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionInfoImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionInfoImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionInfoImpl.java
index 51820c3..07b8996 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionInfoImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionInfoImpl.java
@@ -40,26 +40,31 @@ public class ExceptionInfoImpl implements ExceptionInfo
this.stackTrace = unmodifiableList(stackTrace);
}
+ @Override
public String getClassName()
{
return className;
}
+ @Override
public String getMessage()
{
return message;
}
+ @Override
public Object getProperty(String name)
{
return properties.get(name);
}
+ @Override
public List<String> getPropertyNames()
{
return InternalUtils.sortedKeys(properties);
}
+ @Override
public List<StackTraceElement> getStackTrace()
{
return stackTrace;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionTrackerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionTrackerImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionTrackerImpl.java
index 43a1540..9b8f9b8 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionTrackerImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionTrackerImpl.java
@@ -28,6 +28,7 @@ public class ExceptionTrackerImpl implements ExceptionTracker
{
private final Set<Throwable> exceptions = CollectionFactory.newSet();
+ @Override
public boolean exceptionLogged(Throwable exception)
{
boolean result = exceptions.contains(exception);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/JustInTimeObjectCreator.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/JustInTimeObjectCreator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/JustInTimeObjectCreator.java
index c61f450..25eeda6 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/JustInTimeObjectCreator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/JustInTimeObjectCreator.java
@@ -48,6 +48,7 @@ public class JustInTimeObjectCreator<T> implements ObjectCreator<T>, EagerLoadSe
*
* @throws IllegalStateException if the registry has been shutdown
*/
+ @Override
public T createObject()
{
if (object == null)
@@ -79,6 +80,7 @@ public class JustInTimeObjectCreator<T> implements ObjectCreator<T>, EagerLoadSe
/**
* Invokes {@link #createObject()} to force the creation of the underlying service.
*/
+ @Override
public void eagerLoadService()
{
// Force object creation now
@@ -90,10 +92,12 @@ public class JustInTimeObjectCreator<T> implements ObjectCreator<T>, EagerLoadSe
* Invoked when the Registry is shutdown; deletes the instantiated object (if it exists) and replaces
* the ObjectCreator with one that throws an IllegalStateException.
*/
+ @Override
public synchronized void run()
{
creator = new ObjectCreator<T>()
{
+ @Override
public T createObject()
{
throw new IllegalStateException(ServiceMessages.registryShutdown(serviceId));
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LazyAdvisorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LazyAdvisorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LazyAdvisorImpl.java
index 8a84d04..5f4514a 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LazyAdvisorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LazyAdvisorImpl.java
@@ -36,6 +36,7 @@ public class LazyAdvisorImpl implements LazyAdvisor
this.thunkCreator = thunkCreator;
}
+ @Override
public void addLazyMethodInvocationAdvice(MethodAdviceReceiver methodAdviceReceiver)
{
for (Method m : methodAdviceReceiver.getInterface().getMethods())
@@ -58,10 +59,12 @@ public class LazyAdvisorImpl implements LazyAdvisor
* When the method is invoked, we don't immediately proceed. Instead, we return a thunk instance
* that defers its behavior to the lazily invoked invocation.
*/
+ @Override
public void advise(final MethodInvocation invocation)
{
ObjectCreator deferred = new ObjectCreator()
{
+ @Override
public Object createObject()
{
invocation.proceed();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvice.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvice.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvice.java
index f34ae1a..7a068f6 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvice.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvice.java
@@ -28,6 +28,7 @@ public class LoggingAdvice implements MethodAdvice
methodLogger = new MethodLogger(logger, exceptionTracker);
}
+ @Override
public void advise(MethodInvocation invocation)
{
boolean debug = methodLogger.isDebugEnabled();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvisorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvisorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvisorImpl.java
index 5fb6916..5fc0354 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvisorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvisorImpl.java
@@ -31,6 +31,7 @@ public class LoggingAdvisorImpl implements LoggingAdvisor
this.exceptionTracker = exceptionTracker;
}
+ @Override
public void addLoggingAdvice(Logger logger, MethodAdviceReceiver receiver)
{
MethodAdvice advice = new LoggingAdvice(logger, exceptionTracker);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingDecoratorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingDecoratorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingDecoratorImpl.java
index f5cc903..f2f963a 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingDecoratorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingDecoratorImpl.java
@@ -34,6 +34,7 @@ public class LoggingDecoratorImpl implements LoggingDecorator
this.advisor = advisor;
}
+ @Override
public <T> T build(Class<T> serviceInterface, T delegate, String serviceId, final Logger logger)
{
AspectInterceptorBuilder<T> builder = aspectDecorator.createBuilder(serviceInterface, delegate, String.format(
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MapSymbolProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MapSymbolProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MapSymbolProvider.java
index 749f3db..e5de367 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MapSymbolProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MapSymbolProvider.java
@@ -31,6 +31,7 @@ public class MapSymbolProvider implements SymbolProvider
this.configuration = configuration;
}
+ @Override
public String valueForSymbol(String symbolName)
{
return configuration.get(symbolName);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MasterObjectProviderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MasterObjectProviderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MasterObjectProviderImpl.java
index b7fc153..dadf5c8 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MasterObjectProviderImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MasterObjectProviderImpl.java
@@ -38,6 +38,7 @@ public class MasterObjectProviderImpl implements MasterObjectProvider
this.configuration.add(0, new StaticObjectProvider(OperationTracker.class, tracker));
}
+ @Override
public <T> T provide(final Class<T> objectType, final AnnotationProvider annotationProvider,
final ObjectLocator locator,
final boolean required)
@@ -45,6 +46,7 @@ public class MasterObjectProviderImpl implements MasterObjectProvider
return tracker.invoke(String.format("Resolving object of type %s using MasterObjectProvider",
PlasticUtils.toTypeName(objectType)), new Invokable<T>()
{
+ @Override
public T invoke()
{
for (ObjectProvider provider : configuration)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodIterator.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodIterator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodIterator.java
index 5dc4b3a..c67ba75 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodIterator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodIterator.java
@@ -39,6 +39,7 @@ public class MethodIterator
private static final Comparator<MethodSignature> COMPARATOR = new Comparator<MethodSignature>()
{
+ @Override
public int compare(MethodSignature o1, MethodSignature o2)
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/NonParallelExecutor.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/NonParallelExecutor.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/NonParallelExecutor.java
index 7d685b2..4a8d7b8 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/NonParallelExecutor.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/NonParallelExecutor.java
@@ -30,32 +30,38 @@ import java.util.concurrent.TimeoutException;
*/
public class NonParallelExecutor implements ParallelExecutor
{
+ @Override
public <T> Future<T> invoke(Invokable<T> invocable)
{
final T result = invocable.invoke();
return new Future<T>()
{
+ @Override
public boolean cancel(boolean mayInterruptIfRunning)
{
return false;
}
+ @Override
public boolean isCancelled()
{
return false;
}
+ @Override
public boolean isDone()
{
return true;
}
+ @Override
public T get() throws InterruptedException, ExecutionException
{
return result;
}
+ @Override
public T get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException
{
return result;
@@ -63,6 +69,7 @@ public class NonParallelExecutor implements ParallelExecutor
};
}
+ @Override
public <T> T invoke(Class<T> proxyType, Invokable<T> invocable)
{
return invocable.invoke();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/OperationAdvisorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/OperationAdvisorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/OperationAdvisorImpl.java
index 0045ec5..a97f3bf 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/OperationAdvisorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/OperationAdvisorImpl.java
@@ -39,6 +39,7 @@ public class OperationAdvisorImpl implements OperationAdvisor
{
return new Runnable()
{
+ @Override
public void run()
{
invocation.proceed();
@@ -55,6 +56,7 @@ public class OperationAdvisorImpl implements OperationAdvisor
this.description = description;
}
+ @Override
public void advise(MethodInvocation invocation)
{
tracker.run(description, toRunnable(invocation));
@@ -70,6 +72,7 @@ public class OperationAdvisorImpl implements OperationAdvisor
this.format = format;
}
+ @Override
public void advise(MethodInvocation invocation)
{
Object[] parameters = extractParameters(invocation);
@@ -94,6 +97,7 @@ public class OperationAdvisorImpl implements OperationAdvisor
}
}
+ @Override
public void addOperationAdvice(MethodAdviceReceiver receiver)
{
for (Method m : receiver.getInterface().getMethods())
@@ -110,6 +114,7 @@ public class OperationAdvisorImpl implements OperationAdvisor
}
}
+ @Override
public MethodAdvice createAdvice(String description)
{
assert 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/services/ParallelExecutorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ParallelExecutorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ParallelExecutorImpl.java
index 06824fc..206d0fc 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ParallelExecutorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ParallelExecutorImpl.java
@@ -40,6 +40,7 @@ public class ParallelExecutorImpl implements ParallelExecutor
this.perthreadManager = perthreadManager;
}
+ @Override
public <T> Future<T> invoke(Invokable<T> invocable)
{
assert invocable != null;
@@ -51,6 +52,7 @@ public class ParallelExecutorImpl implements ParallelExecutor
{
return new Callable<T>()
{
+ @Override
public T call() throws Exception
{
try
@@ -65,12 +67,14 @@ public class ParallelExecutorImpl implements ParallelExecutor
};
}
+ @Override
public <T> T invoke(Class<T> proxyType, Invokable<T> invocable)
{
final Future<T> future = invoke(invocable);
ObjectCreator<T> creator = new ObjectCreator<T>()
{
+ @Override
public T createObject()
{
try
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceCreator.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceCreator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceCreator.java
index ea0c530..44b0d0f 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceCreator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceCreator.java
@@ -39,6 +39,7 @@ public class PerThreadServiceCreator implements ObjectCreator
* an instance, and later calls will reuse the same per-thread instance. The instance is stored in the
* {@link org.apache.tapestry5.ioc.services.PerthreadManager} and will be released at the end of the request.
*/
+ @Override
public Object createObject()
{
if (perThreadValue.exists())
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceLifecycle.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceLifecycle.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceLifecycle.java
index 5b17ce0..118cb44 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceLifecycle.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceLifecycle.java
@@ -49,11 +49,13 @@ public class PerThreadServiceLifecycle implements ServiceLifecycle
/**
* Returns false; this lifecycle represents a service that will be created many times (by each thread).
*/
+ @Override
public boolean isSingleton()
{
return false;
}
+ @Override
public Object createService(ServiceResources resources, ObjectCreator creator)
{
ObjectCreator perThreadCreator = new PerThreadServiceCreator(perthreadManager, creator);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java
index 382c9a3..1cad0dc 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java
@@ -64,6 +64,7 @@ public class PerthreadManagerImpl implements PerthreadManager
{
hub.addRegistryShutdownListener(new Runnable()
{
+ @Override
public void run()
{
cleanup();
@@ -106,12 +107,14 @@ public class PerthreadManagerImpl implements PerthreadManager
return result;
}
+ @Override
public void addThreadCleanupListener(final ThreadCleanupListener listener)
{
assert listener != null;
addThreadCleanupCallback(new Runnable()
{
+ @Override
public void run()
{
listener.threadDidCleanup();
@@ -119,6 +122,7 @@ public class PerthreadManagerImpl implements PerthreadManager
});
}
+ @Override
public void addThreadCleanupCallback(Runnable callback)
{
assert callback != null;
@@ -130,6 +134,7 @@ public class PerthreadManagerImpl implements PerthreadManager
* Instructs the hub to notify all its listeners (for the current thread).
* It also discards its list of listeners.
*/
+ @Override
public void cleanup()
{
List<Runnable> callbacks = getCallbacks();
@@ -173,11 +178,13 @@ public class PerthreadManagerImpl implements PerthreadManager
{
return new PerThreadValue<T>()
{
+ @Override
public T get()
{
return get(null);
}
+ @Override
public T get(T defaultValue)
{
Map map = getPerthreadMap();
@@ -195,6 +202,7 @@ public class PerthreadManagerImpl implements PerthreadManager
return defaultValue;
}
+ @Override
public T set(T newValue)
{
getPerthreadMap().put(key, newValue == null ? NULL_VALUE : newValue);
@@ -202,6 +210,7 @@ public class PerthreadManagerImpl implements PerthreadManager
return newValue;
}
+ @Override
public boolean exists()
{
return getPerthreadMap().containsKey(key);
@@ -209,11 +218,13 @@ public class PerthreadManagerImpl implements PerthreadManager
};
}
+ @Override
public <T> PerThreadValue<T> createValue()
{
return createValue(uuidGenerator.getAndIncrement());
}
+ @Override
public void run(Runnable runnable)
{
assert runnable != null;
@@ -227,6 +238,7 @@ public class PerthreadManagerImpl implements PerthreadManager
}
}
+ @Override
public <T> T invoke(Invokable<T> invokable)
{
try
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PipelineBuilderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PipelineBuilderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PipelineBuilderImpl.java
index a64815f..562043c 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PipelineBuilderImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PipelineBuilderImpl.java
@@ -38,6 +38,7 @@ public class PipelineBuilderImpl implements PipelineBuilder
this.defaultImplementationBuilder = defaultImplementationBuilder;
}
+ @Override
public <S, F> S build(Logger logger, Class<S> serviceInterface, Class<F> filterInterface, List<F> filters)
{
S terminator = defaultImplementationBuilder.createDefaultImplementation(serviceInterface);
@@ -45,6 +46,7 @@ public class PipelineBuilderImpl implements PipelineBuilder
return build(logger, serviceInterface, filterInterface, filters, terminator);
}
+ @Override
public <S, F> S build(Logger logger, Class<S> serviceInterface, Class<F> filterInterface, List<F> filters,
S terminator)
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticClassListenerLogger.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticClassListenerLogger.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticClassListenerLogger.java
index ac3fccf..8ebdede 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticClassListenerLogger.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticClassListenerLogger.java
@@ -30,6 +30,7 @@ public class PlasticClassListenerLogger implements PlasticClassListener
this.logger = logger;
}
+ @Override
public void classWillLoad(PlasticClassEvent event)
{
if (logger.isDebugEnabled())
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticProxyFactoryImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticProxyFactoryImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticProxyFactoryImpl.java
index a18bfba..112e29d 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticProxyFactoryImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticProxyFactoryImpl.java
@@ -57,37 +57,44 @@ public class PlasticProxyFactoryImpl implements PlasticProxyFactory
}
}
+ @Override
public ClassLoader getClassLoader()
{
return manager.getClassLoader();
}
+ @Override
public <T> ClassInstantiator<T> createProxy(Class<T> interfaceType, Class<? extends T> implementationType, PlasticClassTransformer callback)
{
return manager.createProxy(interfaceType, implementationType, callback);
}
+ @Override
public <T> ClassInstantiator<T> createProxy(Class<T> interfaceType, PlasticClassTransformer callback)
{
return manager.createProxy(interfaceType, callback);
}
+ @Override
public <T> PlasticClassTransformation<T> createProxyTransformation(Class<T> interfaceType,
Class<? extends T> implementationType)
{
return manager.createProxyTransformation(interfaceType, implementationType);
}
+ @Override
public <T> PlasticClassTransformation<T> createProxyTransformation(Class<T> interfaceType)
{
return createProxyTransformation(interfaceType, null);
}
+ @Override
public <T> T createProxy(final Class<T> interfaceType, final ObjectCreator<T> creator, final String description)
{ return createProxy(interfaceType, null, creator, description);
}
+ @Override
public <T> T createProxy(final Class<T> interfaceType, final Class<? extends T> implementationType,
final ObjectCreator<T> creator, final String description)
{
@@ -96,6 +103,7 @@ public class PlasticProxyFactoryImpl implements PlasticProxyFactory
ClassInstantiator<T> instantiator = createProxy(interfaceType, implementationType, new PlasticClassTransformer()
{
+ @Override
public void transform(PlasticClass plasticClass)
{
final PlasticField objectCreatorField = plasticClass.introduceField(ObjectCreator.class, "creator")
@@ -107,6 +115,7 @@ public class PlasticProxyFactoryImpl implements PlasticProxyFactory
final InstructionBuilderCallback returnCreateObject = new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadThis().getField(objectCreatorField);
@@ -142,10 +151,12 @@ public class PlasticProxyFactoryImpl implements PlasticProxyFactory
return bytecode == null ? null : PlasticInternalUtils.convertBytecodeToClassNode(bytecode);
}
+ @Override
public Location getMethodLocation(final Method method)
{
ObjectCreator<String> descriptionCreator = new ObjectCreator<String>()
{
+ @Override
public String createObject()
{
return InternalUtils.asString(method);
@@ -156,10 +167,12 @@ public class PlasticProxyFactoryImpl implements PlasticProxyFactory
descriptionCreator);
}
+ @Override
public Location getConstructorLocation(final Constructor constructor)
{
ObjectCreator<String> descriptionCreator = new ObjectCreator<String>()
{
+ @Override
public String createObject()
{
StringBuilder builder = new StringBuilder(constructor.getDeclaringClass().getName()).append("(");
@@ -183,6 +196,7 @@ public class PlasticProxyFactoryImpl implements PlasticProxyFactory
descriptionCreator);
}
+ @Override
public void clearCache()
{
memberToLocation.clear();
@@ -257,11 +271,13 @@ public class PlasticProxyFactoryImpl implements PlasticProxyFactory
return -1;
}
+ @Override
public void addPlasticClassListener(PlasticClassListener listener)
{
manager.addPlasticClassListener(listener);
}
+ @Override
public void removePlasticClassListener(PlasticClassListener listener)
{
manager.removePlasticClassListener(listener);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java
index 8a4a202..8dd1e02 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java
@@ -35,16 +35,19 @@ public class PropertyAccessImpl implements PropertyAccess
{
private final Map<Class, ClassPropertyAdapter> adapters = CollectionFactory.newConcurrentMap();
+ @Override
public Object get(Object instance, String propertyName)
{
return getAdapter(instance).get(instance, propertyName);
}
+ @Override
public void set(Object instance, String propertyName, Object value)
{
getAdapter(instance).set(instance, propertyName, value);
}
+ @Override
public Annotation getAnnotation(Object instance, String propertyName, Class<? extends Annotation> annotationClass) {
return getAdapter(instance).getAnnotation(instance, propertyName, annotationClass);
}
@@ -53,6 +56,7 @@ public class PropertyAccessImpl implements PropertyAccess
/**
* Clears the cache of adapters and asks the {@link Introspector} to clear its cache.
*/
+ @Override
public synchronized void clearCache()
{
adapters.clear();
@@ -60,11 +64,13 @@ public class PropertyAccessImpl implements PropertyAccess
Introspector.flushCaches();
}
+ @Override
public ClassPropertyAdapter getAdapter(Object instance)
{
return getAdapter(instance.getClass());
}
+ @Override
public ClassPropertyAdapter getAdapter(Class forClass)
{
ClassPropertyAdapter result = adapters.get(forClass);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAdapterImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAdapterImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAdapterImpl.java
index 5845cc6..97685ef 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAdapterImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAdapterImpl.java
@@ -78,31 +78,37 @@ public class PropertyAdapterImpl implements PropertyAdapter
writeMethod = null;
}
+ @Override
public String getName()
{
return name;
}
+ @Override
public Method getReadMethod()
{
return readMethod;
}
+ @Override
public Class getType()
{
return type;
}
+ @Override
public Method getWriteMethod()
{
return writeMethod;
}
+ @Override
public boolean isRead()
{
return field != null || readMethod != null;
}
+ @Override
public boolean isUpdate()
{
return writeMethod != null || (field != null && !isFinal(field));
@@ -113,6 +119,7 @@ public class PropertyAdapterImpl implements PropertyAdapter
return Modifier.isFinal(member.getModifiers());
}
+ @Override
public Object get(Object instance)
{
if (field == null && readMethod == null)
@@ -139,6 +146,7 @@ public class PropertyAdapterImpl implements PropertyAdapter
throw new RuntimeException(ServiceMessages.readFailure(name, instance, fail), fail);
}
+ @Override
public void set(Object instance, Object value)
{
if (field == null && writeMethod == null)
@@ -177,6 +185,7 @@ public class PropertyAdapterImpl implements PropertyAdapter
return instance == null ? "<null>" : instance.getClass().getName();
}
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationClass)
{
return getAnnnotationProvider().getAnnotation(annotationClass);
@@ -226,31 +235,37 @@ public class PropertyAdapterImpl implements PropertyAdapter
return annotationProvider;
}
+ @Override
public boolean isCastRequired()
{
return castRequired;
}
+ @Override
public ClassPropertyAdapter getClassAdapter()
{
return classAdapter;
}
+ @Override
public Class getBeanType()
{
return classAdapter.getBeanType();
}
+ @Override
public boolean isField()
{
return field != null;
}
+ @Override
public Field getField()
{
return field;
}
+ @Override
public Class getDeclaringClass()
{
return declaringClass;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyShadowBuilderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyShadowBuilderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyShadowBuilderImpl.java
index 187f25f..9011b6e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyShadowBuilderImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyShadowBuilderImpl.java
@@ -34,6 +34,7 @@ public class PropertyShadowBuilderImpl implements PropertyShadowBuilder
this.propertyAccess = propertyAccess;
}
+ @Override
public <T> T build(final Object source, final String propertyName, final Class<T> propertyType)
{
final Class sourceClass = source.getClass();
@@ -57,6 +58,7 @@ public class PropertyShadowBuilderImpl implements PropertyShadowBuilder
ClassInstantiator instantiator = proxyFactory.createProxy(propertyType, new PlasticClassTransformer()
{
+ @Override
public void transform(PlasticClass plasticClass)
{
final PlasticField sourceField = plasticClass.introduceField(sourceClass, "source").inject(source);
@@ -69,6 +71,7 @@ public class PropertyShadowBuilderImpl implements PropertyShadowBuilder
delegateMethod.changeImplementation(new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadThis().getField(sourceField);
@@ -78,6 +81,7 @@ public class PropertyShadowBuilderImpl implements PropertyShadowBuilder
builder.dupe().when(Condition.NULL, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.throwException(
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryShutdownHubImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryShutdownHubImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryShutdownHubImpl.java
index 912918e..338976d 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryShutdownHubImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryShutdownHubImpl.java
@@ -40,12 +40,14 @@ public class RegistryShutdownHubImpl implements RegistryShutdownHub
this.logger = logger;
}
+ @Override
public void addRegistryShutdownListener(final RegistryShutdownListener listener)
{
assert listener != null;
addRegistryShutdownListener(new Runnable()
{
+ @Override
public void run()
{
listener.registryDidShutdown();
@@ -53,6 +55,7 @@ public class RegistryShutdownHubImpl implements RegistryShutdownHub
});
}
+ @Override
public void addRegistryShutdownListener(Runnable listener)
{
assert listener != null;
@@ -62,6 +65,7 @@ public class RegistryShutdownHubImpl implements RegistryShutdownHub
listeners.add(listener);
}
+ @Override
public void addRegistryWillShutdownListener(Runnable listener)
{
assert listener != null;
@@ -81,6 +85,7 @@ public class RegistryShutdownHubImpl implements RegistryShutdownHub
F.flow(preListeners).concat(listeners).each(new Worker<Runnable>()
{
+ @Override
public void work(Runnable element)
{
try
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryStartup.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryStartup.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryStartup.java
index 13f0c1a..8988d74 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryStartup.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryStartup.java
@@ -43,6 +43,7 @@ public class RegistryStartup implements Runnable
* Invokes run() on each contributed object. If the object throws a runtime exception, it is logged but startup
* continues anyway. This method may only be {@linkplain OneShotLock invoked once}.
*/
+ @Override
public void run()
{
lock.lock();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ResourceSymbolProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ResourceSymbolProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ResourceSymbolProvider.java
index 0222ab7..cd9c1e6 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ResourceSymbolProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ResourceSymbolProvider.java
@@ -75,6 +75,7 @@ public class ResourceSymbolProvider implements SymbolProvider
}
}
+ @Override
public String valueForSymbol(String symbolName)
{
return properties.get(symbolName);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ServiceOverrideImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ServiceOverrideImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ServiceOverrideImpl.java
index cf29dad..a9d3e9e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ServiceOverrideImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ServiceOverrideImpl.java
@@ -32,10 +32,12 @@ public class ServiceOverrideImpl implements ServiceOverride
this.configuration = configuration;
}
+ @Override
public ObjectProvider getServiceOverrideProvider()
{
return new ObjectProvider()
{
+ @Override
public <T> T provide(Class<T> objectType, AnnotationProvider annotationProvider, ObjectLocator locator)
{
return objectType.cast(configuration.get(objectType));
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StaticObjectProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StaticObjectProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StaticObjectProvider.java
index 0aa0bcf..b8d454c 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StaticObjectProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StaticObjectProvider.java
@@ -39,6 +39,7 @@ public class StaticObjectProvider<S> implements ObjectProvider
}
+ @Override
public <T> T provide(Class<T> objectType, AnnotationProvider annotationProvider, ObjectLocator locator)
{
if (objectType == valueType)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImpl.java
index 5a333f4..e7f65a6 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImpl.java
@@ -39,11 +39,13 @@ public class StrategyBuilderImpl implements StrategyBuilder
this.proxyFactory = proxyFactory;
}
+ @Override
public <S> S build(StrategyRegistry<S> registry)
{
return createProxy(registry.getAdapterType(), registry);
}
+ @Override
public <S> S build(Class<S> adapterType, Map<Class, S> registrations)
{
StrategyRegistry<S> registry = StrategyRegistry.newInstance(adapterType, registrations);
@@ -55,6 +57,7 @@ public class StrategyBuilderImpl implements StrategyBuilder
{
ClassInstantiator instantiator = proxyFactory.createProxy(interfaceType, new PlasticClassTransformer()
{
+ @Override
public void transform(PlasticClass plasticClass)
{
final PlasticField registryField = plasticClass.introduceField(StrategyRegistry.class, "registry")
@@ -64,6 +67,7 @@ public class StrategyBuilderImpl implements StrategyBuilder
{
plasticClass.introduceMethod(new MethodDescription(method), new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
Class returnType = method.getReturnType();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StringLocation.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StringLocation.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StringLocation.java
index 3a94d04..0769b7e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StringLocation.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StringLocation.java
@@ -41,11 +41,13 @@ public final class StringLocation implements Location
/**
* Returns 0.
*/
+ @Override
public int getColumn()
{
return 0;
}
+ @Override
public int getLine()
{
return line;
@@ -54,6 +56,7 @@ public final class StringLocation implements Location
/**
* Returns null; we don't know where the file really is (it's probably a class on the class path).
*/
+ @Override
public Resource getResource()
{
return null;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolObjectProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolObjectProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolObjectProvider.java
index 5c5a847..ceba5b8 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolObjectProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolObjectProvider.java
@@ -40,6 +40,7 @@ public class SymbolObjectProvider implements ObjectProvider
this.typeCoercer = typeCoercer;
}
+ @Override
public <T> T provide(Class<T> objectType, AnnotationProvider annotationProvider, ObjectLocator locator)
{
Symbol annotation = annotationProvider.getAnnotation(Symbol.class);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolSourceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolSourceImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolSourceImpl.java
index c69af03..13830ee 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolSourceImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolSourceImpl.java
@@ -199,11 +199,13 @@ public class SymbolSourceImpl implements SymbolSource
this.providers = providers;
}
+ @Override
public String expandSymbols(String input)
{
return new SymbolExpansion().expandSymbols(input);
}
+ @Override
public String valueForSymbol(String symbolName)
{
String value = cache.get(symbolName);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemEnvSymbolProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemEnvSymbolProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemEnvSymbolProvider.java
index a064538..f2c7bcf 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemEnvSymbolProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemEnvSymbolProvider.java
@@ -29,6 +29,7 @@ public class SystemEnvSymbolProvider implements SymbolProvider
{
private final Map<String, String> symbols = CollectionFactory.newCaseInsensitiveMap();
+ @Override
public synchronized String valueForSymbol(String symbolName)
{
if (symbols.isEmpty())
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemPropertiesSymbolProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemPropertiesSymbolProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemPropertiesSymbolProvider.java
index 023f785..7de1254 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemPropertiesSymbolProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemPropertiesSymbolProvider.java
@@ -22,6 +22,7 @@ import org.apache.tapestry5.ioc.services.SymbolProvider;
*/
public class SystemPropertiesSymbolProvider implements SymbolProvider
{
+ @Override
public String valueForSymbol(String symbolName)
{
return System.getProperty(symbolName);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThreadLocaleImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThreadLocaleImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThreadLocaleImpl.java
index 1c16ae3..3191517 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThreadLocaleImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThreadLocaleImpl.java
@@ -25,11 +25,13 @@ public class ThreadLocaleImpl implements ThreadLocale
{
private Locale locale = Locale.getDefault();
+ @Override
public Locale getLocale()
{
return locale;
}
+ @Override
public void setLocale(Locale locale)
{
assert locale != null;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThunkCreatorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThunkCreatorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThunkCreatorImpl.java
index 24577ce..eafb2cd 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThunkCreatorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThunkCreatorImpl.java
@@ -47,6 +47,7 @@ public class ThunkCreatorImpl implements ThunkCreator
this.proxyFactory = proxyFactory;
}
+ @Override
public <T> T createThunk(Class<T> proxyType, ObjectCreator objectCreator, String description)
{
assert proxyType != null;
@@ -80,6 +81,7 @@ public class ThunkCreatorImpl implements ThunkCreator
{
return proxyFactory.createProxy(interfaceType, new PlasticClassTransformer()
{
+ @Override
public void transform(PlasticClass plasticClass)
{
final PlasticField objectCreatorField = plasticClass.introduceField(ObjectCreator.class, "creator")
@@ -90,6 +92,7 @@ public class ThunkCreatorImpl implements ThunkCreator
delegateMethod.changeImplementation(new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadThis().getField(objectCreatorField);
@@ -110,6 +113,7 @@ public class ThunkCreatorImpl implements ThunkCreator
plasticClass.introduceMethod(PlasticUtils.TO_STRING_DESCRIPTION, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadThis().getField(descriptionField).returnResult();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImpl.java
index 170ca52..46f1c0a 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImpl.java
@@ -101,6 +101,7 @@ public class TypeCoercerImpl extends LockSupport implements TypeCoercer
private static final Coercion NO_COERCION = new Coercion<Object, Object>()
{
+ @Override
public Object coerce(Object input)
{
return input;
@@ -109,6 +110,7 @@ public class TypeCoercerImpl extends LockSupport implements TypeCoercer
private static final Coercion COERCION_NULL_TO_OBJECT = new Coercion<Void, Object>()
{
+ @Override
public Object coerce(Void input)
{
return null;
@@ -131,6 +133,7 @@ public class TypeCoercerImpl extends LockSupport implements TypeCoercer
}
}
+ @Override
@SuppressWarnings("unchecked")
public Object coerce(Object input, Class targetType)
{
@@ -147,6 +150,7 @@ public class TypeCoercerImpl extends LockSupport implements TypeCoercer
return getTargetCoercion(effectiveTargetType).coerce(input);
}
+ @Override
@SuppressWarnings("unchecked")
public <S, T> Coercion<S, T> getCoercion(Class<S> sourceType, Class<T> targetType)
{
@@ -164,6 +168,7 @@ public class TypeCoercerImpl extends LockSupport implements TypeCoercer
return getTargetCoercion(effectiveTargetType).getCoercion(effectiveSourceType);
}
+ @Override
@SuppressWarnings("unchecked")
public <S, T> String explain(Class<S> sourceType, Class<T> targetType)
{
@@ -222,6 +227,7 @@ public class TypeCoercerImpl extends LockSupport implements TypeCoercer
}
}
+ @Override
public void clearCache()
{
try
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/UpdateListenerHubImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/UpdateListenerHubImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/UpdateListenerHubImpl.java
index 9fde2ae..1f33196 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/UpdateListenerHubImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/UpdateListenerHubImpl.java
@@ -28,6 +28,7 @@ public class UpdateListenerHubImpl implements UpdateListenerHub
{
private final List<WeakReference<UpdateListener>> listeners = CollectionFactory.newThreadSafeList();
+ @Override
public void addUpdateListener(UpdateListener listener)
{
assert listener != null;
@@ -37,6 +38,7 @@ public class UpdateListenerHubImpl implements UpdateListenerHub
/**
* Notifies all {@link UpdateListener}s.
*/
+ @Override
public void fireCheckForUpdates()
{
List<WeakReference<UpdateListener>> deadReferences = CollectionFactory.newList();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ValueObjectProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ValueObjectProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ValueObjectProvider.java
index 828c669..4766fcf 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ValueObjectProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ValueObjectProvider.java
@@ -42,6 +42,7 @@ public class ValueObjectProvider implements ObjectProvider
this.typeCoercer = typeCoercer;
}
+ @Override
public <T> T provide(Class<T> objectType, AnnotationProvider annotationProvider, ObjectLocator locator)
{
Value annotation = annotationProvider.getAnnotation(Value.class);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/CronExpression.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/CronExpression.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/CronExpression.java
index 864c61a..e2a3c75 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/CronExpression.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/CronExpression.java
@@ -386,6 +386,7 @@ public class CronExpression implements Serializable
*
* @return a string representation of the <CODE>CronExpression</CODE>
*/
+ @Override
public String toString()
{
return cronExpression;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/PeriodicExecutorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/PeriodicExecutorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/PeriodicExecutorImpl.java
index 0177c56..abfcde9 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/PeriodicExecutorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/PeriodicExecutorImpl.java
@@ -68,6 +68,7 @@ public class PeriodicExecutorImpl implements PeriodicExecutor, Runnable
nextExecution = schedule.firstExecution();
}
+ @Override
public String getName()
{
return name;
@@ -79,16 +80,19 @@ public class PeriodicExecutorImpl implements PeriodicExecutor, Runnable
}
+ @Override
public synchronized boolean isExecuting()
{
return executing;
}
+ @Override
public synchronized boolean isCanceled()
{
return canceled;
}
+ @Override
public synchronized void cancel()
{
canceled = true;
@@ -166,6 +170,7 @@ public class PeriodicExecutorImpl implements PeriodicExecutor, Runnable
}
}
+ @Override
public Void invoke()
{
if (logger.isDebugEnabled())
@@ -196,6 +201,7 @@ public class PeriodicExecutorImpl implements PeriodicExecutor, Runnable
{
hub.addRegistryShutdownListener(new Runnable()
{
+ @Override
public void run()
{
registryDidShutdown();
@@ -217,6 +223,7 @@ public class PeriodicExecutorImpl implements PeriodicExecutor, Runnable
}
+ @Override
public synchronized PeriodicJob addJob(Schedule schedule, String name, Runnable job)
{
assert schedule != null;
@@ -242,6 +249,7 @@ public class PeriodicExecutorImpl implements PeriodicExecutor, Runnable
return periodicJob;
}
+ @Override
public void run()
{
while (!isShutdown())
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/AbstractResource.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/AbstractResource.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/AbstractResource.java
index 7020cb9..f85cf02 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/AbstractResource.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/AbstractResource.java
@@ -64,11 +64,13 @@ public abstract class AbstractResource extends LockSupport implements Resource
this.path = path.startsWith("/") ? path.substring(1) : path;
}
+ @Override
public final String getPath()
{
return path;
}
+ @Override
public final String getFile()
{
return extractFile(path);
@@ -81,6 +83,7 @@ public abstract class AbstractResource extends LockSupport implements Resource
return path.substring(slashx + 1);
}
+ @Override
public final String getFolder()
{
int slashx = path.lastIndexOf('/');
@@ -88,6 +91,7 @@ public abstract class AbstractResource extends LockSupport implements Resource
return (slashx < 0) ? "" : path.substring(0, slashx);
}
+ @Override
public final Resource forFile(String relativePath)
{
assert relativePath != null;
@@ -140,6 +144,7 @@ public abstract class AbstractResource extends LockSupport implements Resource
return createResource(path.toString());
}
+ @Override
public final Resource forLocale(Locale locale)
{
try
@@ -202,6 +207,7 @@ public abstract class AbstractResource extends LockSupport implements Resource
return null;
}
+ @Override
public final Resource withExtension(String extension)
{
assert InternalUtils.isNonBlank(extension);
@@ -228,6 +234,7 @@ public abstract class AbstractResource extends LockSupport implements Resource
/**
* Simple check for whether {@link #toURL()} returns null or not.
*/
+ @Override
public boolean exists()
{
try
@@ -266,6 +273,7 @@ public abstract class AbstractResource extends LockSupport implements Resource
/**
* Obtains the URL for the Resource and opens the stream, wrapped by a BufferedInputStream.
*/
+ @Override
public InputStream openStream() throws IOException
{
URL url = toURL();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ClasspathResource.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ClasspathResource.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ClasspathResource.java
index 84e44f6..c49c88a 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ClasspathResource.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ClasspathResource.java
@@ -50,6 +50,7 @@ public final class ClasspathResource extends AbstractResource
return new ClasspathResource(classLoader, path);
}
+ @Override
public URL toURL()
{
try
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrier.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrier.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrier.java
index fd33d1f..f861e8d 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrier.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrier.java
@@ -105,6 +105,7 @@ public class ConcurrentBarrier
{
Invokable<Void> invokable = new Invokable<Void>()
{
+ @Override
public Void invoke()
{
runnable.run();
@@ -195,6 +196,7 @@ public class ConcurrentBarrier
{
Invokable<Void> invokable = new Invokable<Void>()
{
+ @Override
public Void invoke()
{
runnable.run();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConstructionPlan.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConstructionPlan.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConstructionPlan.java
index 9b702fc..e87ac39 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConstructionPlan.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConstructionPlan.java
@@ -55,6 +55,7 @@ public class ConstructionPlan<T> implements ObjectCreator<T>
return this;
}
+ @Override
public T createObject()
{
T result = tracker.invoke(description, instanceConstructor);
@@ -73,6 +74,7 @@ public class ConstructionPlan<T> implements ObjectCreator<T>
{
tracker.run(plan.getDescription(), new Runnable()
{
+ @Override
public void run()
{
plan.initialize(newInstance);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConstructorInvoker.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConstructorInvoker.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConstructorInvoker.java
index 17bd6da..3eea5ab 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConstructorInvoker.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConstructorInvoker.java
@@ -38,6 +38,7 @@ public class ConstructorInvoker<T> implements Invokable<T>
this.constructorParameters = constructorParameters;
}
+ @Override
public T invoke()
{
Throwable fail;
[3/7] Required Java version is now 1.6,
this applies to building as well as to using Tapestry
Posted by jk...@apache.org.
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DelegatingInjectionResources.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DelegatingInjectionResources.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DelegatingInjectionResources.java
index e91741d..c3214ae 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DelegatingInjectionResources.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DelegatingInjectionResources.java
@@ -31,6 +31,7 @@ public class DelegatingInjectionResources implements InjectionResources
this.next = next;
}
+ @Override
public <T> T findResource(Class<T> type, Type genericType)
{
T result = first.findResource(type, genericType);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DummyLock.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DummyLock.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DummyLock.java
index bb5d903..fd20a43 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DummyLock.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DummyLock.java
@@ -23,10 +23,12 @@ import java.util.concurrent.locks.Lock;
*/
public class DummyLock implements Lock
{
+ @Override
public void lock()
{
}
+ @Override
public void lockInterruptibly() throws InterruptedException
{
}
@@ -34,23 +36,27 @@ public class DummyLock implements Lock
/**
* Returns null.
*/
+ @Override
public Condition newCondition()
{
return null;
}
/** @return true */
+ @Override
public boolean tryLock()
{
return true;
}
/** @return true */
+ @Override
public boolean tryLock(long time, TimeUnit unit) throws InterruptedException
{
return true;
}
+ @Override
public void unlock()
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java
index 5fd8c24..1a6dd80 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java
@@ -486,16 +486,19 @@ public class GenericsUtils
{
return new ParameterizedType()
{
+ @Override
public Type[] getActualTypeArguments()
{
return typeArguments;
}
+ @Override
public Type getRawType()
{
return rawType;
}
+ @Override
public Type getOwnerType()
{
return ownerType;
@@ -513,6 +516,7 @@ public class GenericsUtils
{
return new GenericArrayType()
{
+ @Override
public Type getGenericComponentType()
{
return componentType;
@@ -536,11 +540,13 @@ public class GenericsUtils
return new WildcardType()
{
+ @Override
public Type[] getUpperBounds()
{
return upperBounds;
}
+ @Override
public Type[] getLowerBounds()
{
return lowerBounds;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/IdToDependencyNode.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/IdToDependencyNode.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/IdToDependencyNode.java
index 3f4a1bc..fadd30c 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/IdToDependencyNode.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/IdToDependencyNode.java
@@ -56,6 +56,7 @@ public class IdToDependencyNode<T>
final DependencyLinker<T> before = new DependencyLinker<T>()
{
+ @Override
public void link(DependencyNode<T> source, DependencyNode<T> target)
{
target.addDependency(source);
@@ -67,6 +68,7 @@ public class IdToDependencyNode<T>
final DependencyLinker<T> after = new DependencyLinker<T>()
{
+ @Override
public void link(DependencyNode<T> source, DependencyNode<T> target)
{
source.addDependency(target);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearch.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearch.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearch.java
index c645807..f1830a7 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearch.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearch.java
@@ -76,16 +76,19 @@ public class InheritanceSearch implements Iterator<Class>, Iterable<Class>
}
}
+ @Override
public Iterator<Class> iterator()
{
return this;
}
+ @Override
public boolean hasNext()
{
return state != State.DONE;
}
+ @Override
public Class next()
{
switch (state)
@@ -147,6 +150,7 @@ public class InheritanceSearch implements Iterator<Class>, Iterable<Class>
* @throws UnsupportedOperationException
* always
*/
+ @Override
public void remove()
{
throw new UnsupportedOperationException();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java
index 3e15834..96c356b 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java
@@ -186,6 +186,7 @@ public class InternalUtils
{
return new ObjectCreator<Object>()
{
+ @Override
public Object createObject()
{
return fixedValue;
@@ -198,6 +199,7 @@ public class InternalUtils
{
final AnnotationProvider provider = new AnnotationProvider()
{
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationClass)
{
return findAnnotation(annotations, annotationClass);
@@ -244,6 +246,7 @@ public class InternalUtils
{
return new ObjectCreator()
{
+ @Override
public Object createObject()
{
return locator.getObject(injectionType, provider);
@@ -284,6 +287,7 @@ public class InternalUtils
final Invokable<ObjectCreator> operation = new Invokable<ObjectCreator>()
{
+ @Override
public ObjectCreator invoke()
{
return calculateInjection(type, genericType, annotations, locator, resources);
@@ -329,6 +333,7 @@ public class InternalUtils
final AnnotationProvider ap = new AnnotationProvider()
{
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationClass)
{
return f.getAnnotation(annotationClass);
@@ -341,6 +346,7 @@ public class InternalUtils
tracker.run(description, new Runnable()
{
+ @Override
public void run()
{
final Class<?> fieldType = f.getType();
@@ -610,16 +616,19 @@ public class InternalUtils
return new Iterator<T>()
{
+ @Override
public boolean hasNext()
{
return normal.hasPrevious();
}
+ @Override
public T next()
{
return normal.previous();
}
+ @Override
public void remove()
{
throw new UnsupportedOperationException();
@@ -704,6 +713,7 @@ public class InternalUtils
Comparator<Constructor> comparator = new Comparator<Constructor>()
{
+ @Override
public int compare(Constructor o1, Constructor o2)
{
return o2.getParameterTypes().length - o1.getParameterTypes().length;
@@ -824,6 +834,7 @@ public class InternalUtils
*/
public static final Mapper<Class, AnnotationProvider> CLASS_TO_AP_MAPPER = new Mapper<Class, AnnotationProvider>()
{
+ @Override
public AnnotationProvider map(final Class element)
{
return toAnnotationProvider(element);
@@ -838,6 +849,7 @@ public class InternalUtils
{
return new AnnotationProvider()
{
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationClass)
{
return annotationClass.cast(element.getAnnotation(annotationClass));
@@ -852,6 +864,7 @@ public class InternalUtils
*/
public static final Mapper<Method, AnnotationProvider> METHOD_TO_AP_MAPPER = new Mapper<Method, AnnotationProvider>()
{
+ @Override
public AnnotationProvider map(final Method element)
{
return toAnnotationProvider(element);
@@ -889,16 +902,19 @@ public class InternalUtils
{
// ServiceDef3 methods:
+ @Override
public AnnotationProvider getClassAnnotationProvider()
{
return toAnnotationProvider(getServiceInterface());
}
+ @Override
public AnnotationProvider getMethodAnnotationProvider(final String methodName, final Class... argumentTypes)
{
return toAnnotationProvider(findMethod(getServiceInterface(), methodName, argumentTypes));
}
+ @Override
public Class getServiceImplementation()
{
return null;
@@ -906,36 +922,43 @@ public class InternalUtils
// ServiceDef2 methods:
+ @Override
public boolean isPreventDecoration()
{
return sd2.isPreventDecoration();
}
+ @Override
public ObjectCreator createServiceCreator(ServiceBuilderResources resources)
{
return sd2.createServiceCreator(resources);
}
+ @Override
public String getServiceId()
{
return sd2.getServiceId();
}
+ @Override
public Set<Class> getMarkers()
{
return sd2.getMarkers();
}
+ @Override
public Class getServiceInterface()
{
return sd2.getServiceInterface();
}
+ @Override
public String getServiceScope()
{
return sd2.getServiceScope();
}
+ @Override
public boolean isEagerLoad()
{
return sd2.isEagerLoad();
@@ -953,6 +976,7 @@ public class InternalUtils
{
// ServiceDef2 methods:
+ @Override
public boolean isPreventDecoration()
{
return false;
@@ -960,31 +984,37 @@ public class InternalUtils
// ServiceDef methods:
+ @Override
public ObjectCreator createServiceCreator(ServiceBuilderResources resources)
{
return sd.createServiceCreator(resources);
}
+ @Override
public String getServiceId()
{
return sd.getServiceId();
}
+ @Override
public Set<Class> getMarkers()
{
return sd.getMarkers();
}
+ @Override
public Class getServiceInterface()
{
return sd.getServiceInterface();
}
+ @Override
public String getServiceScope()
{
return sd.getServiceScope();
}
+ @Override
public boolean isEagerLoad()
{
return sd.isEagerLoad();
@@ -1005,41 +1035,49 @@ public class InternalUtils
return new ModuleDef2()
{
+ @Override
public Set<AdvisorDef> getAdvisorDefs()
{
return Collections.emptySet();
}
+ @Override
public Class getBuilderClass()
{
return md.getBuilderClass();
}
+ @Override
public Set<ContributionDef> getContributionDefs()
{
return md.getContributionDefs();
}
+ @Override
public Set<DecoratorDef> getDecoratorDefs()
{
return md.getDecoratorDefs();
}
+ @Override
public String getLoggerName()
{
return md.getLoggerName();
}
+ @Override
public ServiceDef getServiceDef(String serviceId)
{
return md.getServiceDef(serviceId);
}
+ @Override
public Set<String> getServiceIds()
{
return md.getServiceIds();
}
+ @Override
public Set<StartupDef> getStartups()
{
return Collections.emptySet();
@@ -1057,16 +1095,19 @@ public class InternalUtils
return new ServiceLifecycle2()
{
+ @Override
public boolean requiresProxy()
{
return true;
}
+ @Override
public Object createService(ServiceResources resources, ObjectCreator creator)
{
return lifecycle.createService(resources, creator);
}
+ @Override
public boolean isSingleton()
{
return lifecycle.isSingleton();
@@ -1106,34 +1147,40 @@ public class InternalUtils
return new ContributionDef2()
{
+ @Override
public Set<Class> getMarkers()
{
return Collections.emptySet();
}
+ @Override
public Class getServiceInterface()
{
return null;
}
+ @Override
public void contribute(ModuleBuilderSource moduleSource, ServiceResources resources,
Configuration configuration)
{
contribution.contribute(moduleSource, resources, configuration);
}
+ @Override
public void contribute(ModuleBuilderSource moduleSource, ServiceResources resources,
OrderedConfiguration configuration)
{
contribution.contribute(moduleSource, resources, configuration);
}
+ @Override
public void contribute(ModuleBuilderSource moduleSource, ServiceResources resources,
MappedConfiguration configuration)
{
contribution.contribute(moduleSource, resources, configuration);
}
+ @Override
public String getServiceId()
{
return contribution.getServiceId();
@@ -1159,36 +1206,43 @@ public class InternalUtils
return new ContributionDef3()
{
+ @Override
public boolean isOptional()
{
return false;
}
+ @Override
public String getServiceId()
{
return cd2.getServiceId();
}
+ @Override
public void contribute(ModuleBuilderSource moduleSource, ServiceResources resources, Configuration configuration)
{
cd2.contribute(moduleSource, resources, configuration);
}
+ @Override
public void contribute(ModuleBuilderSource moduleSource, ServiceResources resources, OrderedConfiguration configuration)
{
cd2.contribute(moduleSource, resources, configuration);
}
+ @Override
public void contribute(ModuleBuilderSource moduleSource, ServiceResources resources, MappedConfiguration configuration)
{
cd2.contribute(moduleSource, resources, configuration);
}
+ @Override
public Set<Class> getMarkers()
{
return cd2.getMarkers();
}
+ @Override
public Class getServiceInterface()
{
return cd2.getServiceInterface();
@@ -1213,31 +1267,37 @@ public class InternalUtils
return new AdvisorDef2()
{
+ @Override
public ServiceAdvisor createAdvisor(ModuleBuilderSource moduleSource, ServiceResources resources)
{
return advisor.createAdvisor(moduleSource, resources);
}
+ @Override
public String getAdvisorId()
{
return advisor.getAdvisorId();
}
+ @Override
public String[] getConstraints()
{
return advisor.getConstraints();
}
+ @Override
public boolean matches(ServiceDef serviceDef)
{
return advisor.matches(serviceDef);
}
+ @Override
public Set<Class> getMarkers()
{
return Collections.emptySet();
}
+ @Override
public Class getServiceInterface()
{
return null;
@@ -1262,31 +1322,37 @@ public class InternalUtils
return new DecoratorDef2()
{
+ @Override
public ServiceDecorator createDecorator(ModuleBuilderSource moduleSource, ServiceResources resources)
{
return decorator.createDecorator(moduleSource, resources);
}
+ @Override
public String[] getConstraints()
{
return decorator.getConstraints();
}
+ @Override
public String getDecoratorId()
{
return decorator.getDecoratorId();
}
+ @Override
public boolean matches(ServiceDef serviceDef)
{
return decorator.matches(serviceDef);
}
+ @Override
public Set<Class> getMarkers()
{
return Collections.emptySet();
}
+ @Override
public Class getServiceInterface()
{
return null;
@@ -1334,6 +1400,7 @@ public class InternalUtils
return new Mapper<S, T>()
{
+ @Override
public T map(S value)
{
return coercion.coerce(value);
@@ -1396,6 +1463,7 @@ public class InternalUtils
return new AnnotationProvider()
{
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationClass)
{
return element.getAnnotation(annotationClass);
@@ -1413,6 +1481,7 @@ public class InternalUtils
constructor.getDeclaringClass().getName(),
constructor), new Invokable<ObjectCreator<T>>()
{
+ @Override
public ObjectCreator<T> invoke()
{
validateConstructorForAutobuild(constructor);
@@ -1453,6 +1522,7 @@ public class InternalUtils
final AnnotationProvider ap = new AnnotationProvider()
{
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationClass)
{
return f.getAnnotation(annotationClass);
@@ -1465,6 +1535,7 @@ public class InternalUtils
tracker.run(description, new Runnable()
{
+ @Override
public void run()
{
final Class<?> fieldType = f.getType();
@@ -1519,6 +1590,7 @@ public class InternalUtils
{
plan.add(new InitializationPlan<T>()
{
+ @Override
public String getDescription()
{
return String.format("Injecting %s into field %s of class %s.",
@@ -1527,6 +1599,7 @@ public class InternalUtils
field.getDeclaringClass().getName());
}
+ @Override
public void initialize(T instance)
{
inject(instance, field, injectedValue);
@@ -1555,6 +1628,7 @@ public class InternalUtils
tracker.run("Computing parameters for post-injection method " + method,
new Runnable()
{
+ @Override
public void run()
{
final ObjectCreator[] parameters = InternalUtils.calculateParametersForMethod(method, locator,
@@ -1562,11 +1636,13 @@ public class InternalUtils
plan.add(new InitializationPlan<Object>()
{
+ @Override
public String getDescription()
{
return "Invoking " + method;
}
+ @Override
public void initialize(Object instance)
{
Throwable fail = null;
@@ -1606,6 +1682,7 @@ public class InternalUtils
return tracker.invoke("Creating plan to invoke " + method, new Invokable<ObjectCreator<T>>()
{
+ @Override
public ObjectCreator<T> invoke()
{
ObjectCreator[] methodParameters = calculateParametersForMethod(method, locator, resources, tracker);
@@ -1624,6 +1701,7 @@ public class InternalUtils
*/
public static Mapper<ObjectCreator, Object> CREATE_OBJECT = new Mapper<ObjectCreator, Object>()
{
+ @Override
public Object map(ObjectCreator element)
{
return element.createObject();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LocationImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LocationImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LocationImpl.java
index 211ca3b..1ef232e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LocationImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LocationImpl.java
@@ -49,16 +49,19 @@ public final class LocationImpl implements Location
this.column = column;
}
+ @Override
public Resource getResource()
{
return resource;
}
+ @Override
public int getLine()
{
return line;
}
+ @Override
public int getColumn()
{
return column;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LoggingInvokableWrapper.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LoggingInvokableWrapper.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LoggingInvokableWrapper.java
index acaf2bf..1fe7ddb 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LoggingInvokableWrapper.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LoggingInvokableWrapper.java
@@ -35,6 +35,7 @@ public class LoggingInvokableWrapper<T> implements Invokable<T>
this.delegate = delegate;
}
+ @Override
public T invoke()
{
logger.debug(message);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MapInjectionResources.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MapInjectionResources.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MapInjectionResources.java
index 92aeb67..50a936b 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MapInjectionResources.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MapInjectionResources.java
@@ -26,6 +26,7 @@ public class MapInjectionResources implements InjectionResources
public MapInjectionResources(Map<Class, Object> map) {this.map = map;}
+ @Override
@SuppressWarnings({"unchecked"})
public <T> T findResource(Class<T> type, Type genericType)
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessageFormatterImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessageFormatterImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessageFormatterImpl.java
index 737a12b..f4d8949 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessageFormatterImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessageFormatterImpl.java
@@ -32,6 +32,7 @@ public class MessageFormatterImpl implements MessageFormatter
this.locale = locale;
}
+ @Override
public String format(Object... args)
{
for (int i = 0; i < args.length; i++)
@@ -55,6 +56,7 @@ public class MessageFormatterImpl implements MessageFormatter
*
* @since 5.4
*/
+ @Override
public String toString()
{
return format;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessagesImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessagesImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessagesImpl.java
index 9d7a5b4..c06ef90 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessagesImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessagesImpl.java
@@ -66,6 +66,7 @@ public class MessagesImpl extends AbstractMessages
return properties.get(key);
}
+ @Override
public Set<String> getKeys()
{
return properties.keySet();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MethodInvoker.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MethodInvoker.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MethodInvoker.java
index 53ce6fb..5b54e89 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MethodInvoker.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MethodInvoker.java
@@ -40,6 +40,7 @@ public class MethodInvoker<T> implements Invokable<T>
this.methodParameters = methodParameters;
}
+ @Override
public T invoke()
{
Throwable fail;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Orderer.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Orderer.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Orderer.java
index 565f6e8..9f7adfc 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Orderer.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Orderer.java
@@ -56,6 +56,7 @@ public class Orderer<T>
final DependencyLinker<T> _before = new DependencyLinker<T>()
{
+ @Override
public void link(DependencyNode<T> source, DependencyNode<T> target)
{
target.addDependency(source);
@@ -67,6 +68,7 @@ public class Orderer<T>
final DependencyLinker<T> _after = new DependencyLinker<T>()
{
+ @Override
public void link(DependencyNode<T> source, DependencyNode<T> target)
{
source.addDependency(target);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/TapestryException.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/TapestryException.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/TapestryException.java
index 7332a9d..ef217cb 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/TapestryException.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/TapestryException.java
@@ -58,6 +58,7 @@ public class TapestryException extends RuntimeException implements Locatable
this.location = location;
}
+ @Override
public 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/util/WrongConfigurationTypeGuard.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/WrongConfigurationTypeGuard.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/WrongConfigurationTypeGuard.java
index b18cb0a..3d76c54 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/WrongConfigurationTypeGuard.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/WrongConfigurationTypeGuard.java
@@ -34,6 +34,7 @@ public class WrongConfigurationTypeGuard implements InjectionResources
this.expectedType = expectedType;
}
+ @Override
public <T> T findResource(Class<T> type, Type genericType)
{
if (type == guardType)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/modules/TapestryIOCModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/modules/TapestryIOCModule.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/modules/TapestryIOCModule.java
index 7f95181..6e49788 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/modules/TapestryIOCModule.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/modules/TapestryIOCModule.java
@@ -95,6 +95,7 @@ public final class TapestryIOCModule
return new ServiceLifecycleSource()
{
+ @Override
public ServiceLifecycle get(String scope)
{
return lifecycles.get(scope);
@@ -139,6 +140,7 @@ public final class TapestryIOCModule
ObjectProvider wrapper = new ObjectProvider()
{
+ @Override
public <T> T provide(Class<T> objectType, AnnotationProvider annotationProvider, ObjectLocator locator)
{
return serviceOverride.getServiceOverrideProvider().provide(objectType, annotationProvider, locator);
@@ -188,6 +190,7 @@ public final class TapestryIOCModule
{
add(configuration, Object.class, String.class, new Coercion<Object, String>()
{
+ @Override
public String coerce(Object input)
{
return input.toString();
@@ -196,6 +199,7 @@ public final class TapestryIOCModule
add(configuration, Object.class, Boolean.class, new Coercion<Object, Boolean>()
{
+ @Override
public Boolean coerce(Object input)
{
return input != null;
@@ -204,6 +208,7 @@ public final class TapestryIOCModule
add(configuration, String.class, Double.class, new Coercion<String, Double>()
{
+ @Override
public Double coerce(String input)
{
return new Double(input);
@@ -215,6 +220,7 @@ public final class TapestryIOCModule
add(configuration, String.class, BigDecimal.class, new Coercion<String, BigDecimal>()
{
+ @Override
public BigDecimal coerce(String input)
{
return new BigDecimal(input);
@@ -223,6 +229,7 @@ public final class TapestryIOCModule
add(configuration, BigDecimal.class, Double.class, new Coercion<BigDecimal, Double>()
{
+ @Override
public Double coerce(BigDecimal input)
{
return input.doubleValue();
@@ -231,6 +238,7 @@ public final class TapestryIOCModule
add(configuration, String.class, BigInteger.class, new Coercion<String, BigInteger>()
{
+ @Override
public BigInteger coerce(String input)
{
return new BigInteger(input);
@@ -239,6 +247,7 @@ public final class TapestryIOCModule
add(configuration, String.class, Long.class, new Coercion<String, Long>()
{
+ @Override
public Long coerce(String input)
{
return new Long(input);
@@ -247,6 +256,7 @@ public final class TapestryIOCModule
add(configuration, Long.class, Byte.class, new Coercion<Long, Byte>()
{
+ @Override
public Byte coerce(Long input)
{
return input.byteValue();
@@ -255,6 +265,7 @@ public final class TapestryIOCModule
add(configuration, Long.class, Short.class, new Coercion<Long, Short>()
{
+ @Override
public Short coerce(Long input)
{
return input.shortValue();
@@ -263,6 +274,7 @@ public final class TapestryIOCModule
add(configuration, Long.class, Integer.class, new Coercion<Long, Integer>()
{
+ @Override
public Integer coerce(Long input)
{
return input.intValue();
@@ -271,6 +283,7 @@ public final class TapestryIOCModule
add(configuration, Number.class, Long.class, new Coercion<Number, Long>()
{
+ @Override
public Long coerce(Number input)
{
return input.longValue();
@@ -279,6 +292,7 @@ public final class TapestryIOCModule
add(configuration, Double.class, Float.class, new Coercion<Double, Float>()
{
+ @Override
public Float coerce(Double input)
{
return input.floatValue();
@@ -287,6 +301,7 @@ public final class TapestryIOCModule
add(configuration, Long.class, Double.class, new Coercion<Long, Double>()
{
+ @Override
public Double coerce(Long input)
{
return input.doubleValue();
@@ -295,6 +310,7 @@ public final class TapestryIOCModule
add(configuration, String.class, Boolean.class, new Coercion<String, Boolean>()
{
+ @Override
public Boolean coerce(String input)
{
String trimmed = input == null ? "" : input.trim();
@@ -310,6 +326,7 @@ public final class TapestryIOCModule
add(configuration, Number.class, Boolean.class, new Coercion<Number, Boolean>()
{
+ @Override
public Boolean coerce(Number input)
{
return input.longValue() != 0;
@@ -318,6 +335,7 @@ public final class TapestryIOCModule
add(configuration, Void.class, Boolean.class, new Coercion<Void, Boolean>()
{
+ @Override
public Boolean coerce(Void input)
{
return false;
@@ -326,6 +344,7 @@ public final class TapestryIOCModule
add(configuration, Collection.class, Boolean.class, new Coercion<Collection, Boolean>()
{
+ @Override
public Boolean coerce(Collection input)
{
return !input.isEmpty();
@@ -334,6 +353,7 @@ public final class TapestryIOCModule
add(configuration, Object.class, List.class, new Coercion<Object, List>()
{
+ @Override
public List coerce(Object input)
{
return Collections.singletonList(input);
@@ -342,6 +362,7 @@ public final class TapestryIOCModule
add(configuration, Object[].class, List.class, new Coercion<Object[], List>()
{
+ @Override
public List coerce(Object[] input)
{
return Arrays.asList(input);
@@ -350,6 +371,7 @@ public final class TapestryIOCModule
add(configuration, Object[].class, Boolean.class, new Coercion<Object[], Boolean>()
{
+ @Override
public Boolean coerce(Object[] input)
{
return input != null && input.length > 0;
@@ -358,6 +380,7 @@ public final class TapestryIOCModule
add(configuration, Float.class, Double.class, new Coercion<Float, Double>()
{
+ @Override
public Double coerce(Float input)
{
return input.doubleValue();
@@ -366,6 +389,7 @@ public final class TapestryIOCModule
Coercion primitiveArrayCoercion = new Coercion<Object, List>()
{
+ @Override
public List<Object> coerce(Object input)
{
int length = Array.getLength(input);
@@ -389,6 +413,7 @@ public final class TapestryIOCModule
add(configuration, String.class, File.class, new Coercion<String, File>()
{
+ @Override
public File coerce(String input)
{
return new File(input);
@@ -397,6 +422,7 @@ public final class TapestryIOCModule
add(configuration, String.class, TimeInterval.class, new Coercion<String, TimeInterval>()
{
+ @Override
public TimeInterval coerce(String input)
{
return new TimeInterval(input);
@@ -405,6 +431,7 @@ public final class TapestryIOCModule
add(configuration, TimeInterval.class, Long.class, new Coercion<TimeInterval, Long>()
{
+ @Override
public Long coerce(TimeInterval input)
{
return input.milliseconds();
@@ -413,6 +440,7 @@ public final class TapestryIOCModule
add(configuration, Object.class, Object[].class, new Coercion<Object, Object[]>()
{
+ @Override
public Object[] coerce(Object input)
{
return new Object[]
@@ -422,6 +450,7 @@ public final class TapestryIOCModule
add(configuration, Collection.class, Object[].class, new Coercion<Collection, Object[]>()
{
+ @Override
public Object[] coerce(Collection input)
{
return input.toArray();
@@ -430,6 +459,7 @@ public final class TapestryIOCModule
add(configuration, Flow.class, List.class, new Coercion<Flow, List>()
{
+ @Override
public List coerce(Flow input)
{
return input.toList();
@@ -438,6 +468,7 @@ public final class TapestryIOCModule
add(configuration, Flow.class, Boolean.class, new Coercion<Flow, Boolean>()
{
+ @Override
public Boolean coerce(Flow input)
{
return !input.isEmpty();
@@ -511,6 +542,7 @@ public final class TapestryIOCModule
shutdownHub.addRegistryShutdownListener(new Runnable()
{
+ @Override
public void run()
{
executorService.shutdown();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/CoercionTuple.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/CoercionTuple.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/CoercionTuple.java
index 8658686..746de1e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/CoercionTuple.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/CoercionTuple.java
@@ -49,6 +49,7 @@ public final class CoercionTuple<S, T>
this.coercion = coercion;
}
+ @Override
public WT coerce(WS input)
{
return coercion.coerce(input);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/CronSchedule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/CronSchedule.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/CronSchedule.java
index 1c76332..0198d59 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/CronSchedule.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/CronSchedule.java
@@ -34,11 +34,13 @@ public class CronSchedule implements Schedule
}
}
+ @Override
public long firstExecution()
{
return getNextValidTimeAfterNow();
}
+ @Override
public long nextExecution(long previousExecution)
{
return getNextValidTimeAfterNow();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/IntervalSchedule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/IntervalSchedule.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/IntervalSchedule.java
index 1c42ed0..70ecfbf 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/IntervalSchedule.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/IntervalSchedule.java
@@ -36,11 +36,13 @@ public class IntervalSchedule implements Schedule
this.interval = interval;
}
+ @Override
public long firstExecution()
{
return nextExecution(System.currentTimeMillis());
}
+ @Override
public long nextExecution(long previousExecution)
{
return previousExecution + interval;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/AbstractMessages.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/AbstractMessages.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/AbstractMessages.java
index 95641e0..590c337 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/AbstractMessages.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/AbstractMessages.java
@@ -50,11 +50,13 @@ public abstract class AbstractMessages implements Messages
protected abstract String valueForKey(String key);
+ @Override
public boolean contains(String key)
{
return valueForKey(key) != null;
}
+ @Override
public String get(String key)
{
if (contains(key)) return valueForKey(key);
@@ -62,6 +64,7 @@ public abstract class AbstractMessages implements Messages
return String.format("[[missing key: %s]]", key);
}
+ @Override
public MessageFormatter getFormatter(String key)
{
MessageFormatter result = cache.get(key);
@@ -82,6 +85,7 @@ public abstract class AbstractMessages implements Messages
return new MessageFormatterImpl(format, locale);
}
+ @Override
public String format(String key, Object... args)
{
return getFormatter(key).format(args);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java
index 09f464d..f5aff7e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java
@@ -52,16 +52,19 @@ public class CaseInsensitiveMap<V> extends AbstractMap<String, V> implements Ser
this.value = value;
}
+ @Override
public String getKey()
{
return key;
}
+ @Override
public V getValue()
{
return value;
}
+ @Override
public V setValue(V value)
{
V result = this.value;
@@ -98,11 +101,13 @@ public class CaseInsensitiveMap<V> extends AbstractMap<String, V> implements Ser
int current = -1;
+ @Override
public boolean hasNext()
{
return index < size;
}
+ @Override
public Object next()
{
check();
@@ -114,6 +119,7 @@ public class CaseInsensitiveMap<V> extends AbstractMap<String, V> implements Ser
return entries[current];
}
+ @Override
public void remove()
{
check();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/LocalizedNameGenerator.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/LocalizedNameGenerator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/LocalizedNameGenerator.java
index 62c8cdd..6f86cc7 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/LocalizedNameGenerator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/LocalizedNameGenerator.java
@@ -154,6 +154,7 @@ public class LocalizedNameGenerator implements Iterator<String>, Iterable<String
* Returns true if there are more name variants to be returned, false otherwise.
*/
+ @Override
public boolean hasNext()
{
return state != EXHAUSTED;
@@ -166,6 +167,7 @@ public class LocalizedNameGenerator implements Iterator<String>, Iterable<String
* if all variants have been returned.
*/
+ @Override
public String next()
{
if (state == EXHAUSTED)
@@ -239,6 +241,7 @@ public class LocalizedNameGenerator implements Iterator<String>, Iterable<String
/**
* @throws UnsupportedOperationException
*/
+ @Override
public void remove()
{
throw new UnsupportedOperationException();
@@ -247,6 +250,7 @@ public class LocalizedNameGenerator implements Iterator<String>, Iterable<String
/**
* So that LNG may be used with the for loop.
*/
+ @Override
public Iterator<String> iterator()
{
return this;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/util/StringToEnumCoercion.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/util/StringToEnumCoercion.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/util/StringToEnumCoercion.java
index f918773..77c9a8d 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/util/StringToEnumCoercion.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/util/StringToEnumCoercion.java
@@ -51,6 +51,7 @@ public final class StringToEnumCoercion<T extends Enum> implements Coercion<Stri
stringToEnum.put(value.name(), value);
}
+ @Override
public T coerce(String input)
{
if (InternalUtils.isBlank(input))
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/com/example/CounterImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/com/example/CounterImpl.java b/tapestry-ioc/src/test/java/com/example/CounterImpl.java
index dd6cc55..22d592a 100644
--- a/tapestry-ioc/src/test/java/com/example/CounterImpl.java
+++ b/tapestry-ioc/src/test/java/com/example/CounterImpl.java
@@ -24,6 +24,7 @@ public class CounterImpl implements Counter, ReloadAware
private int count;
+ @Override
public boolean shutdownImplementationForReload()
{
ReloadAwareModule.counterReloads++;
@@ -31,6 +32,7 @@ public class CounterImpl implements Counter, ReloadAware
return true;
}
+ @Override
public synchronized int increment()
{
return ++count;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/com/example/ExtraRunnableModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/com/example/ExtraRunnableModule.java b/tapestry-ioc/src/test/java/com/example/ExtraRunnableModule.java
index a00eb96..d65c35d 100644
--- a/tapestry-ioc/src/test/java/com/example/ExtraRunnableModule.java
+++ b/tapestry-ioc/src/test/java/com/example/ExtraRunnableModule.java
@@ -30,11 +30,13 @@ public class ExtraRunnableModule
{
return new ExtraRunnable()
{
+ @Override
public void runOrThrow() throws Exception
{
run();
}
+ @Override
public void run()
{
for (Runnable r : configuration)
@@ -49,6 +51,7 @@ public class ExtraRunnableModule
{
configuration.add("Solo", new Runnable()
{
+ @Override
public void run()
{
InvokeCounts.contributionInvokeCount++;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/AdviceDemoModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/AdviceDemoModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/AdviceDemoModule.java
index 581ac80..c3bad72 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/AdviceDemoModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/AdviceDemoModule.java
@@ -29,6 +29,7 @@ public class AdviceDemoModule
{
return new Greeter()
{
+ @Override
public String getGreeting()
{
return "Advice is Easy!";
@@ -47,6 +48,7 @@ public class AdviceDemoModule
{
MethodAdvice advice = new MethodAdvice()
{
+ @Override
public void advise(MethodInvocation invocation)
{
invocation.proceed();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/BarneyModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/BarneyModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/BarneyModule.java
index 55ea96b..89e6bc6 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/BarneyModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/BarneyModule.java
@@ -44,6 +44,7 @@ public class BarneyModule {
public void contributeSizer(MappedConfiguration<Class, Sizer> configuration) {
Sizer listSizer = new Sizer() {
+ @Override
public int size(Object object) {
List list = (List) object;
@@ -52,6 +53,7 @@ public class BarneyModule {
};
Sizer mapSizer = new Sizer() {
+ @Override
public int size(Object object) {
Map map = (Map) object;
@@ -67,12 +69,14 @@ public class BarneyModule {
@Contribute(Sizer.class)
public void moreSizerContributions(MappedConfiguration<Class, Sizer> configuration) {
Sizer defaultSizer = new Sizer() {
+ @Override
public int size(Object object) {
return 1;
}
};
Sizer nullSizer = new Sizer() {
+ @Override
public int size(Object object) {
return 0;
}
@@ -91,10 +95,12 @@ public class BarneyModule {
return new DecoratorList() {
private List<String> names = CollectionFactory.newList();
+ @Override
public void add(String name) {
names.add(name);
}
+ @Override
public List<String> getNames() {
return names;
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ContributeByClassModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ContributeByClassModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ContributeByClassModule.java
index a1700a0..3fd3ce5 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ContributeByClassModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ContributeByClassModule.java
@@ -26,6 +26,7 @@ public class ContributeByClassModule
{
return new StringTransformer()
{
+ @Override
public String transform(String input)
{
String current = input;
@@ -59,6 +60,7 @@ public class ContributeByClassModule
{
return new StringTransformer()
{
+ @Override
public String transform(String input)
{
return configuration.get("Default").transform(input);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CountingGreeterImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CountingGreeterImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CountingGreeterImpl.java
index 1df3097..8bd15b0 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CountingGreeterImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CountingGreeterImpl.java
@@ -21,6 +21,7 @@ public class CountingGreeterImpl implements Greeter
IntegrationTestFixture.countingGreeterInstantiationCount++;
}
+ @Override
public String getGreeting()
{
return "Hello";
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CyclicMOPModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CyclicMOPModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CyclicMOPModule.java
index 0a95fd9..775fc75 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CyclicMOPModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CyclicMOPModule.java
@@ -34,6 +34,7 @@ public class CyclicMOPModule
{
return new Runnable()
{
+ @Override
public void run()
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FailInConstructorRunnable.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FailInConstructorRunnable.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FailInConstructorRunnable.java
index 1957999..1e5be21 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FailInConstructorRunnable.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FailInConstructorRunnable.java
@@ -21,6 +21,7 @@ public class FailInConstructorRunnable implements Runnable
throw new RuntimeException("Failure in Runnable constructor.");
}
+ @Override
public void run()
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FieldResourceServiceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FieldResourceServiceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FieldResourceServiceImpl.java
index e9b2936..a60f4fe 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FieldResourceServiceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FieldResourceServiceImpl.java
@@ -29,11 +29,13 @@ public class FieldResourceServiceImpl implements FieldResourceService
@InjectResource
private Collection<String> configuration;
+ @Override
public String getServiceId()
{
return resources.getServiceId();
}
+ @Override
public List<String> getLabels()
{
List<String> result = CollectionFactory.newList(configuration);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FredModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FredModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FredModule.java
index c61301c..7ec3cae 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FredModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FredModule.java
@@ -38,6 +38,7 @@ public class FredModule
{
return new Runnable()
{
+ @Override
public void run()
{
}
@@ -72,6 +73,7 @@ public class FredModule
return new NameListHolder()
{
+ @Override
public List<String> getNames()
{
return sorted;
@@ -84,6 +86,7 @@ public class FredModule
return new NameListHolder()
{
+ @Override
public List<String> getNames()
{
return configuration;
@@ -107,11 +110,13 @@ public class FredModule
{
return new StringLookup()
{
+ @Override
public String lookup(String key)
{
return configuration.get(key);
}
+ @Override
public List<String> keys()
{
return InternalUtils.sortedKeys(configuration);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule.java
index b3605c5..f30df5f 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule.java
@@ -29,6 +29,7 @@ public class GreeterModule
{
return new Greeter()
{
+ @Override
public String getGreeting()
{
return "Hello";
@@ -40,6 +41,7 @@ public class GreeterModule
{
return new Greeter()
{
+ @Override
public String getGreeting()
{
return "Goodbye";
@@ -52,6 +54,7 @@ public class GreeterModule
{
return new Greeter()
{
+ @Override
public String getGreeting()
{
return "Blue";
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule2.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule2.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule2.java
index c226c9c..dc8cb50 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule2.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule2.java
@@ -22,6 +22,7 @@ public class GreeterModule2
{
return new Greeter()
{
+ @Override
public String getGreeting()
{
return "Green";
@@ -34,6 +35,7 @@ public class GreeterModule2
{
return new Greeter()
{
+ @Override
public String getGreeting()
{
return "Blue";
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterServiceOverrideModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterServiceOverrideModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterServiceOverrideModule.java
index 9bbede8..8eca5be 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterServiceOverrideModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterServiceOverrideModule.java
@@ -20,6 +20,7 @@ public class GreeterServiceOverrideModule
{
return new Greeter()
{
+ @Override
public String getGreeting()
{
return "Hello";
@@ -31,6 +32,7 @@ public class GreeterServiceOverrideModule
{
configuration.add(Greeter.class, new Greeter()
{
+ @Override
public String getGreeting()
{
return "Override Greeting";
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InjectionCheckImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InjectionCheckImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InjectionCheckImpl.java
index dec588a..c9f26e8 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InjectionCheckImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InjectionCheckImpl.java
@@ -31,11 +31,13 @@ public class InjectionCheckImpl implements InjectionCheck
this.configuration = configuration;
}
+ @Override
public Logger getLogger()
{
return logger;
}
+ @Override
public Object getValue(String key)
{
return configuration.get(key);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/IntHolderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/IntHolderImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/IntHolderImpl.java
index c6a0274..8c3c9ef 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/IntHolderImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/IntHolderImpl.java
@@ -23,6 +23,7 @@ public class IntHolderImpl implements IntHolder
this.value = value;
}
+ @Override
public int getValue()
{
return value;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InvalidContributeDefModule2.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InvalidContributeDefModule2.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InvalidContributeDefModule2.java
index 0fcb442..eb065d8 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InvalidContributeDefModule2.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InvalidContributeDefModule2.java
@@ -27,6 +27,7 @@ public class InvalidContributeDefModule2
return new NameListHolder()
{
+ @Override
public List<String> getNames()
{
return configuration;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InvalidContributeDefModule3.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InvalidContributeDefModule3.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InvalidContributeDefModule3.java
index 20e0556..9554ca3 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InvalidContributeDefModule3.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InvalidContributeDefModule3.java
@@ -27,6 +27,7 @@ public class InvalidContributeDefModule3
return new Runnable()
{
+ @Override
public void run()
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/LocalModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/LocalModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/LocalModule.java
index 7cc5340..7cab003 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/LocalModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/LocalModule.java
@@ -22,6 +22,7 @@ public class LocalModule
{
return new Greeter()
{
+ @Override
public String getGreeting()
{
return "Hello, y'all!";
@@ -33,10 +34,12 @@ public class LocalModule
{
return new StringHolder()
{
+ @Override
public void setValue(String value)
{
}
+ @Override
public String getValue()
{
return greeter.getGreeting();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/NoImplementationClassForSimpleIdModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/NoImplementationClassForSimpleIdModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/NoImplementationClassForSimpleIdModule.java
index f55bce4..1c5a289 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/NoImplementationClassForSimpleIdModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/NoImplementationClassForSimpleIdModule.java
@@ -20,6 +20,7 @@ public class NoImplementationClassForSimpleIdModule
{
binder.bind(Runnable.class, new ServiceBuilder<Runnable>()
{
+ @Override
public Runnable buildService(ServiceResources resources)
{
return null;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RecursiveConstructorModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RecursiveConstructorModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RecursiveConstructorModule.java
index 5b99bbd..b06a993 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RecursiveConstructorModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RecursiveConstructorModule.java
@@ -32,6 +32,7 @@ public class RecursiveConstructorModule
{
return new Runnable()
{
+ @Override
public void run()
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RedGreeterImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RedGreeterImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RedGreeterImpl.java
index 80d274e..78e5db7 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RedGreeterImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RedGreeterImpl.java
@@ -20,6 +20,7 @@ import org.apache.tapestry5.ioc.annotations.Marker;
public class RedGreeterImpl implements Greeter
{
+ @Override
public String getGreeting()
{
return null;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RegistryBuilderTestModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RegistryBuilderTestModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RegistryBuilderTestModule.java
index 9b8732f..719db46 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RegistryBuilderTestModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RegistryBuilderTestModule.java
@@ -23,6 +23,7 @@ public class RegistryBuilderTestModule
{
return new Square()
{
+ @Override
public long square(long input)
{
return input * input;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RocketImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RocketImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RocketImpl.java
index 9384bc8..3d534e0 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RocketImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RocketImpl.java
@@ -19,6 +19,7 @@ import org.apache.tapestry5.ioc.annotations.PreventServiceDecoration;
@PreventServiceDecoration
public class RocketImpl implements Rocket
{
+ @Override
public String getCountdown()
{
return "3, 2, 1, Launch!";
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceBuilderModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceBuilderModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceBuilderModule.java
index fcb9b48..4e9b78f 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceBuilderModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceBuilderModule.java
@@ -24,10 +24,12 @@ public class ServiceBuilderModule
{
binder.bind(Greeter.class, new ServiceBuilder<Greeter>()
{
+ @Override
public Greeter buildService(ServiceResources resources)
{
return new Greeter()
{
+ @Override
public String getGreeting()
{
return "Greetings from service Greeter.";
@@ -38,6 +40,7 @@ public class ServiceBuilderModule
binder.bind(Greeter.class, new ServiceBuilder<Greeter>()
{
+ @Override
public Greeter buildService(ServiceResources resources)
{
throw new RuntimeException("Failure inside ServiceBuilder callback.");
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceIdGreeter.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceIdGreeter.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceIdGreeter.java
index 4fdc614..aa74783 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceIdGreeter.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceIdGreeter.java
@@ -20,6 +20,7 @@ public class ServiceIdGreeter implements Greeter
{
private String greeting;
+ @Override
public String getGreeting()
{
return greeting;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SpecificDecoratorModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SpecificDecoratorModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SpecificDecoratorModule.java
index 45dfe66..1f5c7f1 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SpecificDecoratorModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SpecificDecoratorModule.java
@@ -20,6 +20,7 @@ public class SpecificDecoratorModule
{
return new Greeter()
{
+ @Override
public String getGreeting()
{
return delegate.getGreeting().toUpperCase();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StaticModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StaticModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StaticModule.java
index 50f3f2a..84b4a91 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StaticModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StaticModule.java
@@ -39,6 +39,7 @@ public class StaticModule {
public static Runnable buildFred() {
return new Runnable() {
+ @Override
public void run() {
setFredRan(true);
}
@@ -47,6 +48,7 @@ public class StaticModule {
public static Runnable buildBarney() {
return new Runnable() {
+ @Override
public void run() {
}
};
@@ -54,6 +56,7 @@ public class StaticModule {
public static Runnable decorateBarney(final Object delegate, String serviseId) {
return new Runnable() {
+ @Override
public void run() {
setDecoratorRan(true);
@@ -88,6 +91,7 @@ public class StaticModule {
public static NameListHolder buildNames(final Collection<String> configuration) {
return new NameListHolder() {
+ @Override
public List<String> getNames() {
List<String> result = CollectionFactory.newList(configuration);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StringHolderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StringHolderImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StringHolderImpl.java
index 495d980..f433ad4 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StringHolderImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StringHolderImpl.java
@@ -24,12 +24,14 @@ public class StringHolderImpl implements StringHolder
{
private String value;
+ @Override
@SimpleAnnotation("StringHolderImpl#getValue()")
public String getValue()
{
return value;
}
+ @Override
public void setValue(String value)
{
this.value = value;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SymbolExpandingTransformer.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SymbolExpandingTransformer.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SymbolExpandingTransformer.java
index 044e3a6..1526274 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SymbolExpandingTransformer.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SymbolExpandingTransformer.java
@@ -22,6 +22,7 @@ public class SymbolExpandingTransformer implements StringTransformer
public SymbolExpandingTransformer(SymbolSource symbolSource) {this.symbolSource = symbolSource;}
+ @Override
public String transform(String input)
{
return symbolSource.expandSymbols(input);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnbuildablePingable.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnbuildablePingable.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnbuildablePingable.java
index a1edc1a..76432c1 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnbuildablePingable.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnbuildablePingable.java
@@ -23,6 +23,7 @@ public class UnbuildablePingable implements Pingable
{
}
+ @Override
public void ping()
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnknownColorGreeterImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnknownColorGreeterImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnknownColorGreeterImpl.java
index 2dfbd8e..3dee8d5 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnknownColorGreeterImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnknownColorGreeterImpl.java
@@ -17,6 +17,7 @@ package org.apache.tapestry5.ioc;
public class UnknownColorGreeterImpl implements Greeter
{
+ @Override
public String getGreeting()
{
return null;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UppercaseStringTransformer.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UppercaseStringTransformer.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UppercaseStringTransformer.java
index 5cab33f..24637e7 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UppercaseStringTransformer.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UppercaseStringTransformer.java
@@ -16,6 +16,7 @@ package org.apache.tapestry5.ioc;
public class UppercaseStringTransformer implements StringTransformer
{
+ @Override
public String transform(String input)
{
return input.toUpperCase();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AdviseByMarkerModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AdviseByMarkerModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AdviseByMarkerModule.java
index 71f6751..e2905ef 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AdviseByMarkerModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AdviseByMarkerModule.java
@@ -56,6 +56,7 @@ public class AdviseByMarkerModule
receiver.adviseAllMethods(new MethodAdvice()
{
+ @Override
public void advise(MethodInvocation invocation)
{
invocation.proceed();
@@ -80,6 +81,7 @@ public class AdviseByMarkerModule
{
return new Greeter()
{
+ @Override
public String getGreeting()
{
return "Red";
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AdviseByMarkerModule2.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AdviseByMarkerModule2.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AdviseByMarkerModule2.java
index 9865f98..f0b5e74 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AdviseByMarkerModule2.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AdviseByMarkerModule2.java
@@ -32,6 +32,7 @@ public class AdviseByMarkerModule2
receiver.adviseAllMethods(new MethodAdvice()
{
+ @Override
public void advise(MethodInvocation invocation)
{
invocation.proceed();
@@ -70,6 +71,7 @@ public class AdviseByMarkerModule2
{
return new Greeter()
{
+ @Override
public String getGreeting()
{
return "Red";
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AlphabetModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AlphabetModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AlphabetModule.java
index c3b89dc..6fffeb1 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AlphabetModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AlphabetModule.java
@@ -32,6 +32,7 @@ public class AlphabetModule
return new NameListHolder()
{
+ @Override
public List<String> getNames()
{
return configuration;
@@ -61,6 +62,7 @@ public class AlphabetModule
{
return new NameListHolder2()
{
+ @Override
public List<String> getNames()
{
return configuration;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AlphabetModule2.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AlphabetModule2.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AlphabetModule2.java
index d3d1d3c..852caca 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AlphabetModule2.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AlphabetModule2.java
@@ -33,6 +33,7 @@ public class AlphabetModule2
return new NameListHolder()
{
+ @Override
public List<String> getNames()
{
return configuration;
@@ -46,6 +47,7 @@ public class AlphabetModule2
return new NameListHolder()
{
+ @Override
public List<String> getNames()
{
return configuration;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AnnotatedServiceInterfaceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AnnotatedServiceInterfaceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AnnotatedServiceInterfaceImpl.java
index ad5ddca..09c549e 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AnnotatedServiceInterfaceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AnnotatedServiceInterfaceImpl.java
@@ -16,6 +16,7 @@ package org.apache.tapestry5.ioc.internal;
public class AnnotatedServiceInterfaceImpl implements AnnotatedServiceInterface {
+ @Override
public String execute(int i) {
return null;
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule.java
index c722e54..3686a29 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule.java
@@ -70,6 +70,7 @@ public class DecorateByMarkerModule
builder.adviseAllMethods(new MethodAdvice()
{
+ @Override
public void advise(MethodInvocation invocation)
{
invocation.proceed();
@@ -89,6 +90,7 @@ public class DecorateByMarkerModule
{
return new Greeter()
{
+ @Override
public String getGreeting()
{
return "Red";
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule2.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule2.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule2.java
index 2335f89..e3d917a 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule2.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule2.java
@@ -63,6 +63,7 @@ public class DecorateByMarkerModule2
builder.adviseAllMethods(new MethodAdvice()
{
+ @Override
public void advise(MethodInvocation invocation)
{
invocation.proceed();
@@ -82,6 +83,7 @@ public class DecorateByMarkerModule2
{
return new Greeter()
{
+ @Override
public String getGreeting()
{
return "Red";
[7/7] git commit: Required Java version is now 1.6,
this applies to building as well as to using Tapestry
Posted by jk...@apache.org.
Required Java version is now 1.6, this applies to building as well as to using Tapestry
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/b553edf0
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/b553edf0
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/b553edf0
Branch: refs/heads/master
Commit: b553edf0cd8538e4c8c8562a2bf4daca11a63482
Parents: 5f8deb1
Author: Jochen Kemnade <jo...@eddyson.de>
Authored: Fri May 23 16:25:40 2014 +0200
Committer: Jochen Kemnade <jo...@eddyson.de>
Committed: Fri May 23 16:26:26 2014 +0200
----------------------------------------------------------------------
54_RELEASE_NOTES.md | 4 +
build.gradle | 8 +-
.../plastic/AbstractAnnotationBuilder.java | 5 +
.../plastic/AbstractMethodInvocation.java | 10 ++
.../internal/plastic/AnnotationBuilder.java | 3 +
.../internal/plastic/ClassInstantiatorImpl.java | 5 +
.../plastic/DelegatingAnnotationAccess.java | 2 +
.../internal/plastic/EmptyAnnotationAccess.java | 2 +
.../plastic/FailureMethodInvocationResult.java | 4 +
.../internal/plastic/FieldHandleImpl.java | 2 +
.../plastic/InstructionBuilderImpl.java | 67 ++++++++
.../internal/plastic/LocalVariable.java | 1 +
.../internal/plastic/MethodAdviceManager.java | 9 ++
.../internal/plastic/MethodHandleImpl.java | 2 +
.../internal/plastic/MethodParameterImpl.java | 2 +
.../internal/plastic/NoopDelegate.java | 2 +
.../internal/plastic/PlasticClassImpl.java | 28 ++++
.../internal/plastic/PlasticClassPool.java | 13 ++
.../internal/plastic/PlasticFieldImpl.java | 21 +++
.../internal/plastic/PlasticMember.java | 2 +
.../internal/plastic/PlasticMethodImpl.java | 19 +++
.../plastic/SuccessMethodInvocationResult.java | 4 +
.../internal/plastic/SwitchBlockImpl.java | 3 +
.../internal/plastic/TryCatchBlockImpl.java | 3 +
.../tapestry5/plastic/MethodDescription.java | 1 +
.../tapestry5/plastic/PlasticManager.java | 2 +
.../tapestry5/plastic/test/NoopAdvice.java | 1 +
.../java/testsubjects/AccessMethodsSubject.java | 2 +
.../ProtectedFieldCollaborator.java | 1 +
.../testsubjects/TestInjectTransformer.java | 1 +
.../modules/BeanValidatorModule.java | 7 +
.../internal/beanvalidator/BaseCCD.java | 2 +
.../beanvalidator/BeanFieldValidator.java | 5 +
.../BeanFieldValidatorDefaultSource.java | 2 +
.../BeanValidationGroupSourceImpl.java | 1 +
.../beanvalidator/BeanValidatorSourceImpl.java | 2 +
.../ClientConstraintDescriptorImpl.java | 1 +
.../beanvalidator/MessageInterpolatorImpl.java | 2 +
.../org/example/testapp/services/AppModule.java | 1 +
.../internal/clojure/AnnotationMapper.java | 1 +
.../internal/clojure/ClojureBuilderImpl.java | 4 +
.../internal/clojure/DefaultMapper.java | 1 +
.../org/apache/tapestry5/func/AbstractFlow.java | 30 ++++
.../org/apache/tapestry5/func/ArrayFlow.java | 14 ++
.../org/apache/tapestry5/func/EmptyFlow.java | 18 +++
.../main/java/org/apache/tapestry5/func/F.java | 28 ++++
.../org/apache/tapestry5/func/Interleaver.java | 2 +
.../org/apache/tapestry5/func/LazyConcat.java | 1 +
.../org/apache/tapestry5/func/LazyDrop.java | 1 +
.../org/apache/tapestry5/func/LazyFilter.java | 1 +
.../org/apache/tapestry5/func/LazyFirst.java | 1 +
.../org/apache/tapestry5/func/LazyFlow.java | 3 +
.../org/apache/tapestry5/func/LazyIterator.java | 1 +
.../apache/tapestry5/func/LazyMapped2Value.java | 1 +
.../apache/tapestry5/func/LazyMappedValue.java | 1 +
.../org/apache/tapestry5/func/LazyMapper.java | 1 +
.../org/apache/tapestry5/func/LazyMapper2.java | 1 +
.../org/apache/tapestry5/func/LazyRange.java | 1 +
.../org/apache/tapestry5/func/LazyTake.java | 1 +
.../org/apache/tapestry5/func/LazyWalk.java | 1 +
.../java/org/apache/tapestry5/func/LazyZip.java | 1 +
.../org/apache/tapestry5/func/LazyZipValue.java | 1 +
.../org/apache/tapestry5/func/StaticValue.java | 1 +
.../apache/tapestry5/func/ZippedFlowImpl.java | 31 ++++
.../org/apache/tapestry5/func/BaseFuncTest.java | 3 +
.../org/apache/tapestry5/func/FuncTest.java | 14 ++
.../org/apache/tapestry5/func/MapperTest.java | 3 +
.../org/apache/tapestry5/func/RangeTests.java | 1 +
.../apache/tapestry5/func/ZippedFlowTests.java | 3 +
.../hibernate/modules/HibernateCoreModule.java | 2 +
.../hibernate/DefaultHibernateConfigurer.java | 1 +
.../hibernate/HibernateSessionManagerImpl.java | 4 +
.../hibernate/HibernateSessionSourceImpl.java | 4 +
.../HibernateTransactionAdvisorImpl.java | 2 +
.../HibernateTransactionDecoratorImpl.java | 1 +
.../PackageNameHibernateConfigurer.java | 1 +
.../HibernateSessionSourceImplTest.java | 1 +
.../HibernateTransactionDecoratorImplTest.java | 4 +
.../hibernate/HibernateGridDataSource.java | 4 +
.../hibernate/modules/HibernateModule.java | 1 +
.../internal/hibernate/CommitAfterWorker.java | 2 +
...tityApplicationStatePersistenceStrategy.java | 2 +
.../hibernate/HibernateEntityValueEncoder.java | 2 +
.../internal/hibernate/PersistedEntity.java | 1 +
.../hibernate/PersistedTransientEntity.java | 1 +
.../org/example/app0/services/AppModule.java | 1 +
.../org/example/app0/services/UserDAOImpl.java | 4 +
.../ioc/test/TapestryIOCJUnit4ClassRunner.java | 12 ++
.../apache/tapestry5/ioc/test/MapModuleDef.java | 13 ++
.../org/apache/tapestry5/ioc/BaseLocatable.java | 1 +
.../AbstractReloadableObjectCreator.java | 5 +
.../ioc/internal/AbstractServiceCreator.java | 1 +
.../tapestry5/ioc/internal/AdvisorDefImpl.java | 2 +
.../ioc/internal/AdvisorStackBuilder.java | 2 +
.../ioc/internal/AnnotationAccessImpl.java | 2 +
.../ioc/internal/ConstructorServiceCreator.java | 1 +
.../ioc/internal/ContributionDefImpl.java | 7 +
.../ioc/internal/DecoratorDefImpl.java | 2 +
.../ioc/internal/DefaultModuleDefImpl.java | 14 ++
.../tapestry5/ioc/internal/IdMatcherImpl.java | 1 +
.../ioc/internal/InterceptorStackBuilder.java | 2 +
.../LifecycleWrappedServiceCreator.java | 1 +
.../ioc/internal/LoggerSourceImpl.java | 2 +
.../tapestry5/ioc/internal/ModuleImpl.java | 21 +++
.../ioc/internal/NullAnnotationProvider.java | 1 +
.../ioc/internal/ObjectLocatorImpl.java | 7 +
.../ioc/internal/OperationTrackerImpl.java | 3 +
.../OperationTrackingObjectCreator.java | 2 +
.../tapestry5/ioc/internal/OrIdMatcher.java | 1 +
.../ioc/internal/PerThreadOperationTracker.java | 3 +
.../ioc/internal/QuietOperationTracker.java | 3 +
.../RecursiveServiceCreationCheckWrapper.java | 1 +
.../tapestry5/ioc/internal/RegistryImpl.java | 49 ++++++
.../tapestry5/ioc/internal/RegistryWrapper.java | 10 ++
.../internal/ReloadableObjectCreatorSource.java | 3 +
...dableServiceImplementationObjectCreator.java | 1 +
.../internal/ServiceActivityTrackerImpl.java | 8 +
.../ioc/internal/ServiceAdvisorImpl.java | 1 +
.../ioc/internal/ServiceBinderImpl.java | 15 ++
.../internal/ServiceBuilderMethodInvoker.java | 1 +
.../ioc/internal/ServiceDecoratorImpl.java | 1 +
.../tapestry5/ioc/internal/ServiceDefImpl.java | 11 ++
.../ioc/internal/ServiceResourcesImpl.java | 15 ++
.../ioc/internal/SingletonServiceLifecycle.java | 3 +
.../tapestry5/ioc/internal/StartupDefImpl.java | 2 +
.../ioc/internal/TypeCoercerProxyImpl.java | 1 +
.../ValidatingConfigurationWrapper.java | 2 +
.../ValidatingMappedConfigurationWrapper.java | 4 +
.../ValidatingOrderedConfigurationWrapper.java | 4 +
.../AbtractAspectInterceptorBuilder.java | 3 +
.../AccessableObjectAnnotationProvider.java | 1 +
.../services/AnnotationProviderChain.java | 1 +
.../internal/services/AspectDecoratorImpl.java | 6 +
.../services/AspectInterceptorBuilderImpl.java | 5 +
.../services/AutobuildObjectProvider.java | 1 +
.../ioc/internal/services/BridgeBuilder.java | 3 +
.../internal/services/CachingObjectCreator.java | 1 +
.../ioc/internal/services/ChainBuilderImpl.java | 6 +
.../internal/services/ClassNameLocatorImpl.java | 3 +
.../services/ClassPropertyAdapterImpl.java | 6 +
.../internal/services/ClasspathScannerImpl.java | 4 +
.../services/ClasspathURLConverterImpl.java | 1 +
.../ioc/internal/services/CompoundCoercion.java | 1 +
.../DefaultImplementationBuilderImpl.java | 2 +
.../services/ExceptionAnalysisImpl.java | 1 +
.../services/ExceptionAnalyzerImpl.java | 1 +
.../internal/services/ExceptionInfoImpl.java | 5 +
.../internal/services/ExceptionTrackerImpl.java | 1 +
.../services/JustInTimeObjectCreator.java | 4 +
.../ioc/internal/services/LazyAdvisorImpl.java | 3 +
.../ioc/internal/services/LoggingAdvice.java | 1 +
.../internal/services/LoggingAdvisorImpl.java | 1 +
.../internal/services/LoggingDecoratorImpl.java | 1 +
.../internal/services/MapSymbolProvider.java | 1 +
.../services/MasterObjectProviderImpl.java | 2 +
.../ioc/internal/services/MethodIterator.java | 1 +
.../internal/services/NonParallelExecutor.java | 7 +
.../internal/services/OperationAdvisorImpl.java | 5 +
.../internal/services/ParallelExecutorImpl.java | 4 +
.../services/PerThreadServiceCreator.java | 1 +
.../services/PerThreadServiceLifecycle.java | 2 +
.../internal/services/PerthreadManagerImpl.java | 12 ++
.../internal/services/PipelineBuilderImpl.java | 2 +
.../services/PlasticClassListenerLogger.java | 1 +
.../services/PlasticProxyFactoryImpl.java | 16 ++
.../internal/services/PropertyAccessImpl.java | 6 +
.../internal/services/PropertyAdapterImpl.java | 15 ++
.../services/PropertyShadowBuilderImpl.java | 4 +
.../services/RegistryShutdownHubImpl.java | 5 +
.../ioc/internal/services/RegistryStartup.java | 1 +
.../services/ResourceSymbolProvider.java | 1 +
.../internal/services/ServiceOverrideImpl.java | 2 +
.../internal/services/StaticObjectProvider.java | 1 +
.../internal/services/StrategyBuilderImpl.java | 4 +
.../ioc/internal/services/StringLocation.java | 3 +
.../internal/services/SymbolObjectProvider.java | 1 +
.../ioc/internal/services/SymbolSourceImpl.java | 2 +
.../services/SystemEnvSymbolProvider.java | 1 +
.../SystemPropertiesSymbolProvider.java | 1 +
.../ioc/internal/services/ThreadLocaleImpl.java | 2 +
.../ioc/internal/services/ThunkCreatorImpl.java | 4 +
.../ioc/internal/services/TypeCoercerImpl.java | 6 +
.../services/UpdateListenerHubImpl.java | 2 +
.../internal/services/ValueObjectProvider.java | 1 +
.../internal/services/cron/CronExpression.java | 1 +
.../services/cron/PeriodicExecutorImpl.java | 8 +
.../ioc/internal/util/AbstractResource.java | 8 +
.../ioc/internal/util/ClasspathResource.java | 1 +
.../ioc/internal/util/ConcurrentBarrier.java | 2 +
.../ioc/internal/util/ConstructionPlan.java | 2 +
.../ioc/internal/util/ConstructorInvoker.java | 1 +
.../util/DelegatingInjectionResources.java | 1 +
.../tapestry5/ioc/internal/util/DummyLock.java | 6 +
.../ioc/internal/util/GenericsUtils.java | 6 +
.../ioc/internal/util/IdToDependencyNode.java | 2 +
.../ioc/internal/util/InheritanceSearch.java | 4 +
.../ioc/internal/util/InternalUtils.java | 78 +++++++++
.../ioc/internal/util/LocationImpl.java | 3 +
.../internal/util/LoggingInvokableWrapper.java | 1 +
.../internal/util/MapInjectionResources.java | 1 +
.../ioc/internal/util/MessageFormatterImpl.java | 2 +
.../ioc/internal/util/MessagesImpl.java | 1 +
.../ioc/internal/util/MethodInvoker.java | 1 +
.../tapestry5/ioc/internal/util/Orderer.java | 2 +
.../ioc/internal/util/TapestryException.java | 1 +
.../util/WrongConfigurationTypeGuard.java | 1 +
.../ioc/modules/TapestryIOCModule.java | 32 ++++
.../tapestry5/ioc/services/CoercionTuple.java | 1 +
.../ioc/services/cron/CronSchedule.java | 2 +
.../ioc/services/cron/IntervalSchedule.java | 2 +
.../tapestry5/ioc/util/AbstractMessages.java | 4 +
.../tapestry5/ioc/util/CaseInsensitiveMap.java | 6 +
.../ioc/util/LocalizedNameGenerator.java | 4 +
.../tapestry5/util/StringToEnumCoercion.java | 1 +
.../src/test/java/com/example/CounterImpl.java | 2 +
.../java/com/example/ExtraRunnableModule.java | 3 +
.../apache/tapestry5/ioc/AdviceDemoModule.java | 2 +
.../org/apache/tapestry5/ioc/BarneyModule.java | 6 +
.../tapestry5/ioc/ContributeByClassModule.java | 2 +
.../tapestry5/ioc/CountingGreeterImpl.java | 1 +
.../apache/tapestry5/ioc/CyclicMOPModule.java | 1 +
.../ioc/FailInConstructorRunnable.java | 1 +
.../tapestry5/ioc/FieldResourceServiceImpl.java | 2 +
.../org/apache/tapestry5/ioc/FredModule.java | 5 +
.../org/apache/tapestry5/ioc/GreeterModule.java | 3 +
.../apache/tapestry5/ioc/GreeterModule2.java | 2 +
.../ioc/GreeterServiceOverrideModule.java | 2 +
.../tapestry5/ioc/InjectionCheckImpl.java | 2 +
.../org/apache/tapestry5/ioc/IntHolderImpl.java | 1 +
.../ioc/InvalidContributeDefModule2.java | 1 +
.../ioc/InvalidContributeDefModule3.java | 1 +
.../org/apache/tapestry5/ioc/LocalModule.java | 3 +
.../NoImplementationClassForSimpleIdModule.java | 1 +
.../ioc/RecursiveConstructorModule.java | 1 +
.../apache/tapestry5/ioc/RedGreeterImpl.java | 1 +
.../ioc/RegistryBuilderTestModule.java | 1 +
.../org/apache/tapestry5/ioc/RocketImpl.java | 1 +
.../tapestry5/ioc/ServiceBuilderModule.java | 3 +
.../apache/tapestry5/ioc/ServiceIdGreeter.java | 1 +
.../tapestry5/ioc/SpecificDecoratorModule.java | 1 +
.../org/apache/tapestry5/ioc/StaticModule.java | 4 +
.../apache/tapestry5/ioc/StringHolderImpl.java | 2 +
.../ioc/SymbolExpandingTransformer.java | 1 +
.../tapestry5/ioc/UnbuildablePingable.java | 1 +
.../tapestry5/ioc/UnknownColorGreeterImpl.java | 1 +
.../ioc/UppercaseStringTransformer.java | 1 +
.../ioc/internal/AdviseByMarkerModule.java | 2 +
.../ioc/internal/AdviseByMarkerModule2.java | 2 +
.../tapestry5/ioc/internal/AlphabetModule.java | 2 +
.../tapestry5/ioc/internal/AlphabetModule2.java | 2 +
.../internal/AnnotatedServiceInterfaceImpl.java | 1 +
.../ioc/internal/DecorateByMarkerModule.java | 2 +
.../ioc/internal/DecorateByMarkerModule2.java | 2 +
.../EagerLoadViaAnnotationServiceImpl.java | 1 +
.../ExceptionInConstructorServiceImpl.java | 1 +
.../internal/ExtraPublicConstructorsModule.java | 1 +
.../MultipleConstructorsAutobuildService.java | 2 +
.../internal/NamedViaAnnotationServiceImpl.java | 1 +
.../NonAnnotatedServiceInterfaceImpl.java | 1 +
.../ioc/internal/NoopClassLoaderDelegate.java | 2 +
.../ioc/internal/RunnableServiceImpl.java | 1 +
.../ServiceIdViaAnnotationServiceImpl.java | 1 +
...ServiceIdViaMethodAnnotationServiceImpl.java | 1 +
.../tapestry5/ioc/internal/TestAdvice.java | 1 +
.../tapestry5/ioc/internal/ToStringService.java | 1 +
.../ioc/internal/ToUpperCaseStringHolder.java | 2 +
.../ioc/internal/UpcaseServiceImpl.java | 1 +
.../ioc/internal/services/StartupModule.java | 1 +
.../ioc/internal/services/ToStringService.java | 1 +
.../ioc/internal/util/ConcurrentTarget.java | 11 ++
.../internal/util/ConcurrentTargetWrapper.java | 2 +
.../ioc/internal/util/DrivableImpl.java | 1 +
.../ioc/internal/util/PlayableImpl.java | 1 +
.../ioc/internal/util/ToyTruckImpl.java | 1 +
.../tapestry5/javadoc/TapestryDocTaglet.java | 11 ++
.../apache/tapestry5/javadoc/XDocStreamer.java | 21 +++
.../internal/jmx/MBeanSupportImpl.java | 4 +
.../example/testapp/services/SampleImpl.java | 1 +
.../internal/jpa/CommitAfterMethodAdvice.java | 1 +
.../internal/jpa/CommitAfterWorker.java | 1 +
.../internal/jpa/EntityManagerManagerImpl.java | 3 +
.../jpa/EntityManagerObjectProvider.java | 2 +
.../internal/jpa/EntityManagerSourceImpl.java | 8 +
.../internal/jpa/JpaTransactionAdvisorImpl.java | 1 +
.../tapestry5/internal/jpa/JpaValueEncoder.java | 2 +
.../PackageNamePersistenceUnitConfigurer.java | 1 +
.../internal/jpa/PersistenceContentHandler.java | 11 ++
.../internal/jpa/PersistenceContextWorker.java | 2 +
.../internal/jpa/PersistenceUnitInfoImpl.java | 32 ++++
.../apache/tapestry5/jpa/JpaGridDataSource.java | 4 +
.../apache/tapestry5/jpa/modules/JpaModule.java | 2 +
.../jpa/EntityManagerSourceImplTest.java | 1 +
.../jpa/JpaTransactionAdvisorImplTest.java | 4 +
.../integration/app5/DummyEntityManager.java | 40 +++++
.../app5/DummyEntityManagerFactory.java | 9 ++
.../app5/DummyPersistenceProvider.java | 3 +
.../org/example/app1/services/AppModule.java | 2 +
.../example/app1/services/impl/UserDAOImpl.java | 4 +
.../example/app2/services/impl/UserDAOImpl.java | 1 +
.../org/example/app3/services/AppModule.java | 1 +
.../org/example/app5/services/AppModule.java | 2 +
.../org/example/app6/services/AppModule.java | 2 +
.../example/app6/services/impl/UserDAOImpl.java | 4 +
.../internal/json/StringToJSONArray.java | 1 +
.../internal/json/StringToJSONObject.java | 1 +
.../apache/tapestry5/json/CompactSession.java | 6 +
.../org/apache/tapestry5/json/JSONArray.java | 2 +
.../org/apache/tapestry5/json/JSONLiteral.java | 1 +
.../org/apache/tapestry5/json/JSONObject.java | 2 +
.../tapestry5/json/PrettyPrintSession.java | 6 +
.../services/KaptchaDataTypeAnalyzer.java | 1 +
.../internal/services/KaptchaProducerImpl.java | 4 +
.../java/kaptcha/demo/services/AppModule.java | 4 +
.../org/apache/tapestry5/test/Jetty7Runner.java | 1 +
.../apache/tapestry5/test/Tomcat6Runner.java | 1 +
.../internal/spring/SpringBeanServiceDef.java | 8 +
.../internal/spring/SpringModuleDef.java | 20 +++
.../internal/spring/StaticObjectCreator.java | 1 +
.../internal/spring/TapestryBeanFactory.java | 1 +
.../tapestry5/spring/modules/SpringModule.java | 2 +
.../org/example/testapp/services/AppModule.java | 1 +
.../testapp/services/FlintstoneImpl.java | 1 +
.../services/SpringStatusProviderFactory.java | 3 +
.../example/testapp/services/UpcaseImpl.java | 1 +
.../services/UpcaseStringTransformerImpl.java | 1 +
.../testapp/services/ViaFactoryFactory.java | 4 +
.../tapestry5/test/ErrorReporterImpl.java | 1 +
.../test/ErrorReportingCommandProcessor.java | 13 ++
.../apache/tapestry5/test/SeleniumTestCase.java | 157 +++++++++++++++++++
.../test/integration/SanityCheckTestSuite.java | 1 +
.../internal/services/MultipartDecoderImpl.java | 4 +
.../services/MultipartServletRequestFilter.java | 1 +
.../services/UploadExceptionFilter.java | 1 +
.../internal/services/UploadedFileItem.java | 7 +
.../tapestry5/upload/modules/UploadModule.java | 1 +
.../upload/internal/services/StubFileItem.java | 17 ++
.../webresources/AbstractMinimizer.java | 2 +
.../webresources/CoffeeScriptCompiler.java | 2 +
.../webresources/ContentChangeTracker.java | 1 +
.../webresources/LessResourceTransformer.java | 3 +
.../ResourceDependenciesSplitter.java | 1 +
.../ResourceTransformerFactoryImpl.java | 10 ++
.../webresources/RhinoExecutorPool.java | 4 +
.../modules/WebResourcesModule.java | 1 +
344 files changed, 1648 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/54_RELEASE_NOTES.md
----------------------------------------------------------------------
diff --git a/54_RELEASE_NOTES.md b/54_RELEASE_NOTES.md
index 6a9ac4d..8044c85 100644
--- a/54_RELEASE_NOTES.md
+++ b/54_RELEASE_NOTES.md
@@ -384,3 +384,7 @@ look and feel.
The Grid component no longer emits CSS class names, instead it renders data attributes into Grid headers, rows, and cells,
such as `data-grid-row="first"`, `data-grid-property="title"`, etc. These attributes may still be referenced using CSS rules
where desired.
+
+## Java 1.6 required
+
+As of version 5.4, Tapestry requires Java 1.6 at least.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 2b7fd18..74b24bd 100755
--- a/build.gradle
+++ b/build.gradle
@@ -106,9 +106,7 @@ allprojects {
idea {
project {
- // Leave at 1.5 to make sure that IDEA doesn't break the build for non-IDEA users by inserting
- // @Override on implementations all over the place.
- languageLevel = "1.5"
+ languageLevel = "1.6"
// But this is what most (all?) of the devs are actually using:
jdkName = "1.7"
}
@@ -150,8 +148,8 @@ subprojects {
apply plugin: "maven" // for deployment
apply plugin: "project-report"
- sourceCompatibility = "1.5"
- targetCompatibility = "1.5"
+ sourceCompatibility = "1.6"
+ targetCompatibility = "1.6"
// See http://jira.codehaus.org/browse/GRADLE-784
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractAnnotationBuilder.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractAnnotationBuilder.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractAnnotationBuilder.java
index f9f54c7..8421b30 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractAnnotationBuilder.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractAnnotationBuilder.java
@@ -42,6 +42,7 @@ public abstract class AbstractAnnotationBuilder extends AnnotationVisitor
throw new IllegalStateException("elementTypeForArrayAttribute() may not be invoked here.");
}
+ @Override
public void visit(String name, Object value)
{
if (value instanceof Type)
@@ -56,6 +57,7 @@ public abstract class AbstractAnnotationBuilder extends AnnotationVisitor
store(name, value);
}
+ @Override
public void visitEnum(String name, String desc, String value)
{
@@ -76,6 +78,7 @@ public abstract class AbstractAnnotationBuilder extends AnnotationVisitor
}
}
+ @Override
public AnnotationVisitor visitAnnotation(final String name, String desc)
{
final AbstractAnnotationBuilder outerBuilder = this;
@@ -101,6 +104,7 @@ public abstract class AbstractAnnotationBuilder extends AnnotationVisitor
* nested annotations. All the arrays of strings and primitives are handled by ASM and become
* a single call to {@link #visit(String, Object)}.
*/
+ @Override
public AnnotationVisitor visitArray(final String name)
{
final List<Object> values = new ArrayList<Object>();
@@ -134,6 +138,7 @@ public abstract class AbstractAnnotationBuilder extends AnnotationVisitor
};
}
+ @Override
public void visitEnd()
{
// Nothing to do here. Subclasses use this as a chance to store a value into an outer
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractMethodInvocation.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractMethodInvocation.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractMethodInvocation.java
index eb9c8cd..cf68617 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractMethodInvocation.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractMethodInvocation.java
@@ -47,17 +47,20 @@ public abstract class AbstractMethodInvocation implements MethodInvocation
checkedException = null;
}
+ @Override
public void rethrow()
{
if (checkedException != null)
throw new RuntimeException(checkedException);
}
+ @Override
public boolean didThrowCheckedException()
{
return checkedException != null;
}
+ @Override
public <T extends Throwable> T getCheckedException(Class<T> exceptionType)
{
assert exceptionType != null;
@@ -68,16 +71,19 @@ public abstract class AbstractMethodInvocation implements MethodInvocation
return null;
}
+ @Override
public Object getInstance()
{
return instance;
}
+ @Override
public InstanceContext getInstanceContext()
{
return instanceContext;
}
+ @Override
public MethodInvocation proceed()
{
if (adviceIndex == bundle.advice.length)
@@ -88,6 +94,7 @@ public abstract class AbstractMethodInvocation implements MethodInvocation
return this;
}
+ @Override
public MethodInvocation setCheckedException(Exception exception)
{
checkedException = exception;
@@ -95,16 +102,19 @@ public abstract class AbstractMethodInvocation implements MethodInvocation
return this;
}
+ @Override
public <T extends Annotation> boolean hasAnnotation(Class<T> annotationType)
{
return getAnnotation(annotationType) != null;
}
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationType)
{
return getMethod().getAnnotation(annotationType);
}
+ @Override
public Method getMethod()
{
return bundle.getMethod(getInstance());
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AnnotationBuilder.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AnnotationBuilder.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AnnotationBuilder.java
index 54e8358..a2101da 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AnnotationBuilder.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AnnotationBuilder.java
@@ -35,6 +35,7 @@ public class AnnotationBuilder extends AbstractAnnotationBuilder
this.attributes = attributes;
}
+ @Override
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
{
// args is null for no-arguments methods
@@ -86,11 +87,13 @@ public class AnnotationBuilder extends AbstractAnnotationBuilder
}
+ @Override
protected void store(String name, Object value)
{
attributes.put(name, value);
}
+ @Override
protected Class elementTypeForArrayAttribute(String name)
{
try
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/ClassInstantiatorImpl.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/ClassInstantiatorImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/ClassInstantiatorImpl.java
index 72d5372..cc93824 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/ClassInstantiatorImpl.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/ClassInstantiatorImpl.java
@@ -53,6 +53,7 @@ public class ClassInstantiatorImpl<T> implements ClassInstantiator<T>, InstanceC
this.withValue = withValue;
}
+ @Override
public <V> ClassInstantiator<T> with(Class<V> valueType, V instanceContextValue)
{
assert valueType != null;
@@ -70,6 +71,7 @@ public class ClassInstantiatorImpl<T> implements ClassInstantiator<T>, InstanceC
instanceContextValue);
}
+ @Override
public <V> V get(Class<V> valueType)
{
V result = find(valueType);
@@ -95,6 +97,7 @@ public class ClassInstantiatorImpl<T> implements ClassInstantiator<T>, InstanceC
return null;
}
+ @Override
public T newInstance()
{
if (Modifier.isAbstract(clazz.getModifiers()))
@@ -112,11 +115,13 @@ public class ClassInstantiatorImpl<T> implements ClassInstantiator<T>, InstanceC
}
}
+ @Override
public Class<T> getInstanceType()
{
return clazz;
}
+ @Override
public String toString()
{
return String.format("ClassInstantiator[%s]", clazz.getName());
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/DelegatingAnnotationAccess.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/DelegatingAnnotationAccess.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/DelegatingAnnotationAccess.java
index 2d1e791..b114b18 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/DelegatingAnnotationAccess.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/DelegatingAnnotationAccess.java
@@ -27,6 +27,7 @@ public class DelegatingAnnotationAccess implements AnnotationAccess
return annotationType.getAnnotation(Inherited.class) != null;
}
+ @Override
public <T extends Annotation> boolean hasAnnotation(Class<T> annotationType)
{
if (primary.hasAnnotation(annotationType))
@@ -35,6 +36,7 @@ public class DelegatingAnnotationAccess implements AnnotationAccess
return isInherited(annotationType) && inherited.hasAnnotation(annotationType);
}
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationType)
{
T fromPrimary = primary.getAnnotation(annotationType);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/EmptyAnnotationAccess.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/EmptyAnnotationAccess.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/EmptyAnnotationAccess.java
index b6ec715..39510ec 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/EmptyAnnotationAccess.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/EmptyAnnotationAccess.java
@@ -26,11 +26,13 @@ public class EmptyAnnotationAccess implements AnnotationAccess
{
}
+ @Override
public <T extends Annotation> boolean hasAnnotation(Class<T> annotationType)
{
return false;
}
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationType)
{
return null;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/FailureMethodInvocationResult.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/FailureMethodInvocationResult.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/FailureMethodInvocationResult.java
index 0c69ae4..84d1b01 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/FailureMethodInvocationResult.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/FailureMethodInvocationResult.java
@@ -27,21 +27,25 @@ public class FailureMethodInvocationResult implements MethodInvocationResult
this.thrown = thrown;
}
+ @Override
public Object getReturnValue()
{
return null;
}
+ @Override
public void rethrow()
{
throw new RuntimeException(thrown);
}
+ @Override
public boolean didThrowCheckedException()
{
return true;
}
+ @Override
public <T extends Throwable> T getCheckedException(Class<T> exceptionType)
{
if (exceptionType.isInstance(thrown))
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/FieldHandleImpl.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/FieldHandleImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/FieldHandleImpl.java
index a873fbb..19e3830 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/FieldHandleImpl.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/FieldHandleImpl.java
@@ -37,6 +37,7 @@ public class FieldHandleImpl implements FieldHandle
return String.format("FieldHandle[%s#%s]", className, fieldName);
}
+ @Override
public Object get(Object instance)
{
checkNullInstance(instance, "get");
@@ -52,6 +53,7 @@ public class FieldHandleImpl implements FieldHandle
className));
}
+ @Override
public void set(Object instance, Object newValue)
{
checkNullInstance(instance, "set");
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderImpl.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderImpl.java
index 6823297..bbead43 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderImpl.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderImpl.java
@@ -106,6 +106,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
this.cache = state.nameCache;
}
+ @Override
public InstructionBuilder returnDefaultValue()
{
check();
@@ -146,6 +147,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder loadThis()
{
check();
@@ -155,6 +157,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder loadNull()
{
check();
@@ -164,6 +167,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder loadArgument(int index)
{
check();
@@ -177,6 +181,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder loadArguments()
{
check();
@@ -189,6 +194,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder invokeSpecial(String containingClassName, MethodDescription description)
{
check();
@@ -198,6 +204,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder invokeVirtual(PlasticMethod method)
{
check();
@@ -210,6 +217,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
description.argumentTypes);
}
+ @Override
public InstructionBuilder invokeVirtual(String className, String returnType, String methodName,
String... argumentTypes)
{
@@ -220,6 +228,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder invokeInterface(String interfaceName, String returnType, String methodName,
String... argumentTypes)
{
@@ -236,6 +245,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
cache.toMethodDescriptor(returnType, argumentTypes));
}
+ @Override
public InstructionBuilder invokeStatic(Class clazz, Class returnType, String methodName, Class... argumentTypes)
{
doInvoke(INVOKESTATIC, clazz, returnType, methodName, argumentTypes);
@@ -249,6 +259,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
PlasticUtils.toTypeNames(argumentTypes));
}
+ @Override
public InstructionBuilder invoke(Method method)
{
check();
@@ -256,6 +267,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return invoke(method.getDeclaringClass(), method.getReturnType(), method.getName(), method.getParameterTypes());
}
+ @Override
public InstructionBuilder invoke(Class clazz, Class returnType, String methodName, Class... argumentTypes)
{
check();
@@ -271,6 +283,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
cache.toDesc(description));
}
+ @Override
public InstructionBuilder returnResult()
{
check();
@@ -284,6 +297,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder boxPrimitive(String typeName)
{
check();
@@ -298,6 +312,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder unboxPrimitive(String typeName)
{
check();
@@ -317,6 +332,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
v.visitMethodInsn(INVOKEVIRTUAL, type.wrapperInternalName, type.toValueMethodName, type.toValueMethodDescriptor);
}
+ @Override
public InstructionBuilder getField(String className, String fieldName, String typeName)
{
check();
@@ -326,6 +342,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder getStaticField(String className, String fieldName, String typeName)
{
check();
@@ -335,6 +352,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder getStaticField(String className, String fieldName, Class fieldType)
{
check();
@@ -342,6 +360,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return getStaticField(className, fieldName, cache.toTypeName(fieldType));
}
+ @Override
public InstructionBuilder putStaticField(String className, String fieldName, Class fieldType)
{
check();
@@ -349,6 +368,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return putStaticField(className, fieldName, cache.toTypeName(fieldType));
}
+ @Override
public InstructionBuilder putStaticField(String className, String fieldName, String typeName)
{
check();
@@ -358,6 +378,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder getField(PlasticField field)
{
check();
@@ -365,6 +386,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return getField(field.getPlasticClass().getClassName(), field.getName(), field.getTypeName());
}
+ @Override
public InstructionBuilder putField(String className, String fieldName, String typeName)
{
check();
@@ -374,6 +396,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder putField(String className, String fieldName, Class fieldType)
{
check();
@@ -381,6 +404,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return putField(className, fieldName, cache.toTypeName(fieldType));
}
+ @Override
public InstructionBuilder getField(String className, String fieldName, Class fieldType)
{
check();
@@ -388,6 +412,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return getField(className, fieldName, cache.toTypeName(fieldType));
}
+ @Override
public InstructionBuilder loadArrayElement(int index, String elementType)
{
check();
@@ -407,6 +432,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder loadArrayElement()
{
check();
@@ -416,6 +442,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder checkcast(String className)
{
check();
@@ -430,6 +457,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder checkcast(Class clazz)
{
check();
@@ -437,6 +465,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return checkcast(cache.toTypeName(clazz));
}
+ @Override
public InstructionBuilder startTryCatch(TryCatchCallback callback)
{
check();
@@ -446,6 +475,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder newInstance(String className)
{
check();
@@ -455,6 +485,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder newInstance(Class clazz)
{
check();
@@ -462,6 +493,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return newInstance(clazz.getName());
}
+ @Override
public InstructionBuilder invokeConstructor(String className, String... argumentTypes)
{
check();
@@ -471,6 +503,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder invokeConstructor(Class clazz, Class... argumentTypes)
{
check();
@@ -478,6 +511,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return invokeConstructor(clazz.getName(), PlasticUtils.toTypeNames(argumentTypes));
}
+ @Override
public InstructionBuilder dupe(int depth)
{
check();
@@ -491,6 +525,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder dupe()
{
check();
@@ -500,6 +535,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder pop()
{
check();
@@ -509,6 +545,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder swap()
{
check();
@@ -518,6 +555,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder loadConstant(Object constant)
{
check();
@@ -532,6 +570,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder loadTypeConstant(String typeName)
{
check();
@@ -543,6 +582,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder loadTypeConstant(Class clazz)
{
check();
@@ -554,6 +594,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder castOrUnbox(String typeName)
{
check();
@@ -569,6 +610,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder throwException(String className, String message)
{
check();
@@ -582,6 +624,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder throwException(Class<? extends Throwable> exceptionType, String message)
{
check();
@@ -589,6 +632,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return throwException(cache.toTypeName(exceptionType), message);
}
+ @Override
public InstructionBuilder throwException()
{
check();
@@ -598,6 +642,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder startSwitch(int min, int max, SwitchCallback callback)
{
check();
@@ -609,6 +654,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder startVariable(String type, final LocalVariableCallback callback)
{
check();
@@ -617,6 +663,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
callback.doBuild(var, builder);
@@ -628,6 +675,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder storeVariable(LocalVariable var)
{
check();
@@ -637,6 +685,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder loadVariable(LocalVariable var)
{
check();
@@ -646,6 +695,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder when(Condition condition, final InstructionBuilderCallback ifTrue)
{
check();
@@ -657,17 +707,20 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return when(condition, new WhenCallback()
{
+ @Override
public void ifTrue(InstructionBuilder builder)
{
ifTrue.doBuild(builder);
}
+ @Override
public void ifFalse(InstructionBuilder builder)
{
}
});
}
+ @Override
public InstructionBuilder when(Condition condition, final WhenCallback callback)
{
check();
@@ -682,6 +735,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
callback.ifTrue(builder);
@@ -694,6 +748,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
callback.ifFalse(builder);
@@ -705,6 +760,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder doWhile(Condition condition, final WhileCallback callback)
{
check();
@@ -718,6 +774,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
callback.buildTest(builder);
@@ -728,6 +785,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
callback.buildBody(builder);
@@ -741,6 +799,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder increment(LocalVariable variable)
{
check();
@@ -752,6 +811,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder arrayLength()
{
check();
@@ -761,22 +821,26 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder iterateArray(final InstructionBuilderCallback callback)
{
startVariable("int", new LocalVariableCallback()
{
+ @Override
public void doBuild(final LocalVariable indexVariable, InstructionBuilder builder)
{
builder.loadConstant(0).storeVariable(indexVariable);
builder.doWhile(Condition.LESS_THAN, new WhileCallback()
{
+ @Override
public void buildTest(InstructionBuilder builder)
{
builder.dupe().arrayLength();
builder.loadVariable(indexVariable).swap();
}
+ @Override
public void buildBody(InstructionBuilder builder)
{
builder.dupe().loadVariable(indexVariable).loadArrayElement();
@@ -792,6 +856,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder dupeWide()
{
check();
@@ -801,6 +866,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder popWide()
{
check();
@@ -810,6 +876,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder compareSpecial(String typeName)
{
check();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/LocalVariable.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/LocalVariable.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/LocalVariable.java
index 9c1ac53..05ef7d5 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/LocalVariable.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/LocalVariable.java
@@ -25,6 +25,7 @@ class LocalVariableImpl implements LocalVariable
this.type = type;
}
+ @Override
public String getType()
{
return type;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodAdviceManager.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodAdviceManager.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodAdviceManager.java
index 92f4d84..870f0c2 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodAdviceManager.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodAdviceManager.java
@@ -206,6 +206,7 @@ class MethodAdviceManager
builder.startSwitch(0, description.argumentTypes.length - 1, new SwitchCallback()
{
+ @Override
public void doSwitch(SwitchBlock block)
{
for (int i = 0; i < description.argumentTypes.length; i++)
@@ -215,6 +216,7 @@ class MethodAdviceManager
block.addCase(i, false, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
String type = description.argumentTypes[index];
@@ -247,6 +249,7 @@ class MethodAdviceManager
builder.loadArgument(0).startSwitch(0, description.argumentTypes.length - 1, new SwitchCallback()
{
+ @Override
public void doSwitch(SwitchBlock block)
{
for (int i = 0; i < description.argumentTypes.length; i++)
@@ -256,6 +259,7 @@ class MethodAdviceManager
block.addCase(i, true, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
String type = description.argumentTypes[index];
@@ -316,11 +320,13 @@ class MethodAdviceManager
builder.startTryCatch(new TryCatchCallback()
{
+ @Override
public void doBlock(TryCatchBlock block)
{
block.addTry(new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.invokeVirtual(plasticClass.className, description.returnType, newMethodName,
@@ -337,6 +343,7 @@ class MethodAdviceManager
{
block.addCatch(exceptionName, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadThis().swap();
@@ -402,6 +409,7 @@ class MethodAdviceManager
builder.startVariable(invocationClassName, new LocalVariableCallback()
{
+ @Override
public void doBuild(final LocalVariable invocation, InstructionBuilder builder)
{
builder.dupe().storeVariable(invocation);
@@ -414,6 +422,7 @@ class MethodAdviceManager
builder.when(Condition.NON_ZERO, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadVariable(invocation).loadTypeConstant(Exception.class);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodHandleImpl.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodHandleImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodHandleImpl.java
index 6f7e662..7bd3c41 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodHandleImpl.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodHandleImpl.java
@@ -32,11 +32,13 @@ public class MethodHandleImpl implements MethodHandle
this.methodIndex = methodIndex;
}
+ @Override
public String toString()
{
return String.format("MethodHandle[%s %s]", className, methodDescription);
}
+ @Override
public MethodInvocationResult invoke(Object instance, Object... arguments)
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodParameterImpl.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodParameterImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodParameterImpl.java
index 77c8680..569a67e 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodParameterImpl.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodParameterImpl.java
@@ -19,6 +19,7 @@ class MethodParameterImpl extends PlasticMember implements MethodParameter
this.index = index;
}
+ @Override
public String getType()
{
plasticClass.check();
@@ -26,6 +27,7 @@ class MethodParameterImpl extends PlasticMember implements MethodParameter
return type;
}
+ @Override
public int getIndex()
{
plasticClass.check();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/NoopDelegate.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/NoopDelegate.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/NoopDelegate.java
index 21499d1..7f1a44d 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/NoopDelegate.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/NoopDelegate.java
@@ -20,10 +20,12 @@ import org.apache.tapestry5.plastic.PlasticManagerDelegate;
public class NoopDelegate implements PlasticManagerDelegate
{
+ @Override
public void transform(PlasticClass plasticClass)
{
}
+ @Override
public ClassInstantiator configureInstantiator(String className, ClassInstantiator instantiator)
{
return instantiator;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java
index eab2882..2b0fc15 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java
@@ -322,6 +322,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return String.format("Class %s has been transformed and may not be directly instantiated.", className);
}
+ @Override
public <T extends Annotation> boolean hasAnnotation(Class<T> annotationType)
{
check();
@@ -329,6 +330,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return annotationAccess.hasAnnotation(annotationType);
}
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationType)
{
check();
@@ -408,6 +410,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
}
+ @Override
public PlasticClass proxyInterface(Class interfaceType, PlasticField field)
{
check();
@@ -424,6 +427,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return this;
}
+ @Override
public ClassInstantiator createInstantiator()
{
lock();
@@ -588,6 +592,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
throw new AssertionError("Could not convert constructor to simple method.");
}
+ @Override
public <T extends Annotation> List<PlasticField> getFieldsWithAnnotation(Class<T> annotationType)
{
check();
@@ -607,6 +612,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return result;
}
+ @Override
public List<PlasticField> getAllFields()
{
check();
@@ -614,6 +620,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return new ArrayList<PlasticField>(fields);
}
+ @Override
public List<PlasticField> getUnclaimedFields()
{
check();
@@ -634,6 +641,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return unclaimedFields;
}
+ @Override
public PlasticMethod introducePrivateMethod(String typeName, String suggestedName, String[] argumentTypes,
String[] exceptionTypes)
{
@@ -650,6 +658,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return introduceMethod(description);
}
+ @Override
public PlasticField introduceField(String className, String suggestedName)
{
check();
@@ -672,6 +681,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return newField;
}
+ @Override
public PlasticField introduceField(Class fieldType, String suggestedName)
{
assert fieldType != null;
@@ -684,6 +694,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return values.contains(input) ? input + "$" + PlasticUtils.nextUID() : input;
}
+ @Override
public <T extends Annotation> List<PlasticMethod> getMethodsWithAnnotation(Class<T> annotationType)
{
check();
@@ -702,6 +713,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return result;
}
+ @Override
public List<PlasticMethod> getMethods()
{
check();
@@ -709,6 +721,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return new ArrayList<PlasticMethod>(methods);
}
+ @Override
public PlasticMethod introduceMethod(MethodDescription description)
{
check();
@@ -736,6 +749,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return result;
}
+ @Override
public PlasticMethod introduceMethod(MethodDescription description, InstructionBuilderCallback callback)
{
check();
@@ -745,6 +759,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return introduceMethod(description).changeImplementation(callback);
}
+ @Override
public PlasticMethod introduceMethod(Method method)
{
check();
@@ -923,6 +938,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
builder.startSwitch(0, nextFieldIndex - 1, new SwitchCallback()
{
+ @Override
public void doSwitch(SwitchBlock block)
{
for (PlasticFieldImpl f : shimFields)
@@ -952,6 +968,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
builder.startSwitch(0, nextFieldIndex - 1, new SwitchCallback()
{
+ @Override
public void doSwitch(SwitchBlock block)
{
for (PlasticFieldImpl f : shimFields)
@@ -983,6 +1000,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
builder.startSwitch(0, nextMethodIndex - 1, new SwitchCallback()
{
+ @Override
public void doSwitch(SwitchBlock block)
{
for (PlasticMethodImpl m : shimMethods)
@@ -1130,11 +1148,13 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
builder.loadThis().getField(className, getInstanceContextFieldName(), InstanceContext.class);
}
+ @Override
public PlasticClass getPlasticClass()
{
return this;
}
+ @Override
public Class<?> getTransformedClass()
{
if (transformedClass == null)
@@ -1150,6 +1170,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return (node.access & (ACC_ABSTRACT | ACC_PRIVATE)) == 0;
}
+ @Override
public String getClassName()
{
return className;
@@ -1165,6 +1186,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return new InstructionBuilderImpl(description, mn, nameCache);
}
+ @Override
public Set<PlasticMethod> introduceInterface(Class interfaceType)
{
check();
@@ -1211,6 +1233,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return introducedMethods;
}
+ @Override
public PlasticClass addToString(final String toStringValue)
{
check();
@@ -1219,6 +1242,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
{
introduceMethod(PlasticUtils.TO_STRING_DESCRIPTION, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadConstant(toStringValue).returnResult();
@@ -1229,11 +1253,13 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return this;
}
+ @Override
public boolean isMethodImplemented(MethodDescription description)
{
return inheritanceData.isImplemented(description.methodName, nameCache.toDesc(description));
}
+ @Override
public boolean isInterfaceImplemented(Class interfaceType)
{
assert interfaceType != null;
@@ -1244,11 +1270,13 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return inheritanceData.isInterfaceImplemented(interfaceName);
}
+ @Override
public String getSuperClassName()
{
return superClassName;
}
+ @Override
public PlasticClass onConstruct(ConstructorCallback callback)
{
check();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java
index ad9e096..5db10cd 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java
@@ -64,6 +64,7 @@ public class PlasticClassPool implements ClassLoaderDelegate, Opcodes, PlasticCl
private final Cache<String, TypeCategory> typeName2Category = new Cache<String, TypeCategory>()
{
+ @Override
protected TypeCategory convert(String typeName)
{
ClassNode cn = constructClassNodeFromBytecode(typeName);
@@ -159,21 +160,25 @@ public class PlasticClassPool implements ClassLoaderDelegate, Opcodes, PlasticCl
{
return new PlasticClassEvent()
{
+ @Override
public ClassType getType()
{
return classType;
}
+ @Override
public String getPrimaryClassName()
{
return primaryClassName;
}
+ @Override
public String getDissasembledBytecode()
{
return PlasticInternalUtils.dissasembleBytecode(classNode);
}
+ @Override
public String getClassName()
{
return PlasticInternalUtils.toClassName(classNode.name);
@@ -206,11 +211,13 @@ public class PlasticClassPool implements ClassLoaderDelegate, Opcodes, PlasticCl
return new AnnotationAccess()
{
+ @Override
public <T extends Annotation> boolean hasAnnotation(Class<T> annotationType)
{
return getAnnotation(annotationType) != null;
}
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationType)
{
return searchClass.getAnnotation(annotationType);
@@ -239,11 +246,13 @@ public class PlasticClassPool implements ClassLoaderDelegate, Opcodes, PlasticCl
return new AnnotationAccess()
{
+ @Override
public <T extends Annotation> boolean hasAnnotation(Class<T> annotationType)
{
return nameToNode.containsKey(annotationType.getName());
}
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationType)
{
String className = annotationType.getName();
@@ -294,6 +303,7 @@ public class PlasticClassPool implements ClassLoaderDelegate, Opcodes, PlasticCl
return builder.createAnnotation();
}
+ @Override
public boolean shouldInterceptClassLoading(String className)
{
int searchFromIndex = className.length() - 1;
@@ -318,6 +328,7 @@ public class PlasticClassPool implements ClassLoaderDelegate, Opcodes, PlasticCl
// Hopefully the synchronized will not cause a deadlock
+ @Override
public synchronized Class<?> loadAndTransformClass(String className) throws ClassNotFoundException
{
// Inner classes are not transformed, but they are loaded by the same class loader.
@@ -630,6 +641,7 @@ public class PlasticClassPool implements ClassLoaderDelegate, Opcodes, PlasticCl
}
}
+ @Override
public void addPlasticClassListener(PlasticClassListener listener)
{
assert listener != null;
@@ -637,6 +649,7 @@ public class PlasticClassPool implements ClassLoaderDelegate, Opcodes, PlasticCl
listeners.add(listener);
}
+ @Override
public void removePlasticClassListener(PlasticClassListener listener)
{
assert listener != null;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticFieldImpl.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticFieldImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticFieldImpl.java
index 6ce434c..d490750 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticFieldImpl.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticFieldImpl.java
@@ -51,27 +51,32 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
this.typeName = Type.getType(node.desc).getClassName();
}
+ @Override
public String toString()
{
return String.format("PlasticField[%s %s %s (in class %s)]", Modifier.toString(node.access), typeName,
node.name, plasticClass.className);
}
+ @Override
public String getGenericSignature()
{
return node.signature;
}
+ @Override
public int getModifiers()
{
return node.access;
}
+ @Override
public int compareTo(PlasticFieldImpl o)
{
return this.node.name.compareTo(o.node.name);
}
+ @Override
public PlasticClass getPlasticClass()
{
plasticClass.check();
@@ -79,6 +84,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
return plasticClass;
}
+ @Override
public FieldHandle getHandle()
{
plasticClass.check();
@@ -97,6 +103,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
return handle;
}
+ @Override
public PlasticField claim(Object tag)
{
assert tag != null;
@@ -119,6 +126,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
return this;
}
+ @Override
public boolean isClaimed()
{
plasticClass.check();
@@ -126,6 +134,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
return tag != null;
}
+ @Override
public String getName()
{
plasticClass.check();
@@ -133,6 +142,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
return node.name;
}
+ @Override
public String getTypeName()
{
plasticClass.check();
@@ -157,6 +167,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
}
}
+ @Override
public PlasticField inject(Object value)
{
plasticClass.check();
@@ -174,6 +185,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
return this;
}
+ @Override
public PlasticField injectComputed(ComputedValue<?> computedValue)
{
plasticClass.check();
@@ -210,6 +222,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
plasticClass.constructorBuilder.putField(plasticClass.className, node.name, typeName);
}
+ @Override
public PlasticField injectFromInstanceContext()
{
plasticClass.check();
@@ -238,6 +251,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
return this;
}
+ @Override
public <F> PlasticField setConduit(FieldConduit<F> conduit)
{
assert conduit != null;
@@ -260,6 +274,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
return this;
}
+ @Override
public <F> PlasticField setComputedConduit(ComputedValue<FieldConduit<F>> computedConduit)
{
assert computedConduit != null;
@@ -282,6 +297,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
return this;
}
+ @Override
public PlasticField createAccessors(PropertyAccessType accessType)
{
plasticClass.check();
@@ -289,6 +305,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
return createAccessors(accessType, PlasticInternalUtils.toPropertyName(node.name));
}
+ @Override
public PlasticField createAccessors(PropertyAccessType accessType, String propertyName)
{
plasticClass.check();
@@ -305,6 +322,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
introduceAccessorMethod(getTypeName(), "get" + capitalized, null, signature,
new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadThis().getField(PlasticFieldImpl.this).returnResult();
@@ -319,6 +337,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
introduceAccessorMethod("void", "set" + capitalized, new String[]
{getTypeName()}, signature, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadThis().loadArgument(0);
@@ -554,6 +573,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
switchBlock.addCase(fieldIndex, false, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.invokeVirtual(plasticClass.className, typeName, methodToInvoke).boxPrimitive(typeName).returnResult();
@@ -581,6 +601,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
switchBlock.addCase(fieldIndex, true, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.castOrUnbox(typeName);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMember.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMember.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMember.java
index 5513bc6..bf99bc9 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMember.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMember.java
@@ -32,6 +32,7 @@ class PlasticMember implements AnnotationAccess
annotationAccess = plasticClass.pool.createAnnotationAccess((List<AnnotationNode>) visibleAnnotations);
}
+ @Override
public <T extends Annotation> boolean hasAnnotation(Class<T> annotationType)
{
plasticClass.check();
@@ -39,6 +40,7 @@ class PlasticMember implements AnnotationAccess
return annotationAccess.hasAnnotation(annotationType);
}
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationType)
{
plasticClass.check();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMethodImpl.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMethodImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMethodImpl.java
index 74d0be4..980bd84 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMethodImpl.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMethodImpl.java
@@ -46,11 +46,13 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
this.description = PlasticInternalUtils.toMethodDescription(node);
}
+ @Override
public String toString()
{
return String.format("PlasticMethod[%s in class %s]", description, plasticClass.className);
}
+ @Override
public PlasticClass getPlasticClass()
{
plasticClass.check();
@@ -58,6 +60,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return plasticClass;
}
+ @Override
public MethodDescription getDescription()
{
plasticClass.check();
@@ -65,6 +68,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return description;
}
+ @Override
public int compareTo(PlasticMethodImpl o)
{
plasticClass.check();
@@ -72,6 +76,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return description.compareTo(o.description);
}
+ @Override
public boolean isOverride()
{
plasticClass.check();
@@ -79,6 +84,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return plasticClass.parentInheritanceData.isImplemented(node.name, node.desc);
}
+ @Override
public String getMethodIdentifier()
{
plasticClass.check();
@@ -93,6 +99,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return methodIdentifier;
}
+ @Override
public boolean isVoid()
{
plasticClass.check();
@@ -100,6 +107,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return description.returnType.equals("void");
}
+ @Override
public MethodHandle getHandle()
{
plasticClass.check();
@@ -114,6 +122,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return handle;
}
+ @Override
public PlasticMethod changeImplementation(InstructionBuilderCallback callback)
{
plasticClass.check();
@@ -138,6 +147,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return this;
}
+ @Override
public PlasticMethod addAdvice(MethodAdvice advice)
{
plasticClass.check();
@@ -155,6 +165,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return this;
}
+ @Override
public PlasticMethod delegateTo(final PlasticField field)
{
plasticClass.check();
@@ -169,6 +180,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
changeImplementation(new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
// Load the field
@@ -183,6 +195,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return this;
}
+ @Override
public PlasticMethod delegateTo(PlasticMethod delegateProvidingMethod)
{
plasticClass.check();
@@ -202,6 +215,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
changeImplementation(new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
// Load the field
@@ -225,6 +239,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return this;
}
+ @Override
public List<MethodParameter> getParameters()
{
if (parameters == null)
@@ -301,14 +316,17 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
block.addCase(methodIndex, false, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.startTryCatch(new TryCatchCallback()
{
+ @Override
public void doBlock(TryCatchBlock block)
{
block.addTry(new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
// The third argument is an Object array; get each
@@ -341,6 +359,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
{
block.addCatch(exceptionType, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.newInstance(FailureMethodInvocationResult.class).dupe(1).swap();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SuccessMethodInvocationResult.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SuccessMethodInvocationResult.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SuccessMethodInvocationResult.java
index 66d4f95..81dd7d7 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SuccessMethodInvocationResult.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SuccessMethodInvocationResult.java
@@ -28,20 +28,24 @@ public class SuccessMethodInvocationResult implements MethodInvocationResult
this.returnValue = returnValue;
}
+ @Override
public Object getReturnValue()
{
return returnValue;
}
+ @Override
public void rethrow()
{
}
+ @Override
public boolean didThrowCheckedException()
{
return false;
}
+ @Override
public <T extends Throwable> T getCheckedException(Class<T> exceptionType)
{
return null;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SwitchBlockImpl.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SwitchBlockImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SwitchBlockImpl.java
index ce9cd41..b6b28a7 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SwitchBlockImpl.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SwitchBlockImpl.java
@@ -67,6 +67,7 @@ public class SwitchBlockImpl extends Lockable implements SwitchBlock, Opcodes
{
addDefault(new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.throwException(IllegalArgumentException.class,
@@ -80,6 +81,7 @@ public class SwitchBlockImpl extends Lockable implements SwitchBlock, Opcodes
lock();
}
+ @Override
public void addCase(int caseValue, boolean jumpToEnd, InstructionBuilderCallback callback)
{
assert caseValue >= min;
@@ -98,6 +100,7 @@ public class SwitchBlockImpl extends Lockable implements SwitchBlock, Opcodes
state.visitor.visitJumpInsn(GOTO, endSwitchLabel);
}
+ @Override
public void addDefault(InstructionBuilderCallback callback)
{
if (defaultAdded)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/TryCatchBlockImpl.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/TryCatchBlockImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/TryCatchBlockImpl.java
index 2e369ec..77aad77 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/TryCatchBlockImpl.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/TryCatchBlockImpl.java
@@ -37,6 +37,7 @@ public class TryCatchBlockImpl extends Lockable implements TryCatchBlock
this.endLabel = new Label();
}
+ @Override
public void addTry(InstructionBuilderCallback callback)
{
state.visitor.visitLabel(startLabel);
@@ -46,6 +47,7 @@ public class TryCatchBlockImpl extends Lockable implements TryCatchBlock
state.visitor.visitLabel(endLabel);
}
+ @Override
public void addCatch(String exceptionClassName, InstructionBuilderCallback callback)
{
assert exceptionClassName != null;
@@ -64,6 +66,7 @@ public class TryCatchBlockImpl extends Lockable implements TryCatchBlock
state.visitor.visitTryCatchBlock(startLabel, endLabel, handler, exceptionInternalName);
}
+ @Override
public void addFinally(InstructionBuilderCallback callback)
{
doCatch(null, callback);
[2/7] Required Java version is now 1.6,
this applies to building as well as to using Tapestry
Posted by jk...@apache.org.
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/EagerLoadViaAnnotationServiceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/EagerLoadViaAnnotationServiceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/EagerLoadViaAnnotationServiceImpl.java
index 9c51680..a01ad5a 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/EagerLoadViaAnnotationServiceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/EagerLoadViaAnnotationServiceImpl.java
@@ -20,6 +20,7 @@ import org.apache.tapestry5.ioc.annotations.EagerLoad;
public class EagerLoadViaAnnotationServiceImpl implements Runnable
{
+ @Override
public void run()
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExceptionInConstructorServiceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExceptionInConstructorServiceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExceptionInConstructorServiceImpl.java
index f4c9013..d4b8637 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExceptionInConstructorServiceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExceptionInConstructorServiceImpl.java
@@ -24,6 +24,7 @@ public class ExceptionInConstructorServiceImpl implements Pingable
throw new RuntimeException("Yes, we have no tomatoes.");
}
+ @Override
public void ping()
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExtraPublicConstructorsModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExtraPublicConstructorsModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExtraPublicConstructorsModule.java
index 0d7a8d2..6d0bfdb 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExtraPublicConstructorsModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExtraPublicConstructorsModule.java
@@ -42,6 +42,7 @@ public class ExtraPublicConstructorsModule
{
return new UpcaseService()
{
+ @Override
public String upcase(String input)
{
return source.expandSymbols(input).toUpperCase();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/MultipleConstructorsAutobuildService.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/MultipleConstructorsAutobuildService.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/MultipleConstructorsAutobuildService.java
index dda2326..3c38f05 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/MultipleConstructorsAutobuildService.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/MultipleConstructorsAutobuildService.java
@@ -31,11 +31,13 @@ public class MultipleConstructorsAutobuildService implements StringHolder
this.delegate = delegate;
}
+ @Override
public String getValue()
{
return delegate.getValue();
}
+ @Override
public void setValue(String value)
{
delegate.setValue(value);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NamedViaAnnotationServiceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NamedViaAnnotationServiceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NamedViaAnnotationServiceImpl.java
index 11291a6..ed57f2c 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NamedViaAnnotationServiceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NamedViaAnnotationServiceImpl.java
@@ -20,6 +20,7 @@ import javax.inject.Named;
public class NamedViaAnnotationServiceImpl implements Runnable
{
+ @Override
public void run()
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NonAnnotatedServiceInterfaceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NonAnnotatedServiceInterfaceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NonAnnotatedServiceInterfaceImpl.java
index 5470c24..a15bfba 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NonAnnotatedServiceInterfaceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NonAnnotatedServiceInterfaceImpl.java
@@ -21,6 +21,7 @@ import org.apache.tapestry5.ioc.annotations.IntermediateType;
public class NonAnnotatedServiceInterfaceImpl implements NonAnnotatedServiceInterface
{
+ @Override
@Advise(id = "id", serviceInterface = NonAnnotatedServiceInterface.class)
public String execute(@IntermediateType(String.class) int i) // annotation just for checking too
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NoopClassLoaderDelegate.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NoopClassLoaderDelegate.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NoopClassLoaderDelegate.java
index ddc8446..0395697 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NoopClassLoaderDelegate.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NoopClassLoaderDelegate.java
@@ -18,11 +18,13 @@ import org.apache.tapestry5.internal.plastic.ClassLoaderDelegate;
public class NoopClassLoaderDelegate implements ClassLoaderDelegate
{
+ @Override
public boolean shouldInterceptClassLoading(String className)
{
return false;
}
+ @Override
public Class<?> loadAndTransformClass(String className) throws ClassNotFoundException
{
throw new IllegalStateException();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/RunnableServiceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/RunnableServiceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/RunnableServiceImpl.java
index 75b5bb5..21f66b9 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/RunnableServiceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/RunnableServiceImpl.java
@@ -23,6 +23,7 @@ public class RunnableServiceImpl implements Runnable
{
}
+ @Override
public void run()
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdViaAnnotationServiceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdViaAnnotationServiceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdViaAnnotationServiceImpl.java
index 82bfaeb..21f7406 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdViaAnnotationServiceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdViaAnnotationServiceImpl.java
@@ -20,6 +20,7 @@ import org.apache.tapestry5.ioc.annotations.ServiceId;
public class ServiceIdViaAnnotationServiceImpl implements Runnable
{
+ @Override
public void run()
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdViaMethodAnnotationServiceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdViaMethodAnnotationServiceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdViaMethodAnnotationServiceImpl.java
index 57992b6..bde2ca3 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdViaMethodAnnotationServiceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdViaMethodAnnotationServiceImpl.java
@@ -18,6 +18,7 @@ package org.apache.tapestry5.ioc.internal;
public class ServiceIdViaMethodAnnotationServiceImpl implements Runnable
{
+ @Override
public void run()
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/TestAdvice.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/TestAdvice.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/TestAdvice.java
index f61944d..0709437 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/TestAdvice.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/TestAdvice.java
@@ -25,6 +25,7 @@ final public class TestAdvice implements MethodAdvice {
public static final String ANNOTATION_FOUND = "Annotation found!";
+ @Override
public void advise(MethodInvocation invocation) {
final Method method = invocation.getMethod();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToStringService.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToStringService.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToStringService.java
index da1b5e7..22b8ab5 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToStringService.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToStringService.java
@@ -2,5 +2,6 @@ package org.apache.tapestry5.ioc.internal;
public interface ToStringService
{
+ @Override
String toString();
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToUpperCaseStringHolder.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToUpperCaseStringHolder.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToUpperCaseStringHolder.java
index 19d7d24..04915ac 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToUpperCaseStringHolder.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToUpperCaseStringHolder.java
@@ -20,11 +20,13 @@ public class ToUpperCaseStringHolder implements StringHolder
{
private String value;
+ @Override
public String getValue()
{
return value;
}
+ @Override
public void setValue(String value)
{
this.value = value.toUpperCase();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/UpcaseServiceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/UpcaseServiceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/UpcaseServiceImpl.java
index 4c214de..36ae8ac 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/UpcaseServiceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/UpcaseServiceImpl.java
@@ -17,6 +17,7 @@ package org.apache.tapestry5.ioc.internal;
public class UpcaseServiceImpl implements UpcaseService
{
+ @Override
public String upcase(String input)
{
return input.toUpperCase();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StartupModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StartupModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StartupModule.java
index 2787917..2fb671e 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StartupModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StartupModule.java
@@ -24,6 +24,7 @@ public class StartupModule
{
Runnable r = new Runnable()
{
+ @Override
public void run()
{
startupInvoked = true;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringService.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringService.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringService.java
index b8e0484..adbbe45 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringService.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringService.java
@@ -16,5 +16,6 @@ package org.apache.tapestry5.ioc.internal.services;
public interface ToStringService
{
+ @Override
public String toString();
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTarget.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTarget.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTarget.java
index cc598af..2a0f8f4 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTarget.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTarget.java
@@ -31,6 +31,7 @@ public class ConcurrentTarget
{
return barrier.withRead(new Invokable<Integer>()
{
+ @Override
public Integer invoke()
{
return getCounter();
@@ -42,6 +43,7 @@ public class ConcurrentTarget
{
return barrier.withRead(new Invokable<Integer>()
{
+ @Override
public Integer invoke()
{
return counter;
@@ -53,6 +55,7 @@ public class ConcurrentTarget
{
barrier.withWrite(new Runnable()
{
+ @Override
public void run()
{
counter++;
@@ -64,6 +67,7 @@ public class ConcurrentTarget
{
barrier.withWrite(new Runnable()
{
+ @Override
public void run()
{
ConcurrentTarget.this.counter = counter;
@@ -75,6 +79,7 @@ public class ConcurrentTarget
{
barrier.withRead(new Runnable()
{
+ @Override
public void run()
{
if (counter >= 0)
@@ -87,10 +92,12 @@ public class ConcurrentTarget
{
barrier.withRead(new Runnable()
{
+ @Override
public void run()
{
Runnable r = new Runnable()
{
+ @Override
public void run()
{
incrementCounter();
@@ -106,6 +113,7 @@ public class ConcurrentTarget
{
barrier.withWrite(new Runnable()
{
+ @Override
public void run()
{
counter = getCounter() + 1;
@@ -117,6 +125,7 @@ public class ConcurrentTarget
{
return barrier.tryWithWrite(new Runnable()
{
+ @Override
public void run()
{
counter++;
@@ -128,6 +137,7 @@ public class ConcurrentTarget
{
return barrier.tryWithWrite(new Runnable()
{
+ @Override
public void run()
{
counter = getCounter() + 1;
@@ -140,6 +150,7 @@ public class ConcurrentTarget
final List<Boolean> result = new ArrayList<Boolean>();
barrier.withRead(new Runnable()
{
+ @Override
public void run()
{
if (counter >= 0)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTargetWrapper.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTargetWrapper.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTargetWrapper.java
index 6a16a7f..96fea8a 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTargetWrapper.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTargetWrapper.java
@@ -26,10 +26,12 @@ public class ConcurrentTargetWrapper implements Runnable
this.target = target;
}
+ @Override
public void run()
{
barrier.withRead(new Runnable()
{
+ @Override
public void run()
{
target.incrementCounter();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/DrivableImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/DrivableImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/DrivableImpl.java
index 523e665..a5d0520 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/DrivableImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/DrivableImpl.java
@@ -7,6 +7,7 @@ package org.apache.tapestry5.ioc.internal.util;
public class DrivableImpl implements Drivable
{
+ @Override
public void drive()
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/PlayableImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/PlayableImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/PlayableImpl.java
index 307501b..3c99ef1 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/PlayableImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/PlayableImpl.java
@@ -6,6 +6,7 @@ package org.apache.tapestry5.ioc.internal.util;
public class PlayableImpl extends DrivableImpl implements Playable
{
+ @Override
public void play()
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ToyTruckImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ToyTruckImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ToyTruckImpl.java
index db6c7e7..99b4782 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ToyTruckImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ToyTruckImpl.java
@@ -7,6 +7,7 @@ package org.apache.tapestry5.ioc.internal.util;
public class ToyTruckImpl extends PlayableImpl implements Drivable, ToyTruck
{
+ @Override
public void playDrive()
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/TapestryDocTaglet.java
----------------------------------------------------------------------
diff --git a/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/TapestryDocTaglet.java b/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/TapestryDocTaglet.java
index 4f19aaf..c086280 100644
--- a/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/TapestryDocTaglet.java
+++ b/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/TapestryDocTaglet.java
@@ -47,46 +47,55 @@ public class TapestryDocTaglet implements Taglet, ClassDescriptionSource
paramMap.put(NAME, new TapestryDocTaglet());
}
+ @Override
public boolean inField()
{
return false;
}
+ @Override
public boolean inConstructor()
{
return false;
}
+ @Override
public boolean inMethod()
{
return false;
}
+ @Override
public boolean inOverview()
{
return false;
}
+ @Override
public boolean inPackage()
{
return false;
}
+ @Override
public boolean inType()
{
return true;
}
+ @Override
public boolean isInlineTag()
{
return false;
}
+ @Override
public String getName()
{
return NAME;
}
+ @Override
public ClassDescription getDescription(String className)
{
ClassDescription result = classDescriptions.get(className);
@@ -107,11 +116,13 @@ public class TapestryDocTaglet implements Taglet, ClassDescriptionSource
return result;
}
+ @Override
public String toString(Tag tag)
{
throw new IllegalStateException("toString(Tag) should not be called for a non-inline tag.");
}
+ @Override
public String toString(Tag[] tags)
{
if (tags.length == 0)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/XDocStreamer.java
----------------------------------------------------------------------
diff --git a/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/XDocStreamer.java b/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/XDocStreamer.java
index 5d6235b..d71c611 100644
--- a/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/XDocStreamer.java
+++ b/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/XDocStreamer.java
@@ -30,6 +30,7 @@ public class XDocStreamer
private static final Runnable NO_OP = new Runnable()
{
+ @Override
public void run()
{
}
@@ -51,6 +52,7 @@ public class XDocStreamer
{
return new Runnable()
{
+ @Override
public void run()
{
write("</");
@@ -77,22 +79,27 @@ public class XDocStreamer
ParserState state = ParserState.IGNORING;
+ @Override
public void startDTD(String name, String publicId, String systemId) throws SAXException
{
}
+ @Override
public void endDTD() throws SAXException
{
}
+ @Override
public void startEntity(String name) throws SAXException
{
}
+ @Override
public void endEntity(String name) throws SAXException
{
}
+ @Override
public void startCDATA() throws SAXException
{
if (state == ParserState.IGNORING)
@@ -105,6 +112,7 @@ public class XDocStreamer
endElementHandlers.push(new Runnable()
{
+ @Override
public void run()
{
state = ParserState.COPYING;
@@ -112,36 +120,44 @@ public class XDocStreamer
});
}
+ @Override
public void endCDATA() throws SAXException
{
endElementHandlers.pop().run();
}
/** Does nothing; comments are always stripped out. */
+ @Override
public void comment(char[] ch, int start, int length) throws SAXException
{
}
+ @Override
public void setDocumentLocator(Locator locator)
{
}
+ @Override
public void startDocument() throws SAXException
{
}
+ @Override
public void endDocument() throws SAXException
{
}
+ @Override
public void startPrefixMapping(String prefix, String uri) throws SAXException
{
}
+ @Override
public void endPrefixMapping(String prefix) throws SAXException
{
}
+ @Override
public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException
{
if (state == ParserState.IGNORING)
@@ -218,11 +234,13 @@ public class XDocStreamer
throw new RuntimeException(String.format("No '%s' attribute present.", name));
}
+ @Override
public void endElement(String uri, String localName, String qName) throws SAXException
{
endElementHandlers.pop().run();
}
+ @Override
public void characters(char[] ch, int start, int length) throws SAXException
{
try
@@ -265,14 +283,17 @@ public class XDocStreamer
}
}
+ @Override
public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException
{
}
+ @Override
public void processingInstruction(String target, String data) throws SAXException
{
}
+ @Override
public void skippedEntity(String name) throws SAXException
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jmx/src/main/java/org/apache/tapestry5/internal/jmx/MBeanSupportImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-jmx/src/main/java/org/apache/tapestry5/internal/jmx/MBeanSupportImpl.java b/tapestry-jmx/src/main/java/org/apache/tapestry5/internal/jmx/MBeanSupportImpl.java
index 1c31ebe..4cbc773 100644
--- a/tapestry-jmx/src/main/java/org/apache/tapestry5/internal/jmx/MBeanSupportImpl.java
+++ b/tapestry-jmx/src/main/java/org/apache/tapestry5/internal/jmx/MBeanSupportImpl.java
@@ -67,6 +67,7 @@ public class MBeanSupportImpl implements MBeanSupport
{
hub.addRegistryShutdownListener(new Runnable()
{
+ @Override
public void run()
{
registryDidShutdown();
@@ -74,6 +75,7 @@ public class MBeanSupportImpl implements MBeanSupport
});
}
+ @Override
public void register(Object bean, String name)
{
register(bean, toObjectName(name));
@@ -90,6 +92,7 @@ public class MBeanSupportImpl implements MBeanSupport
}
}
+ @Override
public void register(final Object object, final ObjectName objectName)
{
lock.check();
@@ -110,6 +113,7 @@ public class MBeanSupportImpl implements MBeanSupport
}
}
+ @Override
public void unregister(final ObjectName objectName)
{
lock.check();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jmx/src/test/java/org/example/testapp/services/SampleImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-jmx/src/test/java/org/example/testapp/services/SampleImpl.java b/tapestry-jmx/src/test/java/org/example/testapp/services/SampleImpl.java
index 729d9df..770efc5 100644
--- a/tapestry-jmx/src/test/java/org/example/testapp/services/SampleImpl.java
+++ b/tapestry-jmx/src/test/java/org/example/testapp/services/SampleImpl.java
@@ -19,6 +19,7 @@ import org.apache.tapestry5.ioc.annotations.EagerLoad;
@EagerLoad
public class SampleImpl implements Sample, SampleImplMBean
{
+ @Override
public int getSampleValue()
{
return 42;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterMethodAdvice.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterMethodAdvice.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterMethodAdvice.java
index f0f1d28..a0f58f7 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterMethodAdvice.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterMethodAdvice.java
@@ -32,6 +32,7 @@ public class CommitAfterMethodAdvice implements MethodAdvice
this.manager = manager;
}
+ @Override
public void advise(final MethodInvocation invocation)
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterWorker.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterWorker.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterWorker.java
index fc9ff8a..ac84dc3 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterWorker.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterWorker.java
@@ -39,6 +39,7 @@ public class CommitAfterWorker implements ComponentClassTransformWorker2
shared = new CommitAfterMethodAdvice(manager);
}
+ @Override
public void transform(PlasticClass plasticClass, TransformationSupport support, MutableComponentModel model)
{
for (final PlasticMethod method : plasticClass
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerManagerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerManagerImpl.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerManagerImpl.java
index 93e493c..70793ff 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerManagerImpl.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerManagerImpl.java
@@ -46,6 +46,7 @@ public class EntityManagerManagerImpl implements EntityManagerManager, ThreadCle
/**
* {@inheritDoc}
*/
+ @Override
public EntityManager getEntityManager(final String persistenceUnitName)
{
return getOrCreateEntityManager(persistenceUnitName);
@@ -54,6 +55,7 @@ public class EntityManagerManagerImpl implements EntityManagerManager, ThreadCle
/**
* {@inheritDoc}
*/
+ @Override
public Map<String, EntityManager> getEntityManagers()
{
createAllEntityManagers();
@@ -83,6 +85,7 @@ public class EntityManagerManagerImpl implements EntityManagerManager, ThreadCle
return em;
}
+ @Override
public void threadDidCleanup()
{
for (final Entry<String, EntityManager> next : entityManagers.entrySet())
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerObjectProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerObjectProvider.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerObjectProvider.java
index e3ced6d..bb2f9ae 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerObjectProvider.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerObjectProvider.java
@@ -29,6 +29,7 @@ public class EntityManagerObjectProvider implements ObjectProvider
private EntityManager proxy;
+ @Override
public <T> T provide(final Class<T> objectType, final AnnotationProvider annotationProvider,
final ObjectLocator locator)
{
@@ -51,6 +52,7 @@ public class EntityManagerObjectProvider implements ObjectProvider
proxy = proxyFactory.createProxy(EntityManager.class, new ObjectCreator()
{
+ @Override
public Object createObject()
{
final EntityManagerManager entityManagerManager = objectLocator
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java
index 39da3c4..f7aa979 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java
@@ -78,6 +78,7 @@ public class EntityManagerSourceImpl implements EntityManagerSource
{
hub.addRegistryShutdownListener(new Runnable()
{
+ @Override
public void run()
{
registryDidShutdown();
@@ -89,12 +90,14 @@ public class EntityManagerSourceImpl implements EntityManagerSource
{
final List<String> affectedUnits = F.flow(persistenceUnitInfos).filter(new Predicate<TapestryPersistenceUnitInfo>()
{
+ @Override
public boolean accept(TapestryPersistenceUnitInfo info)
{
return !info.excludeUnlistedClasses();
}
}).map(new Mapper<TapestryPersistenceUnitInfo, String>()
{
+ @Override
public String map(TapestryPersistenceUnitInfo info)
{
return info.getPersistenceUnitName();
@@ -176,6 +179,7 @@ public class EntityManagerSourceImpl implements EntityManagerSource
/**
* {@inheritDoc}
*/
+ @Override
public EntityManagerFactory getEntityManagerFactory(final String persistenceUnitName)
{
EntityManagerFactory emf = entityManagerFactories.get(persistenceUnitName);
@@ -245,6 +249,7 @@ public class EntityManagerSourceImpl implements EntityManagerSource
private PersistenceProvider findPersistenceProviderByName(final List<PersistenceProvider> providers, final String providerClassName)
{
PersistenceProvider provider = F.flow(providers).filter(new Predicate<PersistenceProvider>() {
+ @Override
public boolean accept(PersistenceProvider next) {
return next.getClass().getName().equals(providerClassName);
}
@@ -263,12 +268,14 @@ public class EntityManagerSourceImpl implements EntityManagerSource
private List<Class> toProviderClasses(final List<PersistenceProvider> providers)
{
return F.flow(providers).map(new Mapper<PersistenceProvider, Class>() {
+ @Override
public Class map(PersistenceProvider element) {
return element.getClass();
}
}).toList();
}
+ @Override
public EntityManager create(final String persistenceUnitName)
{
return getEntityManagerFactory(persistenceUnitName).createEntityManager();
@@ -296,6 +303,7 @@ public class EntityManagerSourceImpl implements EntityManagerSource
}
+ @Override
public List<PersistenceUnitInfo> getPersistenceUnitInfos()
{
return Collections.<PersistenceUnitInfo>unmodifiableList(persistenceUnitInfos);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImpl.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImpl.java
index ad4abef..a74b93b 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImpl.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImpl.java
@@ -27,6 +27,7 @@ public class JpaTransactionAdvisorImpl implements JpaTransactionAdvisor
this.manager = manager;
}
+ @Override
public void addTransactionCommitAdvice(final MethodAdviceReceiver receiver)
{
receiver.adviseAllMethods(new CommitAfterMethodAdvice(manager));
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaValueEncoder.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaValueEncoder.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaValueEncoder.java
index d60c9b3..a250203 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaValueEncoder.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaValueEncoder.java
@@ -63,6 +63,7 @@ public class JpaValueEncoder<E> implements ValueEncoder<E>
/**
* {@inheritDoc}
*/
+ @Override
public String toClient(final E value)
{
if (value == null)
@@ -81,6 +82,7 @@ public class JpaValueEncoder<E> implements ValueEncoder<E>
/**
* {@inheritDoc}
*/
+ @Override
public E toValue(final String clientValue)
{
if (InternalUtils.isBlank(clientValue))
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PackageNamePersistenceUnitConfigurer.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PackageNamePersistenceUnitConfigurer.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PackageNamePersistenceUnitConfigurer.java
index 5d0e90f..f85d598 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PackageNamePersistenceUnitConfigurer.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PackageNamePersistenceUnitConfigurer.java
@@ -35,6 +35,7 @@ public class PackageNamePersistenceUnitConfigurer implements PersistenceUnitConf
/**
* {@inheritDoc}
*/
+ @Override
public void configure(TapestryPersistenceUnitInfo unitInfo)
{
for (String packageName : packageManager.getPackageNames())
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContentHandler.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContentHandler.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContentHandler.java
index e53eacf..9dcf8c9 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContentHandler.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContentHandler.java
@@ -54,26 +54,32 @@ public class PersistenceContentHandler implements ContentHandler
return persistenceUnits;
}
+ @Override
public void setDocumentLocator(final Locator locator)
{
}
+ @Override
public void startDocument() throws SAXException
{
}
+ @Override
public void endDocument() throws SAXException
{
}
+ @Override
public void startPrefixMapping(final String prefix, final String uri) throws SAXException
{
}
+ @Override
public void endPrefixMapping(final String prefix) throws SAXException
{
}
+ @Override
public void startElement(final String namespaceURI, final String localName, final String qName,
final Attributes atts) throws SAXException
{
@@ -101,6 +107,7 @@ public class PersistenceContentHandler implements ContentHandler
}
}
+ @Override
public void endElement(final String namespaceURI, final String localName, final String qName)
throws SAXException
{
@@ -156,6 +163,7 @@ public class PersistenceContentHandler implements ContentHandler
}
}
+ @Override
public void characters(final char[] ch, final int start, final int length) throws SAXException
{
final String s = new String(ch, start, length);
@@ -170,15 +178,18 @@ public class PersistenceContentHandler implements ContentHandler
}
+ @Override
public void ignorableWhitespace(final char[] ch, final int start, final int length)
throws SAXException
{
}
+ @Override
public void processingInstruction(final String target, final String data) throws SAXException
{
}
+ @Override
public void skippedEntity(final String name) throws SAXException
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContextWorker.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContextWorker.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContextWorker.java
index 5bd1bcd..e00d108 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContextWorker.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContextWorker.java
@@ -34,6 +34,7 @@ public class PersistenceContextWorker implements ComponentClassTransformWorker2
this.entityManagerManager = entityManagerManager;
}
+ @Override
public void transform(PlasticClass plasticClass, TransformationSupport support, MutableComponentModel model)
{
for (final PlasticField field : plasticClass
@@ -45,6 +46,7 @@ public class PersistenceContextWorker implements ComponentClassTransformWorker2
field.setConduit(new ReadOnlyComponentFieldConduit(plasticClass.getClassName(), field.getName())
{
+ @Override
public Object get(Object instance, InstanceContext context)
{
return JpaInternalUtils.getEntityManager(entityManagerManager, annotation);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java
index 463a4dd..a25bace 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java
@@ -71,6 +71,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public String getPersistenceUnitName()
{
return persistenceUnitName;
@@ -79,6 +80,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public String getPersistenceProviderClassName()
{
return persistenceProviderClassName;
@@ -87,6 +89,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public TapestryPersistenceUnitInfo persistenceProviderClassName(final String persistenceProviderClassName)
{
this.persistenceProviderClassName = persistenceProviderClassName;
@@ -97,6 +100,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public PersistenceUnitTransactionType getTransactionType()
{
return transactionType;
@@ -105,6 +109,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public TapestryPersistenceUnitInfo transactionType(final PersistenceUnitTransactionType transactionType)
{
this.transactionType = transactionType;
@@ -115,6 +120,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public DataSource getJtaDataSource()
{
return jtaDataSource;
@@ -123,6 +129,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public DataSource getNonJtaDataSource()
{
return nonJtaDataSource;
@@ -131,6 +138,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public TapestryPersistenceUnitInfo nonJtaDataSource(final String nonJtaDataSource)
{
this.nonJtaDataSource = lookupDataSource(nonJtaDataSource);
@@ -141,6 +149,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public TapestryPersistenceUnitInfo jtaDataSource(final String jtaDataSource)
{
this.jtaDataSource = lookupDataSource(jtaDataSource);
@@ -151,6 +160,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public List<String> getMappingFileNames()
{
List<String> tmp = CollectionFactory.newList(mappingFilesNames);
@@ -160,6 +170,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public TapestryPersistenceUnitInfo addMappingFileName(final String fileName)
{
mappingFilesNames.add(fileName);
@@ -171,6 +182,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public TapestryPersistenceUnitInfo addJarFileUrl(URL url)
{
jarFileUrls.add(url);
@@ -181,6 +193,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public TapestryPersistenceUnitInfo addJarFileUrl(String url)
{
try
@@ -196,6 +209,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public TapestryPersistenceUnitInfo addProperty(String name, String value)
{
getProperties().put(name, value);
@@ -207,6 +221,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public TapestryPersistenceUnitInfo excludeUnlistedClasses(boolean exclude)
{
this.excludeUnlistedClasses = exclude;
@@ -217,6 +232,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public List<URL> getJarFileUrls()
{
return Collections.unmodifiableList(jarFileUrls);
@@ -225,6 +241,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public URL getPersistenceUnitRootUrl()
{
return getClass().getResource("/");
@@ -233,6 +250,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public List<String> getManagedClassNames()
{
List<String> tmp = CollectionFactory.newList(managedClassNames);
@@ -242,6 +260,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public TapestryPersistenceUnitInfo addManagedClassName(final String className)
{
managedClassNames.add(className);
@@ -252,6 +271,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public TapestryPersistenceUnitInfo addManagedClass(final Class<?> clazz)
{
addManagedClassName(clazz.getName());
@@ -262,6 +282,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public boolean excludeUnlistedClasses()
{
return excludeUnlistedClasses;
@@ -270,6 +291,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public SharedCacheMode getSharedCacheMode()
{
return sharedCacheMode;
@@ -278,6 +300,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public TapestryPersistenceUnitInfo sharedCacheMode(final SharedCacheMode cacheMode)
{
sharedCacheMode = cacheMode;
@@ -288,6 +311,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public ValidationMode getValidationMode()
{
return validationMode;
@@ -296,6 +320,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public TapestryPersistenceUnitInfo validationMode(final ValidationMode validationMode)
{
this.validationMode = validationMode;
@@ -306,6 +331,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public Properties getProperties()
{
return properties;
@@ -314,6 +340,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public String getPersistenceXMLSchemaVersion()
{
return persistenceXMLSchemaVersion;
@@ -327,6 +354,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public ClassLoader getClassLoader()
{
return Thread.currentThread().getContextClassLoader();
@@ -335,6 +363,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public void addTransformer(final ClassTransformer transformer)
{
@@ -343,6 +372,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public ClassLoader getNewTempClassLoader()
{
return getClassLoader();
@@ -366,11 +396,13 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
}
+ @Override
public TapestryPersistenceUnitInfo setEntityManagerProperties(Map properties) {
entityManagerProperties = properties;
return this;
}
+ @Override
public Map getEntityManagerProperties() {
return entityManagerProperties;
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/JpaGridDataSource.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/JpaGridDataSource.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/JpaGridDataSource.java
index c572d00..040afdd 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/JpaGridDataSource.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/JpaGridDataSource.java
@@ -61,6 +61,7 @@ public class JpaGridDataSource<E> implements GridDataSource
/**
* {@inheritDoc}
*/
+ @Override
public int getAvailableRows()
{
final CriteriaBuilder builder = entityManager.getCriteriaBuilder();
@@ -79,6 +80,7 @@ public class JpaGridDataSource<E> implements GridDataSource
/**
* {@inheritDoc}
*/
+ @Override
public void prepare(final int startIndex, final int endIndex,
final List<SortConstraint> sortConstraints)
{
@@ -132,6 +134,7 @@ public class JpaGridDataSource<E> implements GridDataSource
/**
* {@inheritDoc}
*/
+ @Override
public Object getRowValue(final int index)
{
return preparedResults.get(index - startIndex);
@@ -140,6 +143,7 @@ public class JpaGridDataSource<E> implements GridDataSource
/**
* {@inheritDoc}
*/
+ @Override
public Class<E> getRowType()
{
return entityType;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/modules/JpaModule.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/modules/JpaModule.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/modules/JpaModule.java
index acb0db9..a9c824a 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/modules/JpaModule.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/modules/JpaModule.java
@@ -50,6 +50,7 @@ public class JpaModule
{
return new JpaEntityPackageManager()
{
+ @Override
public Collection<String> getPackageNames()
{
return packageNames;
@@ -139,6 +140,7 @@ public class JpaModule
final ValueEncoderFactory factory = new ValueEncoderFactory()
{
+ @Override
public ValueEncoder create(final Class type)
{
return new JpaValueEncoder(entity, entityManagerManager, info.getPersistenceUnitName(),
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImplTest.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImplTest.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImplTest.java
index 0cab6d4..e1f819f 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImplTest.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImplTest.java
@@ -60,6 +60,7 @@ public class EntityManagerSourceImplTest extends TapestryTestCase
{
PersistenceUnitConfigurer configurer = new PersistenceUnitConfigurer()
{
+ @Override
@SuppressWarnings(
{"unchecked", "rawtypes"})
public void configure(TapestryPersistenceUnitInfo unitInfo)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImplTest.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImplTest.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImplTest.java
index cde68f9..78173c8 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImplTest.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImplTest.java
@@ -458,11 +458,13 @@ public class JpaTransactionAdvisorImplTest extends IOCTestCase
return new ReturnTypeService()
{
+ @Override
public String returnTypeMethod()
{
return "Foo";
}
+ @Override
public int returnTypeMethodWithParam(final int first, final int second)
{
return first + second;
@@ -486,6 +488,7 @@ public class JpaTransactionAdvisorImplTest extends IOCTestCase
@PersistenceContext(unitName = UNIT_NAME)
int returnTypeMethodWithParam(int first, int second);
+ @Override
String toString();
}
@@ -522,6 +525,7 @@ public class JpaTransactionAdvisorImplTest extends IOCTestCase
}
public class ServiceImpl implements Service {
+ @Override
@CommitAfter
@PersistenceContext(unitName = UNIT_NAME)
public void perform()
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManager.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManager.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManager.java
index 23a350c..75697ab 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManager.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManager.java
@@ -35,203 +35,243 @@ public class DummyEntityManager implements EntityManager
}
+ @Override
public void persist(Object entity)
{
}
+ @Override
public <T> T merge(T entity)
{
return null;
}
+ @Override
public void remove(Object entity)
{
}
+ @Override
public <T> T find(Class<T> entityClass, Object primaryKey)
{
return null;
}
+ @Override
public <T> T find(Class<T> entityClass, Object primaryKey, Map<String, Object> properties)
{
return null;
}
+ @Override
public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode)
{
return null;
}
+ @Override
public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode,
Map<String, Object> properties)
{
return null;
}
+ @Override
public <T> T getReference(Class<T> entityClass, Object primaryKey)
{
return null;
}
+ @Override
public void flush()
{
}
+ @Override
public void setFlushMode(FlushModeType flushMode)
{
}
+ @Override
public FlushModeType getFlushMode()
{
return null;
}
+ @Override
public void lock(Object entity, LockModeType lockMode)
{
}
+ @Override
public void lock(Object entity, LockModeType lockMode, Map<String, Object> properties)
{
}
+ @Override
public void refresh(Object entity)
{
}
+ @Override
public void refresh(Object entity, Map<String, Object> properties)
{
}
+ @Override
public void refresh(Object entity, LockModeType lockMode)
{
}
+ @Override
public void refresh(Object entity, LockModeType lockMode, Map<String, Object> properties)
{
}
+ @Override
public void clear()
{
}
+ @Override
public void detach(Object entity)
{
}
+ @Override
public boolean contains(Object entity)
{
return false;
}
+ @Override
public LockModeType getLockMode(Object entity)
{
return null;
}
+ @Override
public void setProperty(String propertyName, Object value)
{
}
+ @Override
public Map<String, Object> getProperties()
{
return null;
}
+ @Override
public Query createQuery(String qlString)
{
return null;
}
+ @Override
public <T> TypedQuery<T> createQuery(CriteriaQuery<T> criteriaQuery)
{
return null;
}
+ @Override
public <T> TypedQuery<T> createQuery(String qlString, Class<T> resultClass)
{
return null;
}
+ @Override
public Query createNamedQuery(String name)
{
return null;
}
+ @Override
public <T> TypedQuery<T> createNamedQuery(String name, Class<T> resultClass)
{
return null;
}
+ @Override
public Query createNativeQuery(String sqlString)
{
return null;
}
+ @Override
@SuppressWarnings("rawtypes")
public Query createNativeQuery(String sqlString, Class resultClass)
{
return null;
}
+ @Override
public Query createNativeQuery(String sqlString, String resultSetMapping)
{
return null;
}
+ @Override
public void joinTransaction()
{
}
+ @Override
public <T> T unwrap(Class<T> cls)
{
return null;
}
+ @Override
public Object getDelegate()
{
return null;
}
+ @Override
public void close()
{
}
+ @Override
public boolean isOpen()
{
return false;
}
+ @Override
public EntityTransaction getTransaction()
{
return null;
}
+ @Override
public EntityManagerFactory getEntityManagerFactory()
{
return null;
}
+ @Override
public CriteriaBuilder getCriteriaBuilder()
{
return null;
}
+ @Override
public Metamodel getMetamodel()
{
return null;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManagerFactory.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManagerFactory.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManagerFactory.java
index 395686c..f4ab8da 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManagerFactory.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManagerFactory.java
@@ -24,47 +24,56 @@ import java.util.Map;
final class DummyEntityManagerFactory implements EntityManagerFactory
{
+ @Override
public boolean isOpen()
{
return false;
}
+ @Override
public Map<String, Object> getProperties()
{
return null;
}
+ @Override
public PersistenceUnitUtil getPersistenceUnitUtil()
{
return null;
}
+ @Override
public Metamodel getMetamodel()
{
return null;
}
+ @Override
public CriteriaBuilder getCriteriaBuilder()
{
return null;
}
+ @Override
public Cache getCache()
{
return null;
}
+ @Override
@SuppressWarnings("rawtypes")
public EntityManager createEntityManager(Map map)
{
return new DummyEntityManager();
}
+ @Override
public EntityManager createEntityManager()
{
return new DummyEntityManager();
}
+ @Override
public void close()
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyPersistenceProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyPersistenceProvider.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyPersistenceProvider.java
index 796aed4..723b677 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyPersistenceProvider.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyPersistenceProvider.java
@@ -23,16 +23,19 @@ import java.util.Map;
@SuppressWarnings("rawtypes")
public class DummyPersistenceProvider implements PersistenceProvider
{
+ @Override
public EntityManagerFactory createEntityManagerFactory(String emName, Map map)
{
return new DummyEntityManagerFactory();
}
+ @Override
public EntityManagerFactory createContainerEntityManagerFactory(PersistenceUnitInfo info, Map map)
{
return new DummyEntityManagerFactory();
}
+ @Override
public ProviderUtil getProviderUtil()
{
return null;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/example/app1/services/AppModule.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/example/app1/services/AppModule.java b/tapestry-jpa/src/test/java/org/example/app1/services/AppModule.java
index 6713f5c..926d803 100644
--- a/tapestry-jpa/src/test/java/org/example/app1/services/AppModule.java
+++ b/tapestry-jpa/src/test/java/org/example/app1/services/AppModule.java
@@ -54,6 +54,7 @@ public class AppModule
{
final PersistenceUnitConfigurer configurer = new PersistenceUnitConfigurer()
{
+ @Override
public void configure(final TapestryPersistenceUnitInfo unitInfo)
{
unitInfo.addManagedClass(User.class);
@@ -63,6 +64,7 @@ public class AppModule
final PersistenceUnitConfigurer configurer2 = new PersistenceUnitConfigurer()
{
+ @Override
public void configure(final TapestryPersistenceUnitInfo unitInfo)
{
unitInfo.addProperty("javax.persistence.jdbc.driver", "org.h2.Driver")
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/example/app1/services/impl/UserDAOImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/example/app1/services/impl/UserDAOImpl.java b/tapestry-jpa/src/test/java/org/example/app1/services/impl/UserDAOImpl.java
index ee2a564..ae2bf8b 100644
--- a/tapestry-jpa/src/test/java/org/example/app1/services/impl/UserDAOImpl.java
+++ b/tapestry-jpa/src/test/java/org/example/app1/services/impl/UserDAOImpl.java
@@ -30,11 +30,13 @@ public class UserDAOImpl implements UserDAO
@PersistenceContext(unitName = AppConstants.TEST_PERSISTENCE_UNIT)
private EntityManager entityManager;
+ @Override
public void add(final User user)
{
entityManager.persist(user);
}
+ @Override
@SuppressWarnings(
{ "unchecked" })
public List<User> findAll()
@@ -42,12 +44,14 @@ public class UserDAOImpl implements UserDAO
return entityManager.createQuery("select u from User u order by u.id desc").getResultList();
}
+ @Override
public void delete(final User... users)
{
for (final User user : users)
entityManager.remove(user);
}
+ @Override
public void deleteAll()
{
for (final User u : findAll())
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/example/app2/services/impl/UserDAOImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/example/app2/services/impl/UserDAOImpl.java b/tapestry-jpa/src/test/java/org/example/app2/services/impl/UserDAOImpl.java
index 9df4186..c8ee8e8 100644
--- a/tapestry-jpa/src/test/java/org/example/app2/services/impl/UserDAOImpl.java
+++ b/tapestry-jpa/src/test/java/org/example/app2/services/impl/UserDAOImpl.java
@@ -10,6 +10,7 @@ public class UserDAOImpl implements UserDAO
@Inject
private EntityManager entityManager;
+ @Override
public void persist(Object entity)
{
entityManager.persist(entity);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/example/app3/services/AppModule.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/example/app3/services/AppModule.java b/tapestry-jpa/src/test/java/org/example/app3/services/AppModule.java
index f0c47de..22a6e63 100644
--- a/tapestry-jpa/src/test/java/org/example/app3/services/AppModule.java
+++ b/tapestry-jpa/src/test/java/org/example/app3/services/AppModule.java
@@ -43,6 +43,7 @@ public class AppModule
final PersistenceUnitConfigurer configurer = new PersistenceUnitConfigurer()
{
+ @Override
public void configure(final TapestryPersistenceUnitInfo unitInfo)
{
unitInfo.nonJtaDataSource("jdbc/JPATest")
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/example/app5/services/AppModule.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/example/app5/services/AppModule.java b/tapestry-jpa/src/test/java/org/example/app5/services/AppModule.java
index 23221d4..05d2488 100644
--- a/tapestry-jpa/src/test/java/org/example/app5/services/AppModule.java
+++ b/tapestry-jpa/src/test/java/org/example/app5/services/AppModule.java
@@ -37,11 +37,13 @@ public class AppModule
PersistenceProviderResolverHolder.setPersistenceProviderResolver(
new PersistenceProviderResolver()
{
+ @Override
public List<PersistenceProvider> getPersistenceProviders()
{
return Arrays.<PersistenceProvider>asList(new DummyPersistenceProvider(), new org.eclipse.persistence.jpa.PersistenceProvider());
}
+ @Override
public void clearCachedProviders()
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/example/app6/services/AppModule.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/example/app6/services/AppModule.java b/tapestry-jpa/src/test/java/org/example/app6/services/AppModule.java
index 3973ec3..3883b54 100644
--- a/tapestry-jpa/src/test/java/org/example/app6/services/AppModule.java
+++ b/tapestry-jpa/src/test/java/org/example/app6/services/AppModule.java
@@ -54,6 +54,7 @@ public class AppModule
{
final PersistenceUnitConfigurer configurer = new PersistenceUnitConfigurer()
{
+ @Override
public void configure(final TapestryPersistenceUnitInfo unitInfo)
{
unitInfo.addManagedClass(User.class);
@@ -63,6 +64,7 @@ public class AppModule
final PersistenceUnitConfigurer configurer2 = new PersistenceUnitConfigurer()
{
+ @Override
public void configure(final TapestryPersistenceUnitInfo unitInfo)
{
unitInfo.addProperty("javax.persistence.jdbc.driver", "org.h2.Driver")
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/example/app6/services/impl/UserDAOImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/example/app6/services/impl/UserDAOImpl.java b/tapestry-jpa/src/test/java/org/example/app6/services/impl/UserDAOImpl.java
index 98f7b6e..cff6e2c 100644
--- a/tapestry-jpa/src/test/java/org/example/app6/services/impl/UserDAOImpl.java
+++ b/tapestry-jpa/src/test/java/org/example/app6/services/impl/UserDAOImpl.java
@@ -31,6 +31,7 @@ public class UserDAOImpl implements UserDAO
@PersistenceContext(unitName = AppConstants.TEST_PERSISTENCE_UNIT)
private EntityManager entityManager;
+ @Override
@CommitAfter
@PersistenceContext(unitName = AppConstants.TEST_PERSISTENCE_UNIT)
public void add(final User user)
@@ -38,6 +39,7 @@ public class UserDAOImpl implements UserDAO
entityManager.persist(user);
}
+ @Override
@SuppressWarnings(
{ "unchecked" })
public List<User> findAll()
@@ -46,6 +48,7 @@ public class UserDAOImpl implements UserDAO
return resultList;
}
+ @Override
@CommitAfter
@PersistenceContext(unitName = AppConstants.TEST_PERSISTENCE_UNIT)
public void delete(final User... users)
@@ -54,6 +57,7 @@ public class UserDAOImpl implements UserDAO
entityManager.remove(user);
}
+ @Override
public void deleteAll()
{
for (final User u : findAll())
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-json/src/main/java/org/apache/tapestry5/internal/json/StringToJSONArray.java
----------------------------------------------------------------------
diff --git a/tapestry-json/src/main/java/org/apache/tapestry5/internal/json/StringToJSONArray.java b/tapestry-json/src/main/java/org/apache/tapestry5/internal/json/StringToJSONArray.java
index 3c58779..71602a0 100644
--- a/tapestry-json/src/main/java/org/apache/tapestry5/internal/json/StringToJSONArray.java
+++ b/tapestry-json/src/main/java/org/apache/tapestry5/internal/json/StringToJSONArray.java
@@ -21,6 +21,7 @@ import org.apache.tapestry5.json.JSONArray;
* @since 5.3
*/
public class StringToJSONArray implements Coercion<String,JSONArray> {
+ @Override
public JSONArray coerce(String input) {
return new JSONArray(input);
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-json/src/main/java/org/apache/tapestry5/internal/json/StringToJSONObject.java
----------------------------------------------------------------------
diff --git a/tapestry-json/src/main/java/org/apache/tapestry5/internal/json/StringToJSONObject.java b/tapestry-json/src/main/java/org/apache/tapestry5/internal/json/StringToJSONObject.java
index 0ffb2c3..faf1f1f 100644
--- a/tapestry-json/src/main/java/org/apache/tapestry5/internal/json/StringToJSONObject.java
+++ b/tapestry-json/src/main/java/org/apache/tapestry5/internal/json/StringToJSONObject.java
@@ -21,6 +21,7 @@ import org.apache.tapestry5.json.JSONObject;
* @since 5.3
*/
public class StringToJSONObject implements Coercion<String,JSONObject> {
+ @Override
public JSONObject coerce(String input) {
return new JSONObject(input);
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-json/src/main/java/org/apache/tapestry5/json/CompactSession.java
----------------------------------------------------------------------
diff --git a/tapestry-json/src/main/java/org/apache/tapestry5/json/CompactSession.java b/tapestry-json/src/main/java/org/apache/tapestry5/json/CompactSession.java
index 563d17e..8eced69 100644
--- a/tapestry-json/src/main/java/org/apache/tapestry5/json/CompactSession.java
+++ b/tapestry-json/src/main/java/org/apache/tapestry5/json/CompactSession.java
@@ -30,21 +30,25 @@ class CompactSession implements JSONPrintSession
this.writer = writer;
}
+ @Override
public JSONPrintSession indent()
{
return this;
}
+ @Override
public JSONPrintSession newline()
{
return this;
}
+ @Override
public JSONPrintSession outdent()
{
return this;
}
+ @Override
public JSONPrintSession print(String value)
{
writer.print(value);
@@ -52,11 +56,13 @@ class CompactSession implements JSONPrintSession
return this;
}
+ @Override
public JSONPrintSession printQuoted(String value)
{
return print(JSONObject.quote(value));
}
+ @Override
public JSONPrintSession printSymbol(char symbol)
{
writer.print(symbol);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONArray.java
----------------------------------------------------------------------
diff --git a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONArray.java b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONArray.java
index 055ae43..b679bc7 100644
--- a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONArray.java
+++ b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONArray.java
@@ -117,6 +117,7 @@ public final class JSONArray extends JSONCollection implements Iterable<Object>
return new JSONArray().putAll(iterable);
}
+ @Override
public Iterator<Object> iterator()
{
return list.iterator();
@@ -446,6 +447,7 @@ public final class JSONArray extends JSONCollection implements Iterable<Object>
return list.equals(other.list);
}
+ @Override
void print(JSONPrintSession session)
{
session.printSymbol('[');
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONLiteral.java
----------------------------------------------------------------------
diff --git a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONLiteral.java b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONLiteral.java
index 8627134..a1e3b21 100644
--- a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONLiteral.java
+++ b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONLiteral.java
@@ -43,6 +43,7 @@ public class JSONLiteral implements JSONString, Serializable
return text;
}
+ @Override
public String toJSONString()
{
return text;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java
----------------------------------------------------------------------
diff --git a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java
index c8dd777..8c42bc4 100644
--- a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java
+++ b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java
@@ -126,6 +126,7 @@ public final class JSONObject extends JSONCollection
return "null";
}
+ @Override
public String toJSONString()
{
return "null";
@@ -871,6 +872,7 @@ public final class JSONObject extends JSONCollection
*
* @since 5.2.0
*/
+ @Override
void print(JSONPrintSession session)
{
session.printSymbol('{');
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-json/src/main/java/org/apache/tapestry5/json/PrettyPrintSession.java
----------------------------------------------------------------------
diff --git a/tapestry-json/src/main/java/org/apache/tapestry5/json/PrettyPrintSession.java b/tapestry-json/src/main/java/org/apache/tapestry5/json/PrettyPrintSession.java
index 6316fbd..c371993 100644
--- a/tapestry-json/src/main/java/org/apache/tapestry5/json/PrettyPrintSession.java
+++ b/tapestry-json/src/main/java/org/apache/tapestry5/json/PrettyPrintSession.java
@@ -54,6 +54,7 @@ class PrettyPrintSession implements JSONPrintSession
this.indentString = indentString;
}
+ @Override
public JSONPrintSession indent()
{
indentLevel++;
@@ -61,6 +62,7 @@ class PrettyPrintSession implements JSONPrintSession
return this;
}
+ @Override
public JSONPrintSession newline()
{
if (position != Position.MARGIN)
@@ -72,6 +74,7 @@ class PrettyPrintSession implements JSONPrintSession
return this;
}
+ @Override
public JSONPrintSession outdent()
{
indentLevel--;
@@ -105,6 +108,7 @@ class PrettyPrintSession implements JSONPrintSession
addSep();
}
+ @Override
public JSONPrintSession print(String value)
{
prepareToPrint();
@@ -116,11 +120,13 @@ class PrettyPrintSession implements JSONPrintSession
return this;
}
+ @Override
public JSONPrintSession printQuoted(String value)
{
return print(JSONObject.quote(value));
}
+ @Override
public JSONPrintSession printSymbol(char symbol)
{
addIndentation();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/internal/services/KaptchaDataTypeAnalyzer.java
----------------------------------------------------------------------
diff --git a/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/internal/services/KaptchaDataTypeAnalyzer.java b/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/internal/services/KaptchaDataTypeAnalyzer.java
index 820439a..c7f3016 100644
--- a/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/internal/services/KaptchaDataTypeAnalyzer.java
+++ b/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/internal/services/KaptchaDataTypeAnalyzer.java
@@ -20,6 +20,7 @@ import org.apache.tapestry5.services.DataTypeAnalyzer;
public class KaptchaDataTypeAnalyzer implements DataTypeAnalyzer
{
+ @Override
public String identifyDataType(PropertyAdapter adapter)
{
final Kaptcha annotation = adapter.getAnnotation(Kaptcha.class);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/internal/services/KaptchaProducerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/internal/services/KaptchaProducerImpl.java b/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/internal/services/KaptchaProducerImpl.java
index d61e3c4..cdeae23 100644
--- a/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/internal/services/KaptchaProducerImpl.java
+++ b/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/internal/services/KaptchaProducerImpl.java
@@ -42,21 +42,25 @@ public class KaptchaProducerImpl implements KaptchaProducer
width = config.getWidth();
}
+ @Override
public int getHeight()
{
return height;
}
+ @Override
public int getWidth()
{
return width;
}
+ @Override
public BufferedImage createImage(String text)
{
return producer.createImage(text);
}
+ @Override
public String createText()
{
return producer.createText();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-kaptcha/src/test/java/kaptcha/demo/services/AppModule.java
----------------------------------------------------------------------
diff --git a/tapestry-kaptcha/src/test/java/kaptcha/demo/services/AppModule.java b/tapestry-kaptcha/src/test/java/kaptcha/demo/services/AppModule.java
index b141291..463e0ff 100644
--- a/tapestry-kaptcha/src/test/java/kaptcha/demo/services/AppModule.java
+++ b/tapestry-kaptcha/src/test/java/kaptcha/demo/services/AppModule.java
@@ -41,21 +41,25 @@ public class AppModule
return new KaptchaProducer()
{
+ @Override
public int getWidth()
{
return producer.getWidth();
}
+ @Override
public int getHeight()
{
return producer.getHeight();
}
+ @Override
public BufferedImage createImage(String text)
{
return producer.createImage(text);
}
+ @Override
public String createText()
{
logger.info(String.format("Kaptcha text: '%s'", producer.createText()));
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-runner/src/main/java/org/apache/tapestry5/test/Jetty7Runner.java
----------------------------------------------------------------------
diff --git a/tapestry-runner/src/main/java/org/apache/tapestry5/test/Jetty7Runner.java b/tapestry-runner/src/main/java/org/apache/tapestry5/test/Jetty7Runner.java
index a87ec7b..4138528 100644
--- a/tapestry-runner/src/main/java/org/apache/tapestry5/test/Jetty7Runner.java
+++ b/tapestry-runner/src/main/java/org/apache/tapestry5/test/Jetty7Runner.java
@@ -84,6 +84,7 @@ public class Jetty7Runner implements ServletContainerRunner
}
/** Immediately shuts down the server instance. */
+ @Override
public void stop()
{
System.out.printf("Stopping Jetty instance on port %d/%d\n", port, sslPort);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-runner/src/main/java/org/apache/tapestry5/test/Tomcat6Runner.java
----------------------------------------------------------------------
diff --git a/tapestry-runner/src/main/java/org/apache/tapestry5/test/Tomcat6Runner.java b/tapestry-runner/src/main/java/org/apache/tapestry5/test/Tomcat6Runner.java
index 3367a15..03a4e9b 100644
--- a/tapestry-runner/src/main/java/org/apache/tapestry5/test/Tomcat6Runner.java
+++ b/tapestry-runner/src/main/java/org/apache/tapestry5/test/Tomcat6Runner.java
@@ -104,6 +104,7 @@ public class Tomcat6Runner implements ServletContainerRunner
/**
* Immediately shuts down the server instance.
*/
+ @Override
public void stop()
{
System.out.printf("Stopping Tomcat instance on port %d/%d\n", port, sslPort);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/SpringBeanServiceDef.java
----------------------------------------------------------------------
diff --git a/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/SpringBeanServiceDef.java b/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/SpringBeanServiceDef.java
index cce8095..4af153e 100644
--- a/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/SpringBeanServiceDef.java
+++ b/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/SpringBeanServiceDef.java
@@ -35,15 +35,18 @@ public class SpringBeanServiceDef implements ServiceDef2
this.context = context;
}
+ @Override
public boolean isPreventDecoration()
{
return true;
}
+ @Override
public ObjectCreator createServiceCreator(ServiceBuilderResources resources)
{
return new ObjectCreator()
{
+ @Override
public Object createObject()
{
return context.getBean(beanName);
@@ -57,26 +60,31 @@ public class SpringBeanServiceDef implements ServiceDef2
};
}
+ @Override
public String getServiceId()
{
return beanName;
}
+ @Override
public Set<Class> getMarkers()
{
return Collections.emptySet();
}
+ @Override
public Class getServiceInterface()
{
return context.getType(beanName);
}
+ @Override
public String getServiceScope()
{
return ScopeConstants.DEFAULT;
}
+ @Override
public boolean isEagerLoad()
{
return false;
[7/7] git commit: Required Java version is now 1.6,
this applies to building as well as to using Tapestry
Posted by jk...@apache.org.
Required Java version is now 1.6, this applies to building as well as to using Tapestry
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/b553edf0
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/b553edf0
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/b553edf0
Branch: refs/heads/master
Commit: b553edf0cd8538e4c8c8562a2bf4daca11a63482
Parents: 5f8deb1
Author: Jochen Kemnade <jo...@eddyson.de>
Authored: Fri May 23 16:25:40 2014 +0200
Committer: Jochen Kemnade <jo...@eddyson.de>
Committed: Fri May 23 16:26:26 2014 +0200
----------------------------------------------------------------------
54_RELEASE_NOTES.md | 4 +
build.gradle | 8 +-
.../plastic/AbstractAnnotationBuilder.java | 5 +
.../plastic/AbstractMethodInvocation.java | 10 ++
.../internal/plastic/AnnotationBuilder.java | 3 +
.../internal/plastic/ClassInstantiatorImpl.java | 5 +
.../plastic/DelegatingAnnotationAccess.java | 2 +
.../internal/plastic/EmptyAnnotationAccess.java | 2 +
.../plastic/FailureMethodInvocationResult.java | 4 +
.../internal/plastic/FieldHandleImpl.java | 2 +
.../plastic/InstructionBuilderImpl.java | 67 ++++++++
.../internal/plastic/LocalVariable.java | 1 +
.../internal/plastic/MethodAdviceManager.java | 9 ++
.../internal/plastic/MethodHandleImpl.java | 2 +
.../internal/plastic/MethodParameterImpl.java | 2 +
.../internal/plastic/NoopDelegate.java | 2 +
.../internal/plastic/PlasticClassImpl.java | 28 ++++
.../internal/plastic/PlasticClassPool.java | 13 ++
.../internal/plastic/PlasticFieldImpl.java | 21 +++
.../internal/plastic/PlasticMember.java | 2 +
.../internal/plastic/PlasticMethodImpl.java | 19 +++
.../plastic/SuccessMethodInvocationResult.java | 4 +
.../internal/plastic/SwitchBlockImpl.java | 3 +
.../internal/plastic/TryCatchBlockImpl.java | 3 +
.../tapestry5/plastic/MethodDescription.java | 1 +
.../tapestry5/plastic/PlasticManager.java | 2 +
.../tapestry5/plastic/test/NoopAdvice.java | 1 +
.../java/testsubjects/AccessMethodsSubject.java | 2 +
.../ProtectedFieldCollaborator.java | 1 +
.../testsubjects/TestInjectTransformer.java | 1 +
.../modules/BeanValidatorModule.java | 7 +
.../internal/beanvalidator/BaseCCD.java | 2 +
.../beanvalidator/BeanFieldValidator.java | 5 +
.../BeanFieldValidatorDefaultSource.java | 2 +
.../BeanValidationGroupSourceImpl.java | 1 +
.../beanvalidator/BeanValidatorSourceImpl.java | 2 +
.../ClientConstraintDescriptorImpl.java | 1 +
.../beanvalidator/MessageInterpolatorImpl.java | 2 +
.../org/example/testapp/services/AppModule.java | 1 +
.../internal/clojure/AnnotationMapper.java | 1 +
.../internal/clojure/ClojureBuilderImpl.java | 4 +
.../internal/clojure/DefaultMapper.java | 1 +
.../org/apache/tapestry5/func/AbstractFlow.java | 30 ++++
.../org/apache/tapestry5/func/ArrayFlow.java | 14 ++
.../org/apache/tapestry5/func/EmptyFlow.java | 18 +++
.../main/java/org/apache/tapestry5/func/F.java | 28 ++++
.../org/apache/tapestry5/func/Interleaver.java | 2 +
.../org/apache/tapestry5/func/LazyConcat.java | 1 +
.../org/apache/tapestry5/func/LazyDrop.java | 1 +
.../org/apache/tapestry5/func/LazyFilter.java | 1 +
.../org/apache/tapestry5/func/LazyFirst.java | 1 +
.../org/apache/tapestry5/func/LazyFlow.java | 3 +
.../org/apache/tapestry5/func/LazyIterator.java | 1 +
.../apache/tapestry5/func/LazyMapped2Value.java | 1 +
.../apache/tapestry5/func/LazyMappedValue.java | 1 +
.../org/apache/tapestry5/func/LazyMapper.java | 1 +
.../org/apache/tapestry5/func/LazyMapper2.java | 1 +
.../org/apache/tapestry5/func/LazyRange.java | 1 +
.../org/apache/tapestry5/func/LazyTake.java | 1 +
.../org/apache/tapestry5/func/LazyWalk.java | 1 +
.../java/org/apache/tapestry5/func/LazyZip.java | 1 +
.../org/apache/tapestry5/func/LazyZipValue.java | 1 +
.../org/apache/tapestry5/func/StaticValue.java | 1 +
.../apache/tapestry5/func/ZippedFlowImpl.java | 31 ++++
.../org/apache/tapestry5/func/BaseFuncTest.java | 3 +
.../org/apache/tapestry5/func/FuncTest.java | 14 ++
.../org/apache/tapestry5/func/MapperTest.java | 3 +
.../org/apache/tapestry5/func/RangeTests.java | 1 +
.../apache/tapestry5/func/ZippedFlowTests.java | 3 +
.../hibernate/modules/HibernateCoreModule.java | 2 +
.../hibernate/DefaultHibernateConfigurer.java | 1 +
.../hibernate/HibernateSessionManagerImpl.java | 4 +
.../hibernate/HibernateSessionSourceImpl.java | 4 +
.../HibernateTransactionAdvisorImpl.java | 2 +
.../HibernateTransactionDecoratorImpl.java | 1 +
.../PackageNameHibernateConfigurer.java | 1 +
.../HibernateSessionSourceImplTest.java | 1 +
.../HibernateTransactionDecoratorImplTest.java | 4 +
.../hibernate/HibernateGridDataSource.java | 4 +
.../hibernate/modules/HibernateModule.java | 1 +
.../internal/hibernate/CommitAfterWorker.java | 2 +
...tityApplicationStatePersistenceStrategy.java | 2 +
.../hibernate/HibernateEntityValueEncoder.java | 2 +
.../internal/hibernate/PersistedEntity.java | 1 +
.../hibernate/PersistedTransientEntity.java | 1 +
.../org/example/app0/services/AppModule.java | 1 +
.../org/example/app0/services/UserDAOImpl.java | 4 +
.../ioc/test/TapestryIOCJUnit4ClassRunner.java | 12 ++
.../apache/tapestry5/ioc/test/MapModuleDef.java | 13 ++
.../org/apache/tapestry5/ioc/BaseLocatable.java | 1 +
.../AbstractReloadableObjectCreator.java | 5 +
.../ioc/internal/AbstractServiceCreator.java | 1 +
.../tapestry5/ioc/internal/AdvisorDefImpl.java | 2 +
.../ioc/internal/AdvisorStackBuilder.java | 2 +
.../ioc/internal/AnnotationAccessImpl.java | 2 +
.../ioc/internal/ConstructorServiceCreator.java | 1 +
.../ioc/internal/ContributionDefImpl.java | 7 +
.../ioc/internal/DecoratorDefImpl.java | 2 +
.../ioc/internal/DefaultModuleDefImpl.java | 14 ++
.../tapestry5/ioc/internal/IdMatcherImpl.java | 1 +
.../ioc/internal/InterceptorStackBuilder.java | 2 +
.../LifecycleWrappedServiceCreator.java | 1 +
.../ioc/internal/LoggerSourceImpl.java | 2 +
.../tapestry5/ioc/internal/ModuleImpl.java | 21 +++
.../ioc/internal/NullAnnotationProvider.java | 1 +
.../ioc/internal/ObjectLocatorImpl.java | 7 +
.../ioc/internal/OperationTrackerImpl.java | 3 +
.../OperationTrackingObjectCreator.java | 2 +
.../tapestry5/ioc/internal/OrIdMatcher.java | 1 +
.../ioc/internal/PerThreadOperationTracker.java | 3 +
.../ioc/internal/QuietOperationTracker.java | 3 +
.../RecursiveServiceCreationCheckWrapper.java | 1 +
.../tapestry5/ioc/internal/RegistryImpl.java | 49 ++++++
.../tapestry5/ioc/internal/RegistryWrapper.java | 10 ++
.../internal/ReloadableObjectCreatorSource.java | 3 +
...dableServiceImplementationObjectCreator.java | 1 +
.../internal/ServiceActivityTrackerImpl.java | 8 +
.../ioc/internal/ServiceAdvisorImpl.java | 1 +
.../ioc/internal/ServiceBinderImpl.java | 15 ++
.../internal/ServiceBuilderMethodInvoker.java | 1 +
.../ioc/internal/ServiceDecoratorImpl.java | 1 +
.../tapestry5/ioc/internal/ServiceDefImpl.java | 11 ++
.../ioc/internal/ServiceResourcesImpl.java | 15 ++
.../ioc/internal/SingletonServiceLifecycle.java | 3 +
.../tapestry5/ioc/internal/StartupDefImpl.java | 2 +
.../ioc/internal/TypeCoercerProxyImpl.java | 1 +
.../ValidatingConfigurationWrapper.java | 2 +
.../ValidatingMappedConfigurationWrapper.java | 4 +
.../ValidatingOrderedConfigurationWrapper.java | 4 +
.../AbtractAspectInterceptorBuilder.java | 3 +
.../AccessableObjectAnnotationProvider.java | 1 +
.../services/AnnotationProviderChain.java | 1 +
.../internal/services/AspectDecoratorImpl.java | 6 +
.../services/AspectInterceptorBuilderImpl.java | 5 +
.../services/AutobuildObjectProvider.java | 1 +
.../ioc/internal/services/BridgeBuilder.java | 3 +
.../internal/services/CachingObjectCreator.java | 1 +
.../ioc/internal/services/ChainBuilderImpl.java | 6 +
.../internal/services/ClassNameLocatorImpl.java | 3 +
.../services/ClassPropertyAdapterImpl.java | 6 +
.../internal/services/ClasspathScannerImpl.java | 4 +
.../services/ClasspathURLConverterImpl.java | 1 +
.../ioc/internal/services/CompoundCoercion.java | 1 +
.../DefaultImplementationBuilderImpl.java | 2 +
.../services/ExceptionAnalysisImpl.java | 1 +
.../services/ExceptionAnalyzerImpl.java | 1 +
.../internal/services/ExceptionInfoImpl.java | 5 +
.../internal/services/ExceptionTrackerImpl.java | 1 +
.../services/JustInTimeObjectCreator.java | 4 +
.../ioc/internal/services/LazyAdvisorImpl.java | 3 +
.../ioc/internal/services/LoggingAdvice.java | 1 +
.../internal/services/LoggingAdvisorImpl.java | 1 +
.../internal/services/LoggingDecoratorImpl.java | 1 +
.../internal/services/MapSymbolProvider.java | 1 +
.../services/MasterObjectProviderImpl.java | 2 +
.../ioc/internal/services/MethodIterator.java | 1 +
.../internal/services/NonParallelExecutor.java | 7 +
.../internal/services/OperationAdvisorImpl.java | 5 +
.../internal/services/ParallelExecutorImpl.java | 4 +
.../services/PerThreadServiceCreator.java | 1 +
.../services/PerThreadServiceLifecycle.java | 2 +
.../internal/services/PerthreadManagerImpl.java | 12 ++
.../internal/services/PipelineBuilderImpl.java | 2 +
.../services/PlasticClassListenerLogger.java | 1 +
.../services/PlasticProxyFactoryImpl.java | 16 ++
.../internal/services/PropertyAccessImpl.java | 6 +
.../internal/services/PropertyAdapterImpl.java | 15 ++
.../services/PropertyShadowBuilderImpl.java | 4 +
.../services/RegistryShutdownHubImpl.java | 5 +
.../ioc/internal/services/RegistryStartup.java | 1 +
.../services/ResourceSymbolProvider.java | 1 +
.../internal/services/ServiceOverrideImpl.java | 2 +
.../internal/services/StaticObjectProvider.java | 1 +
.../internal/services/StrategyBuilderImpl.java | 4 +
.../ioc/internal/services/StringLocation.java | 3 +
.../internal/services/SymbolObjectProvider.java | 1 +
.../ioc/internal/services/SymbolSourceImpl.java | 2 +
.../services/SystemEnvSymbolProvider.java | 1 +
.../SystemPropertiesSymbolProvider.java | 1 +
.../ioc/internal/services/ThreadLocaleImpl.java | 2 +
.../ioc/internal/services/ThunkCreatorImpl.java | 4 +
.../ioc/internal/services/TypeCoercerImpl.java | 6 +
.../services/UpdateListenerHubImpl.java | 2 +
.../internal/services/ValueObjectProvider.java | 1 +
.../internal/services/cron/CronExpression.java | 1 +
.../services/cron/PeriodicExecutorImpl.java | 8 +
.../ioc/internal/util/AbstractResource.java | 8 +
.../ioc/internal/util/ClasspathResource.java | 1 +
.../ioc/internal/util/ConcurrentBarrier.java | 2 +
.../ioc/internal/util/ConstructionPlan.java | 2 +
.../ioc/internal/util/ConstructorInvoker.java | 1 +
.../util/DelegatingInjectionResources.java | 1 +
.../tapestry5/ioc/internal/util/DummyLock.java | 6 +
.../ioc/internal/util/GenericsUtils.java | 6 +
.../ioc/internal/util/IdToDependencyNode.java | 2 +
.../ioc/internal/util/InheritanceSearch.java | 4 +
.../ioc/internal/util/InternalUtils.java | 78 +++++++++
.../ioc/internal/util/LocationImpl.java | 3 +
.../internal/util/LoggingInvokableWrapper.java | 1 +
.../internal/util/MapInjectionResources.java | 1 +
.../ioc/internal/util/MessageFormatterImpl.java | 2 +
.../ioc/internal/util/MessagesImpl.java | 1 +
.../ioc/internal/util/MethodInvoker.java | 1 +
.../tapestry5/ioc/internal/util/Orderer.java | 2 +
.../ioc/internal/util/TapestryException.java | 1 +
.../util/WrongConfigurationTypeGuard.java | 1 +
.../ioc/modules/TapestryIOCModule.java | 32 ++++
.../tapestry5/ioc/services/CoercionTuple.java | 1 +
.../ioc/services/cron/CronSchedule.java | 2 +
.../ioc/services/cron/IntervalSchedule.java | 2 +
.../tapestry5/ioc/util/AbstractMessages.java | 4 +
.../tapestry5/ioc/util/CaseInsensitiveMap.java | 6 +
.../ioc/util/LocalizedNameGenerator.java | 4 +
.../tapestry5/util/StringToEnumCoercion.java | 1 +
.../src/test/java/com/example/CounterImpl.java | 2 +
.../java/com/example/ExtraRunnableModule.java | 3 +
.../apache/tapestry5/ioc/AdviceDemoModule.java | 2 +
.../org/apache/tapestry5/ioc/BarneyModule.java | 6 +
.../tapestry5/ioc/ContributeByClassModule.java | 2 +
.../tapestry5/ioc/CountingGreeterImpl.java | 1 +
.../apache/tapestry5/ioc/CyclicMOPModule.java | 1 +
.../ioc/FailInConstructorRunnable.java | 1 +
.../tapestry5/ioc/FieldResourceServiceImpl.java | 2 +
.../org/apache/tapestry5/ioc/FredModule.java | 5 +
.../org/apache/tapestry5/ioc/GreeterModule.java | 3 +
.../apache/tapestry5/ioc/GreeterModule2.java | 2 +
.../ioc/GreeterServiceOverrideModule.java | 2 +
.../tapestry5/ioc/InjectionCheckImpl.java | 2 +
.../org/apache/tapestry5/ioc/IntHolderImpl.java | 1 +
.../ioc/InvalidContributeDefModule2.java | 1 +
.../ioc/InvalidContributeDefModule3.java | 1 +
.../org/apache/tapestry5/ioc/LocalModule.java | 3 +
.../NoImplementationClassForSimpleIdModule.java | 1 +
.../ioc/RecursiveConstructorModule.java | 1 +
.../apache/tapestry5/ioc/RedGreeterImpl.java | 1 +
.../ioc/RegistryBuilderTestModule.java | 1 +
.../org/apache/tapestry5/ioc/RocketImpl.java | 1 +
.../tapestry5/ioc/ServiceBuilderModule.java | 3 +
.../apache/tapestry5/ioc/ServiceIdGreeter.java | 1 +
.../tapestry5/ioc/SpecificDecoratorModule.java | 1 +
.../org/apache/tapestry5/ioc/StaticModule.java | 4 +
.../apache/tapestry5/ioc/StringHolderImpl.java | 2 +
.../ioc/SymbolExpandingTransformer.java | 1 +
.../tapestry5/ioc/UnbuildablePingable.java | 1 +
.../tapestry5/ioc/UnknownColorGreeterImpl.java | 1 +
.../ioc/UppercaseStringTransformer.java | 1 +
.../ioc/internal/AdviseByMarkerModule.java | 2 +
.../ioc/internal/AdviseByMarkerModule2.java | 2 +
.../tapestry5/ioc/internal/AlphabetModule.java | 2 +
.../tapestry5/ioc/internal/AlphabetModule2.java | 2 +
.../internal/AnnotatedServiceInterfaceImpl.java | 1 +
.../ioc/internal/DecorateByMarkerModule.java | 2 +
.../ioc/internal/DecorateByMarkerModule2.java | 2 +
.../EagerLoadViaAnnotationServiceImpl.java | 1 +
.../ExceptionInConstructorServiceImpl.java | 1 +
.../internal/ExtraPublicConstructorsModule.java | 1 +
.../MultipleConstructorsAutobuildService.java | 2 +
.../internal/NamedViaAnnotationServiceImpl.java | 1 +
.../NonAnnotatedServiceInterfaceImpl.java | 1 +
.../ioc/internal/NoopClassLoaderDelegate.java | 2 +
.../ioc/internal/RunnableServiceImpl.java | 1 +
.../ServiceIdViaAnnotationServiceImpl.java | 1 +
...ServiceIdViaMethodAnnotationServiceImpl.java | 1 +
.../tapestry5/ioc/internal/TestAdvice.java | 1 +
.../tapestry5/ioc/internal/ToStringService.java | 1 +
.../ioc/internal/ToUpperCaseStringHolder.java | 2 +
.../ioc/internal/UpcaseServiceImpl.java | 1 +
.../ioc/internal/services/StartupModule.java | 1 +
.../ioc/internal/services/ToStringService.java | 1 +
.../ioc/internal/util/ConcurrentTarget.java | 11 ++
.../internal/util/ConcurrentTargetWrapper.java | 2 +
.../ioc/internal/util/DrivableImpl.java | 1 +
.../ioc/internal/util/PlayableImpl.java | 1 +
.../ioc/internal/util/ToyTruckImpl.java | 1 +
.../tapestry5/javadoc/TapestryDocTaglet.java | 11 ++
.../apache/tapestry5/javadoc/XDocStreamer.java | 21 +++
.../internal/jmx/MBeanSupportImpl.java | 4 +
.../example/testapp/services/SampleImpl.java | 1 +
.../internal/jpa/CommitAfterMethodAdvice.java | 1 +
.../internal/jpa/CommitAfterWorker.java | 1 +
.../internal/jpa/EntityManagerManagerImpl.java | 3 +
.../jpa/EntityManagerObjectProvider.java | 2 +
.../internal/jpa/EntityManagerSourceImpl.java | 8 +
.../internal/jpa/JpaTransactionAdvisorImpl.java | 1 +
.../tapestry5/internal/jpa/JpaValueEncoder.java | 2 +
.../PackageNamePersistenceUnitConfigurer.java | 1 +
.../internal/jpa/PersistenceContentHandler.java | 11 ++
.../internal/jpa/PersistenceContextWorker.java | 2 +
.../internal/jpa/PersistenceUnitInfoImpl.java | 32 ++++
.../apache/tapestry5/jpa/JpaGridDataSource.java | 4 +
.../apache/tapestry5/jpa/modules/JpaModule.java | 2 +
.../jpa/EntityManagerSourceImplTest.java | 1 +
.../jpa/JpaTransactionAdvisorImplTest.java | 4 +
.../integration/app5/DummyEntityManager.java | 40 +++++
.../app5/DummyEntityManagerFactory.java | 9 ++
.../app5/DummyPersistenceProvider.java | 3 +
.../org/example/app1/services/AppModule.java | 2 +
.../example/app1/services/impl/UserDAOImpl.java | 4 +
.../example/app2/services/impl/UserDAOImpl.java | 1 +
.../org/example/app3/services/AppModule.java | 1 +
.../org/example/app5/services/AppModule.java | 2 +
.../org/example/app6/services/AppModule.java | 2 +
.../example/app6/services/impl/UserDAOImpl.java | 4 +
.../internal/json/StringToJSONArray.java | 1 +
.../internal/json/StringToJSONObject.java | 1 +
.../apache/tapestry5/json/CompactSession.java | 6 +
.../org/apache/tapestry5/json/JSONArray.java | 2 +
.../org/apache/tapestry5/json/JSONLiteral.java | 1 +
.../org/apache/tapestry5/json/JSONObject.java | 2 +
.../tapestry5/json/PrettyPrintSession.java | 6 +
.../services/KaptchaDataTypeAnalyzer.java | 1 +
.../internal/services/KaptchaProducerImpl.java | 4 +
.../java/kaptcha/demo/services/AppModule.java | 4 +
.../org/apache/tapestry5/test/Jetty7Runner.java | 1 +
.../apache/tapestry5/test/Tomcat6Runner.java | 1 +
.../internal/spring/SpringBeanServiceDef.java | 8 +
.../internal/spring/SpringModuleDef.java | 20 +++
.../internal/spring/StaticObjectCreator.java | 1 +
.../internal/spring/TapestryBeanFactory.java | 1 +
.../tapestry5/spring/modules/SpringModule.java | 2 +
.../org/example/testapp/services/AppModule.java | 1 +
.../testapp/services/FlintstoneImpl.java | 1 +
.../services/SpringStatusProviderFactory.java | 3 +
.../example/testapp/services/UpcaseImpl.java | 1 +
.../services/UpcaseStringTransformerImpl.java | 1 +
.../testapp/services/ViaFactoryFactory.java | 4 +
.../tapestry5/test/ErrorReporterImpl.java | 1 +
.../test/ErrorReportingCommandProcessor.java | 13 ++
.../apache/tapestry5/test/SeleniumTestCase.java | 157 +++++++++++++++++++
.../test/integration/SanityCheckTestSuite.java | 1 +
.../internal/services/MultipartDecoderImpl.java | 4 +
.../services/MultipartServletRequestFilter.java | 1 +
.../services/UploadExceptionFilter.java | 1 +
.../internal/services/UploadedFileItem.java | 7 +
.../tapestry5/upload/modules/UploadModule.java | 1 +
.../upload/internal/services/StubFileItem.java | 17 ++
.../webresources/AbstractMinimizer.java | 2 +
.../webresources/CoffeeScriptCompiler.java | 2 +
.../webresources/ContentChangeTracker.java | 1 +
.../webresources/LessResourceTransformer.java | 3 +
.../ResourceDependenciesSplitter.java | 1 +
.../ResourceTransformerFactoryImpl.java | 10 ++
.../webresources/RhinoExecutorPool.java | 4 +
.../modules/WebResourcesModule.java | 1 +
344 files changed, 1648 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/54_RELEASE_NOTES.md
----------------------------------------------------------------------
diff --git a/54_RELEASE_NOTES.md b/54_RELEASE_NOTES.md
index 6a9ac4d..8044c85 100644
--- a/54_RELEASE_NOTES.md
+++ b/54_RELEASE_NOTES.md
@@ -384,3 +384,7 @@ look and feel.
The Grid component no longer emits CSS class names, instead it renders data attributes into Grid headers, rows, and cells,
such as `data-grid-row="first"`, `data-grid-property="title"`, etc. These attributes may still be referenced using CSS rules
where desired.
+
+## Java 1.6 required
+
+As of version 5.4, Tapestry requires Java 1.6 at least.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 2b7fd18..74b24bd 100755
--- a/build.gradle
+++ b/build.gradle
@@ -106,9 +106,7 @@ allprojects {
idea {
project {
- // Leave at 1.5 to make sure that IDEA doesn't break the build for non-IDEA users by inserting
- // @Override on implementations all over the place.
- languageLevel = "1.5"
+ languageLevel = "1.6"
// But this is what most (all?) of the devs are actually using:
jdkName = "1.7"
}
@@ -150,8 +148,8 @@ subprojects {
apply plugin: "maven" // for deployment
apply plugin: "project-report"
- sourceCompatibility = "1.5"
- targetCompatibility = "1.5"
+ sourceCompatibility = "1.6"
+ targetCompatibility = "1.6"
// See http://jira.codehaus.org/browse/GRADLE-784
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractAnnotationBuilder.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractAnnotationBuilder.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractAnnotationBuilder.java
index f9f54c7..8421b30 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractAnnotationBuilder.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractAnnotationBuilder.java
@@ -42,6 +42,7 @@ public abstract class AbstractAnnotationBuilder extends AnnotationVisitor
throw new IllegalStateException("elementTypeForArrayAttribute() may not be invoked here.");
}
+ @Override
public void visit(String name, Object value)
{
if (value instanceof Type)
@@ -56,6 +57,7 @@ public abstract class AbstractAnnotationBuilder extends AnnotationVisitor
store(name, value);
}
+ @Override
public void visitEnum(String name, String desc, String value)
{
@@ -76,6 +78,7 @@ public abstract class AbstractAnnotationBuilder extends AnnotationVisitor
}
}
+ @Override
public AnnotationVisitor visitAnnotation(final String name, String desc)
{
final AbstractAnnotationBuilder outerBuilder = this;
@@ -101,6 +104,7 @@ public abstract class AbstractAnnotationBuilder extends AnnotationVisitor
* nested annotations. All the arrays of strings and primitives are handled by ASM and become
* a single call to {@link #visit(String, Object)}.
*/
+ @Override
public AnnotationVisitor visitArray(final String name)
{
final List<Object> values = new ArrayList<Object>();
@@ -134,6 +138,7 @@ public abstract class AbstractAnnotationBuilder extends AnnotationVisitor
};
}
+ @Override
public void visitEnd()
{
// Nothing to do here. Subclasses use this as a chance to store a value into an outer
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractMethodInvocation.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractMethodInvocation.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractMethodInvocation.java
index eb9c8cd..cf68617 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractMethodInvocation.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractMethodInvocation.java
@@ -47,17 +47,20 @@ public abstract class AbstractMethodInvocation implements MethodInvocation
checkedException = null;
}
+ @Override
public void rethrow()
{
if (checkedException != null)
throw new RuntimeException(checkedException);
}
+ @Override
public boolean didThrowCheckedException()
{
return checkedException != null;
}
+ @Override
public <T extends Throwable> T getCheckedException(Class<T> exceptionType)
{
assert exceptionType != null;
@@ -68,16 +71,19 @@ public abstract class AbstractMethodInvocation implements MethodInvocation
return null;
}
+ @Override
public Object getInstance()
{
return instance;
}
+ @Override
public InstanceContext getInstanceContext()
{
return instanceContext;
}
+ @Override
public MethodInvocation proceed()
{
if (adviceIndex == bundle.advice.length)
@@ -88,6 +94,7 @@ public abstract class AbstractMethodInvocation implements MethodInvocation
return this;
}
+ @Override
public MethodInvocation setCheckedException(Exception exception)
{
checkedException = exception;
@@ -95,16 +102,19 @@ public abstract class AbstractMethodInvocation implements MethodInvocation
return this;
}
+ @Override
public <T extends Annotation> boolean hasAnnotation(Class<T> annotationType)
{
return getAnnotation(annotationType) != null;
}
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationType)
{
return getMethod().getAnnotation(annotationType);
}
+ @Override
public Method getMethod()
{
return bundle.getMethod(getInstance());
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AnnotationBuilder.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AnnotationBuilder.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AnnotationBuilder.java
index 54e8358..a2101da 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AnnotationBuilder.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AnnotationBuilder.java
@@ -35,6 +35,7 @@ public class AnnotationBuilder extends AbstractAnnotationBuilder
this.attributes = attributes;
}
+ @Override
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
{
// args is null for no-arguments methods
@@ -86,11 +87,13 @@ public class AnnotationBuilder extends AbstractAnnotationBuilder
}
+ @Override
protected void store(String name, Object value)
{
attributes.put(name, value);
}
+ @Override
protected Class elementTypeForArrayAttribute(String name)
{
try
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/ClassInstantiatorImpl.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/ClassInstantiatorImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/ClassInstantiatorImpl.java
index 72d5372..cc93824 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/ClassInstantiatorImpl.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/ClassInstantiatorImpl.java
@@ -53,6 +53,7 @@ public class ClassInstantiatorImpl<T> implements ClassInstantiator<T>, InstanceC
this.withValue = withValue;
}
+ @Override
public <V> ClassInstantiator<T> with(Class<V> valueType, V instanceContextValue)
{
assert valueType != null;
@@ -70,6 +71,7 @@ public class ClassInstantiatorImpl<T> implements ClassInstantiator<T>, InstanceC
instanceContextValue);
}
+ @Override
public <V> V get(Class<V> valueType)
{
V result = find(valueType);
@@ -95,6 +97,7 @@ public class ClassInstantiatorImpl<T> implements ClassInstantiator<T>, InstanceC
return null;
}
+ @Override
public T newInstance()
{
if (Modifier.isAbstract(clazz.getModifiers()))
@@ -112,11 +115,13 @@ public class ClassInstantiatorImpl<T> implements ClassInstantiator<T>, InstanceC
}
}
+ @Override
public Class<T> getInstanceType()
{
return clazz;
}
+ @Override
public String toString()
{
return String.format("ClassInstantiator[%s]", clazz.getName());
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/DelegatingAnnotationAccess.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/DelegatingAnnotationAccess.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/DelegatingAnnotationAccess.java
index 2d1e791..b114b18 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/DelegatingAnnotationAccess.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/DelegatingAnnotationAccess.java
@@ -27,6 +27,7 @@ public class DelegatingAnnotationAccess implements AnnotationAccess
return annotationType.getAnnotation(Inherited.class) != null;
}
+ @Override
public <T extends Annotation> boolean hasAnnotation(Class<T> annotationType)
{
if (primary.hasAnnotation(annotationType))
@@ -35,6 +36,7 @@ public class DelegatingAnnotationAccess implements AnnotationAccess
return isInherited(annotationType) && inherited.hasAnnotation(annotationType);
}
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationType)
{
T fromPrimary = primary.getAnnotation(annotationType);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/EmptyAnnotationAccess.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/EmptyAnnotationAccess.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/EmptyAnnotationAccess.java
index b6ec715..39510ec 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/EmptyAnnotationAccess.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/EmptyAnnotationAccess.java
@@ -26,11 +26,13 @@ public class EmptyAnnotationAccess implements AnnotationAccess
{
}
+ @Override
public <T extends Annotation> boolean hasAnnotation(Class<T> annotationType)
{
return false;
}
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationType)
{
return null;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/FailureMethodInvocationResult.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/FailureMethodInvocationResult.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/FailureMethodInvocationResult.java
index 0c69ae4..84d1b01 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/FailureMethodInvocationResult.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/FailureMethodInvocationResult.java
@@ -27,21 +27,25 @@ public class FailureMethodInvocationResult implements MethodInvocationResult
this.thrown = thrown;
}
+ @Override
public Object getReturnValue()
{
return null;
}
+ @Override
public void rethrow()
{
throw new RuntimeException(thrown);
}
+ @Override
public boolean didThrowCheckedException()
{
return true;
}
+ @Override
public <T extends Throwable> T getCheckedException(Class<T> exceptionType)
{
if (exceptionType.isInstance(thrown))
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/FieldHandleImpl.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/FieldHandleImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/FieldHandleImpl.java
index a873fbb..19e3830 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/FieldHandleImpl.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/FieldHandleImpl.java
@@ -37,6 +37,7 @@ public class FieldHandleImpl implements FieldHandle
return String.format("FieldHandle[%s#%s]", className, fieldName);
}
+ @Override
public Object get(Object instance)
{
checkNullInstance(instance, "get");
@@ -52,6 +53,7 @@ public class FieldHandleImpl implements FieldHandle
className));
}
+ @Override
public void set(Object instance, Object newValue)
{
checkNullInstance(instance, "set");
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderImpl.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderImpl.java
index 6823297..bbead43 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderImpl.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderImpl.java
@@ -106,6 +106,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
this.cache = state.nameCache;
}
+ @Override
public InstructionBuilder returnDefaultValue()
{
check();
@@ -146,6 +147,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder loadThis()
{
check();
@@ -155,6 +157,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder loadNull()
{
check();
@@ -164,6 +167,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder loadArgument(int index)
{
check();
@@ -177,6 +181,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder loadArguments()
{
check();
@@ -189,6 +194,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder invokeSpecial(String containingClassName, MethodDescription description)
{
check();
@@ -198,6 +204,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder invokeVirtual(PlasticMethod method)
{
check();
@@ -210,6 +217,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
description.argumentTypes);
}
+ @Override
public InstructionBuilder invokeVirtual(String className, String returnType, String methodName,
String... argumentTypes)
{
@@ -220,6 +228,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder invokeInterface(String interfaceName, String returnType, String methodName,
String... argumentTypes)
{
@@ -236,6 +245,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
cache.toMethodDescriptor(returnType, argumentTypes));
}
+ @Override
public InstructionBuilder invokeStatic(Class clazz, Class returnType, String methodName, Class... argumentTypes)
{
doInvoke(INVOKESTATIC, clazz, returnType, methodName, argumentTypes);
@@ -249,6 +259,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
PlasticUtils.toTypeNames(argumentTypes));
}
+ @Override
public InstructionBuilder invoke(Method method)
{
check();
@@ -256,6 +267,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return invoke(method.getDeclaringClass(), method.getReturnType(), method.getName(), method.getParameterTypes());
}
+ @Override
public InstructionBuilder invoke(Class clazz, Class returnType, String methodName, Class... argumentTypes)
{
check();
@@ -271,6 +283,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
cache.toDesc(description));
}
+ @Override
public InstructionBuilder returnResult()
{
check();
@@ -284,6 +297,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder boxPrimitive(String typeName)
{
check();
@@ -298,6 +312,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder unboxPrimitive(String typeName)
{
check();
@@ -317,6 +332,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
v.visitMethodInsn(INVOKEVIRTUAL, type.wrapperInternalName, type.toValueMethodName, type.toValueMethodDescriptor);
}
+ @Override
public InstructionBuilder getField(String className, String fieldName, String typeName)
{
check();
@@ -326,6 +342,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder getStaticField(String className, String fieldName, String typeName)
{
check();
@@ -335,6 +352,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder getStaticField(String className, String fieldName, Class fieldType)
{
check();
@@ -342,6 +360,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return getStaticField(className, fieldName, cache.toTypeName(fieldType));
}
+ @Override
public InstructionBuilder putStaticField(String className, String fieldName, Class fieldType)
{
check();
@@ -349,6 +368,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return putStaticField(className, fieldName, cache.toTypeName(fieldType));
}
+ @Override
public InstructionBuilder putStaticField(String className, String fieldName, String typeName)
{
check();
@@ -358,6 +378,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder getField(PlasticField field)
{
check();
@@ -365,6 +386,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return getField(field.getPlasticClass().getClassName(), field.getName(), field.getTypeName());
}
+ @Override
public InstructionBuilder putField(String className, String fieldName, String typeName)
{
check();
@@ -374,6 +396,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder putField(String className, String fieldName, Class fieldType)
{
check();
@@ -381,6 +404,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return putField(className, fieldName, cache.toTypeName(fieldType));
}
+ @Override
public InstructionBuilder getField(String className, String fieldName, Class fieldType)
{
check();
@@ -388,6 +412,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return getField(className, fieldName, cache.toTypeName(fieldType));
}
+ @Override
public InstructionBuilder loadArrayElement(int index, String elementType)
{
check();
@@ -407,6 +432,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder loadArrayElement()
{
check();
@@ -416,6 +442,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder checkcast(String className)
{
check();
@@ -430,6 +457,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder checkcast(Class clazz)
{
check();
@@ -437,6 +465,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return checkcast(cache.toTypeName(clazz));
}
+ @Override
public InstructionBuilder startTryCatch(TryCatchCallback callback)
{
check();
@@ -446,6 +475,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder newInstance(String className)
{
check();
@@ -455,6 +485,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder newInstance(Class clazz)
{
check();
@@ -462,6 +493,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return newInstance(clazz.getName());
}
+ @Override
public InstructionBuilder invokeConstructor(String className, String... argumentTypes)
{
check();
@@ -471,6 +503,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder invokeConstructor(Class clazz, Class... argumentTypes)
{
check();
@@ -478,6 +511,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return invokeConstructor(clazz.getName(), PlasticUtils.toTypeNames(argumentTypes));
}
+ @Override
public InstructionBuilder dupe(int depth)
{
check();
@@ -491,6 +525,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder dupe()
{
check();
@@ -500,6 +535,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder pop()
{
check();
@@ -509,6 +545,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder swap()
{
check();
@@ -518,6 +555,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder loadConstant(Object constant)
{
check();
@@ -532,6 +570,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder loadTypeConstant(String typeName)
{
check();
@@ -543,6 +582,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder loadTypeConstant(Class clazz)
{
check();
@@ -554,6 +594,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder castOrUnbox(String typeName)
{
check();
@@ -569,6 +610,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder throwException(String className, String message)
{
check();
@@ -582,6 +624,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder throwException(Class<? extends Throwable> exceptionType, String message)
{
check();
@@ -589,6 +632,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return throwException(cache.toTypeName(exceptionType), message);
}
+ @Override
public InstructionBuilder throwException()
{
check();
@@ -598,6 +642,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder startSwitch(int min, int max, SwitchCallback callback)
{
check();
@@ -609,6 +654,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder startVariable(String type, final LocalVariableCallback callback)
{
check();
@@ -617,6 +663,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
callback.doBuild(var, builder);
@@ -628,6 +675,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder storeVariable(LocalVariable var)
{
check();
@@ -637,6 +685,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder loadVariable(LocalVariable var)
{
check();
@@ -646,6 +695,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder when(Condition condition, final InstructionBuilderCallback ifTrue)
{
check();
@@ -657,17 +707,20 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return when(condition, new WhenCallback()
{
+ @Override
public void ifTrue(InstructionBuilder builder)
{
ifTrue.doBuild(builder);
}
+ @Override
public void ifFalse(InstructionBuilder builder)
{
}
});
}
+ @Override
public InstructionBuilder when(Condition condition, final WhenCallback callback)
{
check();
@@ -682,6 +735,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
callback.ifTrue(builder);
@@ -694,6 +748,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
callback.ifFalse(builder);
@@ -705,6 +760,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder doWhile(Condition condition, final WhileCallback callback)
{
check();
@@ -718,6 +774,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
callback.buildTest(builder);
@@ -728,6 +785,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
callback.buildBody(builder);
@@ -741,6 +799,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder increment(LocalVariable variable)
{
check();
@@ -752,6 +811,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder arrayLength()
{
check();
@@ -761,22 +821,26 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder iterateArray(final InstructionBuilderCallback callback)
{
startVariable("int", new LocalVariableCallback()
{
+ @Override
public void doBuild(final LocalVariable indexVariable, InstructionBuilder builder)
{
builder.loadConstant(0).storeVariable(indexVariable);
builder.doWhile(Condition.LESS_THAN, new WhileCallback()
{
+ @Override
public void buildTest(InstructionBuilder builder)
{
builder.dupe().arrayLength();
builder.loadVariable(indexVariable).swap();
}
+ @Override
public void buildBody(InstructionBuilder builder)
{
builder.dupe().loadVariable(indexVariable).loadArrayElement();
@@ -792,6 +856,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder dupeWide()
{
check();
@@ -801,6 +866,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder popWide()
{
check();
@@ -810,6 +876,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder compareSpecial(String typeName)
{
check();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/LocalVariable.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/LocalVariable.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/LocalVariable.java
index 9c1ac53..05ef7d5 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/LocalVariable.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/LocalVariable.java
@@ -25,6 +25,7 @@ class LocalVariableImpl implements LocalVariable
this.type = type;
}
+ @Override
public String getType()
{
return type;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodAdviceManager.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodAdviceManager.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodAdviceManager.java
index 92f4d84..870f0c2 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodAdviceManager.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodAdviceManager.java
@@ -206,6 +206,7 @@ class MethodAdviceManager
builder.startSwitch(0, description.argumentTypes.length - 1, new SwitchCallback()
{
+ @Override
public void doSwitch(SwitchBlock block)
{
for (int i = 0; i < description.argumentTypes.length; i++)
@@ -215,6 +216,7 @@ class MethodAdviceManager
block.addCase(i, false, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
String type = description.argumentTypes[index];
@@ -247,6 +249,7 @@ class MethodAdviceManager
builder.loadArgument(0).startSwitch(0, description.argumentTypes.length - 1, new SwitchCallback()
{
+ @Override
public void doSwitch(SwitchBlock block)
{
for (int i = 0; i < description.argumentTypes.length; i++)
@@ -256,6 +259,7 @@ class MethodAdviceManager
block.addCase(i, true, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
String type = description.argumentTypes[index];
@@ -316,11 +320,13 @@ class MethodAdviceManager
builder.startTryCatch(new TryCatchCallback()
{
+ @Override
public void doBlock(TryCatchBlock block)
{
block.addTry(new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.invokeVirtual(plasticClass.className, description.returnType, newMethodName,
@@ -337,6 +343,7 @@ class MethodAdviceManager
{
block.addCatch(exceptionName, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadThis().swap();
@@ -402,6 +409,7 @@ class MethodAdviceManager
builder.startVariable(invocationClassName, new LocalVariableCallback()
{
+ @Override
public void doBuild(final LocalVariable invocation, InstructionBuilder builder)
{
builder.dupe().storeVariable(invocation);
@@ -414,6 +422,7 @@ class MethodAdviceManager
builder.when(Condition.NON_ZERO, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadVariable(invocation).loadTypeConstant(Exception.class);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodHandleImpl.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodHandleImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodHandleImpl.java
index 6f7e662..7bd3c41 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodHandleImpl.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodHandleImpl.java
@@ -32,11 +32,13 @@ public class MethodHandleImpl implements MethodHandle
this.methodIndex = methodIndex;
}
+ @Override
public String toString()
{
return String.format("MethodHandle[%s %s]", className, methodDescription);
}
+ @Override
public MethodInvocationResult invoke(Object instance, Object... arguments)
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodParameterImpl.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodParameterImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodParameterImpl.java
index 77c8680..569a67e 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodParameterImpl.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodParameterImpl.java
@@ -19,6 +19,7 @@ class MethodParameterImpl extends PlasticMember implements MethodParameter
this.index = index;
}
+ @Override
public String getType()
{
plasticClass.check();
@@ -26,6 +27,7 @@ class MethodParameterImpl extends PlasticMember implements MethodParameter
return type;
}
+ @Override
public int getIndex()
{
plasticClass.check();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/NoopDelegate.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/NoopDelegate.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/NoopDelegate.java
index 21499d1..7f1a44d 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/NoopDelegate.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/NoopDelegate.java
@@ -20,10 +20,12 @@ import org.apache.tapestry5.plastic.PlasticManagerDelegate;
public class NoopDelegate implements PlasticManagerDelegate
{
+ @Override
public void transform(PlasticClass plasticClass)
{
}
+ @Override
public ClassInstantiator configureInstantiator(String className, ClassInstantiator instantiator)
{
return instantiator;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java
index eab2882..2b0fc15 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java
@@ -322,6 +322,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return String.format("Class %s has been transformed and may not be directly instantiated.", className);
}
+ @Override
public <T extends Annotation> boolean hasAnnotation(Class<T> annotationType)
{
check();
@@ -329,6 +330,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return annotationAccess.hasAnnotation(annotationType);
}
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationType)
{
check();
@@ -408,6 +410,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
}
+ @Override
public PlasticClass proxyInterface(Class interfaceType, PlasticField field)
{
check();
@@ -424,6 +427,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return this;
}
+ @Override
public ClassInstantiator createInstantiator()
{
lock();
@@ -588,6 +592,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
throw new AssertionError("Could not convert constructor to simple method.");
}
+ @Override
public <T extends Annotation> List<PlasticField> getFieldsWithAnnotation(Class<T> annotationType)
{
check();
@@ -607,6 +612,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return result;
}
+ @Override
public List<PlasticField> getAllFields()
{
check();
@@ -614,6 +620,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return new ArrayList<PlasticField>(fields);
}
+ @Override
public List<PlasticField> getUnclaimedFields()
{
check();
@@ -634,6 +641,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return unclaimedFields;
}
+ @Override
public PlasticMethod introducePrivateMethod(String typeName, String suggestedName, String[] argumentTypes,
String[] exceptionTypes)
{
@@ -650,6 +658,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return introduceMethod(description);
}
+ @Override
public PlasticField introduceField(String className, String suggestedName)
{
check();
@@ -672,6 +681,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return newField;
}
+ @Override
public PlasticField introduceField(Class fieldType, String suggestedName)
{
assert fieldType != null;
@@ -684,6 +694,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return values.contains(input) ? input + "$" + PlasticUtils.nextUID() : input;
}
+ @Override
public <T extends Annotation> List<PlasticMethod> getMethodsWithAnnotation(Class<T> annotationType)
{
check();
@@ -702,6 +713,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return result;
}
+ @Override
public List<PlasticMethod> getMethods()
{
check();
@@ -709,6 +721,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return new ArrayList<PlasticMethod>(methods);
}
+ @Override
public PlasticMethod introduceMethod(MethodDescription description)
{
check();
@@ -736,6 +749,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return result;
}
+ @Override
public PlasticMethod introduceMethod(MethodDescription description, InstructionBuilderCallback callback)
{
check();
@@ -745,6 +759,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return introduceMethod(description).changeImplementation(callback);
}
+ @Override
public PlasticMethod introduceMethod(Method method)
{
check();
@@ -923,6 +938,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
builder.startSwitch(0, nextFieldIndex - 1, new SwitchCallback()
{
+ @Override
public void doSwitch(SwitchBlock block)
{
for (PlasticFieldImpl f : shimFields)
@@ -952,6 +968,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
builder.startSwitch(0, nextFieldIndex - 1, new SwitchCallback()
{
+ @Override
public void doSwitch(SwitchBlock block)
{
for (PlasticFieldImpl f : shimFields)
@@ -983,6 +1000,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
builder.startSwitch(0, nextMethodIndex - 1, new SwitchCallback()
{
+ @Override
public void doSwitch(SwitchBlock block)
{
for (PlasticMethodImpl m : shimMethods)
@@ -1130,11 +1148,13 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
builder.loadThis().getField(className, getInstanceContextFieldName(), InstanceContext.class);
}
+ @Override
public PlasticClass getPlasticClass()
{
return this;
}
+ @Override
public Class<?> getTransformedClass()
{
if (transformedClass == null)
@@ -1150,6 +1170,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return (node.access & (ACC_ABSTRACT | ACC_PRIVATE)) == 0;
}
+ @Override
public String getClassName()
{
return className;
@@ -1165,6 +1186,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return new InstructionBuilderImpl(description, mn, nameCache);
}
+ @Override
public Set<PlasticMethod> introduceInterface(Class interfaceType)
{
check();
@@ -1211,6 +1233,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return introducedMethods;
}
+ @Override
public PlasticClass addToString(final String toStringValue)
{
check();
@@ -1219,6 +1242,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
{
introduceMethod(PlasticUtils.TO_STRING_DESCRIPTION, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadConstant(toStringValue).returnResult();
@@ -1229,11 +1253,13 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return this;
}
+ @Override
public boolean isMethodImplemented(MethodDescription description)
{
return inheritanceData.isImplemented(description.methodName, nameCache.toDesc(description));
}
+ @Override
public boolean isInterfaceImplemented(Class interfaceType)
{
assert interfaceType != null;
@@ -1244,11 +1270,13 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return inheritanceData.isInterfaceImplemented(interfaceName);
}
+ @Override
public String getSuperClassName()
{
return superClassName;
}
+ @Override
public PlasticClass onConstruct(ConstructorCallback callback)
{
check();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java
index ad9e096..5db10cd 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java
@@ -64,6 +64,7 @@ public class PlasticClassPool implements ClassLoaderDelegate, Opcodes, PlasticCl
private final Cache<String, TypeCategory> typeName2Category = new Cache<String, TypeCategory>()
{
+ @Override
protected TypeCategory convert(String typeName)
{
ClassNode cn = constructClassNodeFromBytecode(typeName);
@@ -159,21 +160,25 @@ public class PlasticClassPool implements ClassLoaderDelegate, Opcodes, PlasticCl
{
return new PlasticClassEvent()
{
+ @Override
public ClassType getType()
{
return classType;
}
+ @Override
public String getPrimaryClassName()
{
return primaryClassName;
}
+ @Override
public String getDissasembledBytecode()
{
return PlasticInternalUtils.dissasembleBytecode(classNode);
}
+ @Override
public String getClassName()
{
return PlasticInternalUtils.toClassName(classNode.name);
@@ -206,11 +211,13 @@ public class PlasticClassPool implements ClassLoaderDelegate, Opcodes, PlasticCl
return new AnnotationAccess()
{
+ @Override
public <T extends Annotation> boolean hasAnnotation(Class<T> annotationType)
{
return getAnnotation(annotationType) != null;
}
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationType)
{
return searchClass.getAnnotation(annotationType);
@@ -239,11 +246,13 @@ public class PlasticClassPool implements ClassLoaderDelegate, Opcodes, PlasticCl
return new AnnotationAccess()
{
+ @Override
public <T extends Annotation> boolean hasAnnotation(Class<T> annotationType)
{
return nameToNode.containsKey(annotationType.getName());
}
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationType)
{
String className = annotationType.getName();
@@ -294,6 +303,7 @@ public class PlasticClassPool implements ClassLoaderDelegate, Opcodes, PlasticCl
return builder.createAnnotation();
}
+ @Override
public boolean shouldInterceptClassLoading(String className)
{
int searchFromIndex = className.length() - 1;
@@ -318,6 +328,7 @@ public class PlasticClassPool implements ClassLoaderDelegate, Opcodes, PlasticCl
// Hopefully the synchronized will not cause a deadlock
+ @Override
public synchronized Class<?> loadAndTransformClass(String className) throws ClassNotFoundException
{
// Inner classes are not transformed, but they are loaded by the same class loader.
@@ -630,6 +641,7 @@ public class PlasticClassPool implements ClassLoaderDelegate, Opcodes, PlasticCl
}
}
+ @Override
public void addPlasticClassListener(PlasticClassListener listener)
{
assert listener != null;
@@ -637,6 +649,7 @@ public class PlasticClassPool implements ClassLoaderDelegate, Opcodes, PlasticCl
listeners.add(listener);
}
+ @Override
public void removePlasticClassListener(PlasticClassListener listener)
{
assert listener != null;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticFieldImpl.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticFieldImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticFieldImpl.java
index 6ce434c..d490750 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticFieldImpl.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticFieldImpl.java
@@ -51,27 +51,32 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
this.typeName = Type.getType(node.desc).getClassName();
}
+ @Override
public String toString()
{
return String.format("PlasticField[%s %s %s (in class %s)]", Modifier.toString(node.access), typeName,
node.name, plasticClass.className);
}
+ @Override
public String getGenericSignature()
{
return node.signature;
}
+ @Override
public int getModifiers()
{
return node.access;
}
+ @Override
public int compareTo(PlasticFieldImpl o)
{
return this.node.name.compareTo(o.node.name);
}
+ @Override
public PlasticClass getPlasticClass()
{
plasticClass.check();
@@ -79,6 +84,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
return plasticClass;
}
+ @Override
public FieldHandle getHandle()
{
plasticClass.check();
@@ -97,6 +103,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
return handle;
}
+ @Override
public PlasticField claim(Object tag)
{
assert tag != null;
@@ -119,6 +126,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
return this;
}
+ @Override
public boolean isClaimed()
{
plasticClass.check();
@@ -126,6 +134,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
return tag != null;
}
+ @Override
public String getName()
{
plasticClass.check();
@@ -133,6 +142,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
return node.name;
}
+ @Override
public String getTypeName()
{
plasticClass.check();
@@ -157,6 +167,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
}
}
+ @Override
public PlasticField inject(Object value)
{
plasticClass.check();
@@ -174,6 +185,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
return this;
}
+ @Override
public PlasticField injectComputed(ComputedValue<?> computedValue)
{
plasticClass.check();
@@ -210,6 +222,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
plasticClass.constructorBuilder.putField(plasticClass.className, node.name, typeName);
}
+ @Override
public PlasticField injectFromInstanceContext()
{
plasticClass.check();
@@ -238,6 +251,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
return this;
}
+ @Override
public <F> PlasticField setConduit(FieldConduit<F> conduit)
{
assert conduit != null;
@@ -260,6 +274,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
return this;
}
+ @Override
public <F> PlasticField setComputedConduit(ComputedValue<FieldConduit<F>> computedConduit)
{
assert computedConduit != null;
@@ -282,6 +297,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
return this;
}
+ @Override
public PlasticField createAccessors(PropertyAccessType accessType)
{
plasticClass.check();
@@ -289,6 +305,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
return createAccessors(accessType, PlasticInternalUtils.toPropertyName(node.name));
}
+ @Override
public PlasticField createAccessors(PropertyAccessType accessType, String propertyName)
{
plasticClass.check();
@@ -305,6 +322,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
introduceAccessorMethod(getTypeName(), "get" + capitalized, null, signature,
new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadThis().getField(PlasticFieldImpl.this).returnResult();
@@ -319,6 +337,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
introduceAccessorMethod("void", "set" + capitalized, new String[]
{getTypeName()}, signature, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadThis().loadArgument(0);
@@ -554,6 +573,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
switchBlock.addCase(fieldIndex, false, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.invokeVirtual(plasticClass.className, typeName, methodToInvoke).boxPrimitive(typeName).returnResult();
@@ -581,6 +601,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
switchBlock.addCase(fieldIndex, true, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.castOrUnbox(typeName);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMember.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMember.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMember.java
index 5513bc6..bf99bc9 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMember.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMember.java
@@ -32,6 +32,7 @@ class PlasticMember implements AnnotationAccess
annotationAccess = plasticClass.pool.createAnnotationAccess((List<AnnotationNode>) visibleAnnotations);
}
+ @Override
public <T extends Annotation> boolean hasAnnotation(Class<T> annotationType)
{
plasticClass.check();
@@ -39,6 +40,7 @@ class PlasticMember implements AnnotationAccess
return annotationAccess.hasAnnotation(annotationType);
}
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationType)
{
plasticClass.check();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMethodImpl.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMethodImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMethodImpl.java
index 74d0be4..980bd84 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMethodImpl.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMethodImpl.java
@@ -46,11 +46,13 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
this.description = PlasticInternalUtils.toMethodDescription(node);
}
+ @Override
public String toString()
{
return String.format("PlasticMethod[%s in class %s]", description, plasticClass.className);
}
+ @Override
public PlasticClass getPlasticClass()
{
plasticClass.check();
@@ -58,6 +60,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return plasticClass;
}
+ @Override
public MethodDescription getDescription()
{
plasticClass.check();
@@ -65,6 +68,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return description;
}
+ @Override
public int compareTo(PlasticMethodImpl o)
{
plasticClass.check();
@@ -72,6 +76,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return description.compareTo(o.description);
}
+ @Override
public boolean isOverride()
{
plasticClass.check();
@@ -79,6 +84,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return plasticClass.parentInheritanceData.isImplemented(node.name, node.desc);
}
+ @Override
public String getMethodIdentifier()
{
plasticClass.check();
@@ -93,6 +99,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return methodIdentifier;
}
+ @Override
public boolean isVoid()
{
plasticClass.check();
@@ -100,6 +107,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return description.returnType.equals("void");
}
+ @Override
public MethodHandle getHandle()
{
plasticClass.check();
@@ -114,6 +122,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return handle;
}
+ @Override
public PlasticMethod changeImplementation(InstructionBuilderCallback callback)
{
plasticClass.check();
@@ -138,6 +147,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return this;
}
+ @Override
public PlasticMethod addAdvice(MethodAdvice advice)
{
plasticClass.check();
@@ -155,6 +165,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return this;
}
+ @Override
public PlasticMethod delegateTo(final PlasticField field)
{
plasticClass.check();
@@ -169,6 +180,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
changeImplementation(new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
// Load the field
@@ -183,6 +195,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return this;
}
+ @Override
public PlasticMethod delegateTo(PlasticMethod delegateProvidingMethod)
{
plasticClass.check();
@@ -202,6 +215,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
changeImplementation(new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
// Load the field
@@ -225,6 +239,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return this;
}
+ @Override
public List<MethodParameter> getParameters()
{
if (parameters == null)
@@ -301,14 +316,17 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
block.addCase(methodIndex, false, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.startTryCatch(new TryCatchCallback()
{
+ @Override
public void doBlock(TryCatchBlock block)
{
block.addTry(new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
// The third argument is an Object array; get each
@@ -341,6 +359,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
{
block.addCatch(exceptionType, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.newInstance(FailureMethodInvocationResult.class).dupe(1).swap();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SuccessMethodInvocationResult.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SuccessMethodInvocationResult.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SuccessMethodInvocationResult.java
index 66d4f95..81dd7d7 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SuccessMethodInvocationResult.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SuccessMethodInvocationResult.java
@@ -28,20 +28,24 @@ public class SuccessMethodInvocationResult implements MethodInvocationResult
this.returnValue = returnValue;
}
+ @Override
public Object getReturnValue()
{
return returnValue;
}
+ @Override
public void rethrow()
{
}
+ @Override
public boolean didThrowCheckedException()
{
return false;
}
+ @Override
public <T extends Throwable> T getCheckedException(Class<T> exceptionType)
{
return null;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SwitchBlockImpl.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SwitchBlockImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SwitchBlockImpl.java
index ce9cd41..b6b28a7 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SwitchBlockImpl.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SwitchBlockImpl.java
@@ -67,6 +67,7 @@ public class SwitchBlockImpl extends Lockable implements SwitchBlock, Opcodes
{
addDefault(new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.throwException(IllegalArgumentException.class,
@@ -80,6 +81,7 @@ public class SwitchBlockImpl extends Lockable implements SwitchBlock, Opcodes
lock();
}
+ @Override
public void addCase(int caseValue, boolean jumpToEnd, InstructionBuilderCallback callback)
{
assert caseValue >= min;
@@ -98,6 +100,7 @@ public class SwitchBlockImpl extends Lockable implements SwitchBlock, Opcodes
state.visitor.visitJumpInsn(GOTO, endSwitchLabel);
}
+ @Override
public void addDefault(InstructionBuilderCallback callback)
{
if (defaultAdded)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/TryCatchBlockImpl.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/TryCatchBlockImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/TryCatchBlockImpl.java
index 2e369ec..77aad77 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/TryCatchBlockImpl.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/TryCatchBlockImpl.java
@@ -37,6 +37,7 @@ public class TryCatchBlockImpl extends Lockable implements TryCatchBlock
this.endLabel = new Label();
}
+ @Override
public void addTry(InstructionBuilderCallback callback)
{
state.visitor.visitLabel(startLabel);
@@ -46,6 +47,7 @@ public class TryCatchBlockImpl extends Lockable implements TryCatchBlock
state.visitor.visitLabel(endLabel);
}
+ @Override
public void addCatch(String exceptionClassName, InstructionBuilderCallback callback)
{
assert exceptionClassName != null;
@@ -64,6 +66,7 @@ public class TryCatchBlockImpl extends Lockable implements TryCatchBlock
state.visitor.visitTryCatchBlock(startLabel, endLabel, handler, exceptionInternalName);
}
+ @Override
public void addFinally(InstructionBuilderCallback callback)
{
doCatch(null, callback);
[2/7] Required Java version is now 1.6,
this applies to building as well as to using Tapestry
Posted by jk...@apache.org.
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/EagerLoadViaAnnotationServiceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/EagerLoadViaAnnotationServiceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/EagerLoadViaAnnotationServiceImpl.java
index 9c51680..a01ad5a 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/EagerLoadViaAnnotationServiceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/EagerLoadViaAnnotationServiceImpl.java
@@ -20,6 +20,7 @@ import org.apache.tapestry5.ioc.annotations.EagerLoad;
public class EagerLoadViaAnnotationServiceImpl implements Runnable
{
+ @Override
public void run()
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExceptionInConstructorServiceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExceptionInConstructorServiceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExceptionInConstructorServiceImpl.java
index f4c9013..d4b8637 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExceptionInConstructorServiceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExceptionInConstructorServiceImpl.java
@@ -24,6 +24,7 @@ public class ExceptionInConstructorServiceImpl implements Pingable
throw new RuntimeException("Yes, we have no tomatoes.");
}
+ @Override
public void ping()
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExtraPublicConstructorsModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExtraPublicConstructorsModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExtraPublicConstructorsModule.java
index 0d7a8d2..6d0bfdb 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExtraPublicConstructorsModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExtraPublicConstructorsModule.java
@@ -42,6 +42,7 @@ public class ExtraPublicConstructorsModule
{
return new UpcaseService()
{
+ @Override
public String upcase(String input)
{
return source.expandSymbols(input).toUpperCase();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/MultipleConstructorsAutobuildService.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/MultipleConstructorsAutobuildService.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/MultipleConstructorsAutobuildService.java
index dda2326..3c38f05 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/MultipleConstructorsAutobuildService.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/MultipleConstructorsAutobuildService.java
@@ -31,11 +31,13 @@ public class MultipleConstructorsAutobuildService implements StringHolder
this.delegate = delegate;
}
+ @Override
public String getValue()
{
return delegate.getValue();
}
+ @Override
public void setValue(String value)
{
delegate.setValue(value);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NamedViaAnnotationServiceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NamedViaAnnotationServiceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NamedViaAnnotationServiceImpl.java
index 11291a6..ed57f2c 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NamedViaAnnotationServiceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NamedViaAnnotationServiceImpl.java
@@ -20,6 +20,7 @@ import javax.inject.Named;
public class NamedViaAnnotationServiceImpl implements Runnable
{
+ @Override
public void run()
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NonAnnotatedServiceInterfaceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NonAnnotatedServiceInterfaceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NonAnnotatedServiceInterfaceImpl.java
index 5470c24..a15bfba 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NonAnnotatedServiceInterfaceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NonAnnotatedServiceInterfaceImpl.java
@@ -21,6 +21,7 @@ import org.apache.tapestry5.ioc.annotations.IntermediateType;
public class NonAnnotatedServiceInterfaceImpl implements NonAnnotatedServiceInterface
{
+ @Override
@Advise(id = "id", serviceInterface = NonAnnotatedServiceInterface.class)
public String execute(@IntermediateType(String.class) int i) // annotation just for checking too
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NoopClassLoaderDelegate.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NoopClassLoaderDelegate.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NoopClassLoaderDelegate.java
index ddc8446..0395697 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NoopClassLoaderDelegate.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NoopClassLoaderDelegate.java
@@ -18,11 +18,13 @@ import org.apache.tapestry5.internal.plastic.ClassLoaderDelegate;
public class NoopClassLoaderDelegate implements ClassLoaderDelegate
{
+ @Override
public boolean shouldInterceptClassLoading(String className)
{
return false;
}
+ @Override
public Class<?> loadAndTransformClass(String className) throws ClassNotFoundException
{
throw new IllegalStateException();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/RunnableServiceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/RunnableServiceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/RunnableServiceImpl.java
index 75b5bb5..21f66b9 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/RunnableServiceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/RunnableServiceImpl.java
@@ -23,6 +23,7 @@ public class RunnableServiceImpl implements Runnable
{
}
+ @Override
public void run()
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdViaAnnotationServiceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdViaAnnotationServiceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdViaAnnotationServiceImpl.java
index 82bfaeb..21f7406 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdViaAnnotationServiceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdViaAnnotationServiceImpl.java
@@ -20,6 +20,7 @@ import org.apache.tapestry5.ioc.annotations.ServiceId;
public class ServiceIdViaAnnotationServiceImpl implements Runnable
{
+ @Override
public void run()
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdViaMethodAnnotationServiceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdViaMethodAnnotationServiceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdViaMethodAnnotationServiceImpl.java
index 57992b6..bde2ca3 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdViaMethodAnnotationServiceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdViaMethodAnnotationServiceImpl.java
@@ -18,6 +18,7 @@ package org.apache.tapestry5.ioc.internal;
public class ServiceIdViaMethodAnnotationServiceImpl implements Runnable
{
+ @Override
public void run()
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/TestAdvice.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/TestAdvice.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/TestAdvice.java
index f61944d..0709437 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/TestAdvice.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/TestAdvice.java
@@ -25,6 +25,7 @@ final public class TestAdvice implements MethodAdvice {
public static final String ANNOTATION_FOUND = "Annotation found!";
+ @Override
public void advise(MethodInvocation invocation) {
final Method method = invocation.getMethod();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToStringService.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToStringService.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToStringService.java
index da1b5e7..22b8ab5 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToStringService.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToStringService.java
@@ -2,5 +2,6 @@ package org.apache.tapestry5.ioc.internal;
public interface ToStringService
{
+ @Override
String toString();
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToUpperCaseStringHolder.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToUpperCaseStringHolder.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToUpperCaseStringHolder.java
index 19d7d24..04915ac 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToUpperCaseStringHolder.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToUpperCaseStringHolder.java
@@ -20,11 +20,13 @@ public class ToUpperCaseStringHolder implements StringHolder
{
private String value;
+ @Override
public String getValue()
{
return value;
}
+ @Override
public void setValue(String value)
{
this.value = value.toUpperCase();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/UpcaseServiceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/UpcaseServiceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/UpcaseServiceImpl.java
index 4c214de..36ae8ac 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/UpcaseServiceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/UpcaseServiceImpl.java
@@ -17,6 +17,7 @@ package org.apache.tapestry5.ioc.internal;
public class UpcaseServiceImpl implements UpcaseService
{
+ @Override
public String upcase(String input)
{
return input.toUpperCase();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StartupModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StartupModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StartupModule.java
index 2787917..2fb671e 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StartupModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StartupModule.java
@@ -24,6 +24,7 @@ public class StartupModule
{
Runnable r = new Runnable()
{
+ @Override
public void run()
{
startupInvoked = true;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringService.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringService.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringService.java
index b8e0484..adbbe45 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringService.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringService.java
@@ -16,5 +16,6 @@ package org.apache.tapestry5.ioc.internal.services;
public interface ToStringService
{
+ @Override
public String toString();
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTarget.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTarget.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTarget.java
index cc598af..2a0f8f4 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTarget.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTarget.java
@@ -31,6 +31,7 @@ public class ConcurrentTarget
{
return barrier.withRead(new Invokable<Integer>()
{
+ @Override
public Integer invoke()
{
return getCounter();
@@ -42,6 +43,7 @@ public class ConcurrentTarget
{
return barrier.withRead(new Invokable<Integer>()
{
+ @Override
public Integer invoke()
{
return counter;
@@ -53,6 +55,7 @@ public class ConcurrentTarget
{
barrier.withWrite(new Runnable()
{
+ @Override
public void run()
{
counter++;
@@ -64,6 +67,7 @@ public class ConcurrentTarget
{
barrier.withWrite(new Runnable()
{
+ @Override
public void run()
{
ConcurrentTarget.this.counter = counter;
@@ -75,6 +79,7 @@ public class ConcurrentTarget
{
barrier.withRead(new Runnable()
{
+ @Override
public void run()
{
if (counter >= 0)
@@ -87,10 +92,12 @@ public class ConcurrentTarget
{
barrier.withRead(new Runnable()
{
+ @Override
public void run()
{
Runnable r = new Runnable()
{
+ @Override
public void run()
{
incrementCounter();
@@ -106,6 +113,7 @@ public class ConcurrentTarget
{
barrier.withWrite(new Runnable()
{
+ @Override
public void run()
{
counter = getCounter() + 1;
@@ -117,6 +125,7 @@ public class ConcurrentTarget
{
return barrier.tryWithWrite(new Runnable()
{
+ @Override
public void run()
{
counter++;
@@ -128,6 +137,7 @@ public class ConcurrentTarget
{
return barrier.tryWithWrite(new Runnable()
{
+ @Override
public void run()
{
counter = getCounter() + 1;
@@ -140,6 +150,7 @@ public class ConcurrentTarget
final List<Boolean> result = new ArrayList<Boolean>();
barrier.withRead(new Runnable()
{
+ @Override
public void run()
{
if (counter >= 0)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTargetWrapper.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTargetWrapper.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTargetWrapper.java
index 6a16a7f..96fea8a 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTargetWrapper.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTargetWrapper.java
@@ -26,10 +26,12 @@ public class ConcurrentTargetWrapper implements Runnable
this.target = target;
}
+ @Override
public void run()
{
barrier.withRead(new Runnable()
{
+ @Override
public void run()
{
target.incrementCounter();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/DrivableImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/DrivableImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/DrivableImpl.java
index 523e665..a5d0520 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/DrivableImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/DrivableImpl.java
@@ -7,6 +7,7 @@ package org.apache.tapestry5.ioc.internal.util;
public class DrivableImpl implements Drivable
{
+ @Override
public void drive()
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/PlayableImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/PlayableImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/PlayableImpl.java
index 307501b..3c99ef1 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/PlayableImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/PlayableImpl.java
@@ -6,6 +6,7 @@ package org.apache.tapestry5.ioc.internal.util;
public class PlayableImpl extends DrivableImpl implements Playable
{
+ @Override
public void play()
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ToyTruckImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ToyTruckImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ToyTruckImpl.java
index db6c7e7..99b4782 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ToyTruckImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ToyTruckImpl.java
@@ -7,6 +7,7 @@ package org.apache.tapestry5.ioc.internal.util;
public class ToyTruckImpl extends PlayableImpl implements Drivable, ToyTruck
{
+ @Override
public void playDrive()
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/TapestryDocTaglet.java
----------------------------------------------------------------------
diff --git a/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/TapestryDocTaglet.java b/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/TapestryDocTaglet.java
index 4f19aaf..c086280 100644
--- a/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/TapestryDocTaglet.java
+++ b/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/TapestryDocTaglet.java
@@ -47,46 +47,55 @@ public class TapestryDocTaglet implements Taglet, ClassDescriptionSource
paramMap.put(NAME, new TapestryDocTaglet());
}
+ @Override
public boolean inField()
{
return false;
}
+ @Override
public boolean inConstructor()
{
return false;
}
+ @Override
public boolean inMethod()
{
return false;
}
+ @Override
public boolean inOverview()
{
return false;
}
+ @Override
public boolean inPackage()
{
return false;
}
+ @Override
public boolean inType()
{
return true;
}
+ @Override
public boolean isInlineTag()
{
return false;
}
+ @Override
public String getName()
{
return NAME;
}
+ @Override
public ClassDescription getDescription(String className)
{
ClassDescription result = classDescriptions.get(className);
@@ -107,11 +116,13 @@ public class TapestryDocTaglet implements Taglet, ClassDescriptionSource
return result;
}
+ @Override
public String toString(Tag tag)
{
throw new IllegalStateException("toString(Tag) should not be called for a non-inline tag.");
}
+ @Override
public String toString(Tag[] tags)
{
if (tags.length == 0)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/XDocStreamer.java
----------------------------------------------------------------------
diff --git a/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/XDocStreamer.java b/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/XDocStreamer.java
index 5d6235b..d71c611 100644
--- a/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/XDocStreamer.java
+++ b/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/XDocStreamer.java
@@ -30,6 +30,7 @@ public class XDocStreamer
private static final Runnable NO_OP = new Runnable()
{
+ @Override
public void run()
{
}
@@ -51,6 +52,7 @@ public class XDocStreamer
{
return new Runnable()
{
+ @Override
public void run()
{
write("</");
@@ -77,22 +79,27 @@ public class XDocStreamer
ParserState state = ParserState.IGNORING;
+ @Override
public void startDTD(String name, String publicId, String systemId) throws SAXException
{
}
+ @Override
public void endDTD() throws SAXException
{
}
+ @Override
public void startEntity(String name) throws SAXException
{
}
+ @Override
public void endEntity(String name) throws SAXException
{
}
+ @Override
public void startCDATA() throws SAXException
{
if (state == ParserState.IGNORING)
@@ -105,6 +112,7 @@ public class XDocStreamer
endElementHandlers.push(new Runnable()
{
+ @Override
public void run()
{
state = ParserState.COPYING;
@@ -112,36 +120,44 @@ public class XDocStreamer
});
}
+ @Override
public void endCDATA() throws SAXException
{
endElementHandlers.pop().run();
}
/** Does nothing; comments are always stripped out. */
+ @Override
public void comment(char[] ch, int start, int length) throws SAXException
{
}
+ @Override
public void setDocumentLocator(Locator locator)
{
}
+ @Override
public void startDocument() throws SAXException
{
}
+ @Override
public void endDocument() throws SAXException
{
}
+ @Override
public void startPrefixMapping(String prefix, String uri) throws SAXException
{
}
+ @Override
public void endPrefixMapping(String prefix) throws SAXException
{
}
+ @Override
public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException
{
if (state == ParserState.IGNORING)
@@ -218,11 +234,13 @@ public class XDocStreamer
throw new RuntimeException(String.format("No '%s' attribute present.", name));
}
+ @Override
public void endElement(String uri, String localName, String qName) throws SAXException
{
endElementHandlers.pop().run();
}
+ @Override
public void characters(char[] ch, int start, int length) throws SAXException
{
try
@@ -265,14 +283,17 @@ public class XDocStreamer
}
}
+ @Override
public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException
{
}
+ @Override
public void processingInstruction(String target, String data) throws SAXException
{
}
+ @Override
public void skippedEntity(String name) throws SAXException
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jmx/src/main/java/org/apache/tapestry5/internal/jmx/MBeanSupportImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-jmx/src/main/java/org/apache/tapestry5/internal/jmx/MBeanSupportImpl.java b/tapestry-jmx/src/main/java/org/apache/tapestry5/internal/jmx/MBeanSupportImpl.java
index 1c31ebe..4cbc773 100644
--- a/tapestry-jmx/src/main/java/org/apache/tapestry5/internal/jmx/MBeanSupportImpl.java
+++ b/tapestry-jmx/src/main/java/org/apache/tapestry5/internal/jmx/MBeanSupportImpl.java
@@ -67,6 +67,7 @@ public class MBeanSupportImpl implements MBeanSupport
{
hub.addRegistryShutdownListener(new Runnable()
{
+ @Override
public void run()
{
registryDidShutdown();
@@ -74,6 +75,7 @@ public class MBeanSupportImpl implements MBeanSupport
});
}
+ @Override
public void register(Object bean, String name)
{
register(bean, toObjectName(name));
@@ -90,6 +92,7 @@ public class MBeanSupportImpl implements MBeanSupport
}
}
+ @Override
public void register(final Object object, final ObjectName objectName)
{
lock.check();
@@ -110,6 +113,7 @@ public class MBeanSupportImpl implements MBeanSupport
}
}
+ @Override
public void unregister(final ObjectName objectName)
{
lock.check();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jmx/src/test/java/org/example/testapp/services/SampleImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-jmx/src/test/java/org/example/testapp/services/SampleImpl.java b/tapestry-jmx/src/test/java/org/example/testapp/services/SampleImpl.java
index 729d9df..770efc5 100644
--- a/tapestry-jmx/src/test/java/org/example/testapp/services/SampleImpl.java
+++ b/tapestry-jmx/src/test/java/org/example/testapp/services/SampleImpl.java
@@ -19,6 +19,7 @@ import org.apache.tapestry5.ioc.annotations.EagerLoad;
@EagerLoad
public class SampleImpl implements Sample, SampleImplMBean
{
+ @Override
public int getSampleValue()
{
return 42;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterMethodAdvice.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterMethodAdvice.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterMethodAdvice.java
index f0f1d28..a0f58f7 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterMethodAdvice.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterMethodAdvice.java
@@ -32,6 +32,7 @@ public class CommitAfterMethodAdvice implements MethodAdvice
this.manager = manager;
}
+ @Override
public void advise(final MethodInvocation invocation)
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterWorker.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterWorker.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterWorker.java
index fc9ff8a..ac84dc3 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterWorker.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterWorker.java
@@ -39,6 +39,7 @@ public class CommitAfterWorker implements ComponentClassTransformWorker2
shared = new CommitAfterMethodAdvice(manager);
}
+ @Override
public void transform(PlasticClass plasticClass, TransformationSupport support, MutableComponentModel model)
{
for (final PlasticMethod method : plasticClass
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerManagerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerManagerImpl.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerManagerImpl.java
index 93e493c..70793ff 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerManagerImpl.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerManagerImpl.java
@@ -46,6 +46,7 @@ public class EntityManagerManagerImpl implements EntityManagerManager, ThreadCle
/**
* {@inheritDoc}
*/
+ @Override
public EntityManager getEntityManager(final String persistenceUnitName)
{
return getOrCreateEntityManager(persistenceUnitName);
@@ -54,6 +55,7 @@ public class EntityManagerManagerImpl implements EntityManagerManager, ThreadCle
/**
* {@inheritDoc}
*/
+ @Override
public Map<String, EntityManager> getEntityManagers()
{
createAllEntityManagers();
@@ -83,6 +85,7 @@ public class EntityManagerManagerImpl implements EntityManagerManager, ThreadCle
return em;
}
+ @Override
public void threadDidCleanup()
{
for (final Entry<String, EntityManager> next : entityManagers.entrySet())
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerObjectProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerObjectProvider.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerObjectProvider.java
index e3ced6d..bb2f9ae 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerObjectProvider.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerObjectProvider.java
@@ -29,6 +29,7 @@ public class EntityManagerObjectProvider implements ObjectProvider
private EntityManager proxy;
+ @Override
public <T> T provide(final Class<T> objectType, final AnnotationProvider annotationProvider,
final ObjectLocator locator)
{
@@ -51,6 +52,7 @@ public class EntityManagerObjectProvider implements ObjectProvider
proxy = proxyFactory.createProxy(EntityManager.class, new ObjectCreator()
{
+ @Override
public Object createObject()
{
final EntityManagerManager entityManagerManager = objectLocator
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java
index 39da3c4..f7aa979 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java
@@ -78,6 +78,7 @@ public class EntityManagerSourceImpl implements EntityManagerSource
{
hub.addRegistryShutdownListener(new Runnable()
{
+ @Override
public void run()
{
registryDidShutdown();
@@ -89,12 +90,14 @@ public class EntityManagerSourceImpl implements EntityManagerSource
{
final List<String> affectedUnits = F.flow(persistenceUnitInfos).filter(new Predicate<TapestryPersistenceUnitInfo>()
{
+ @Override
public boolean accept(TapestryPersistenceUnitInfo info)
{
return !info.excludeUnlistedClasses();
}
}).map(new Mapper<TapestryPersistenceUnitInfo, String>()
{
+ @Override
public String map(TapestryPersistenceUnitInfo info)
{
return info.getPersistenceUnitName();
@@ -176,6 +179,7 @@ public class EntityManagerSourceImpl implements EntityManagerSource
/**
* {@inheritDoc}
*/
+ @Override
public EntityManagerFactory getEntityManagerFactory(final String persistenceUnitName)
{
EntityManagerFactory emf = entityManagerFactories.get(persistenceUnitName);
@@ -245,6 +249,7 @@ public class EntityManagerSourceImpl implements EntityManagerSource
private PersistenceProvider findPersistenceProviderByName(final List<PersistenceProvider> providers, final String providerClassName)
{
PersistenceProvider provider = F.flow(providers).filter(new Predicate<PersistenceProvider>() {
+ @Override
public boolean accept(PersistenceProvider next) {
return next.getClass().getName().equals(providerClassName);
}
@@ -263,12 +268,14 @@ public class EntityManagerSourceImpl implements EntityManagerSource
private List<Class> toProviderClasses(final List<PersistenceProvider> providers)
{
return F.flow(providers).map(new Mapper<PersistenceProvider, Class>() {
+ @Override
public Class map(PersistenceProvider element) {
return element.getClass();
}
}).toList();
}
+ @Override
public EntityManager create(final String persistenceUnitName)
{
return getEntityManagerFactory(persistenceUnitName).createEntityManager();
@@ -296,6 +303,7 @@ public class EntityManagerSourceImpl implements EntityManagerSource
}
+ @Override
public List<PersistenceUnitInfo> getPersistenceUnitInfos()
{
return Collections.<PersistenceUnitInfo>unmodifiableList(persistenceUnitInfos);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImpl.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImpl.java
index ad4abef..a74b93b 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImpl.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImpl.java
@@ -27,6 +27,7 @@ public class JpaTransactionAdvisorImpl implements JpaTransactionAdvisor
this.manager = manager;
}
+ @Override
public void addTransactionCommitAdvice(final MethodAdviceReceiver receiver)
{
receiver.adviseAllMethods(new CommitAfterMethodAdvice(manager));
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaValueEncoder.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaValueEncoder.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaValueEncoder.java
index d60c9b3..a250203 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaValueEncoder.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaValueEncoder.java
@@ -63,6 +63,7 @@ public class JpaValueEncoder<E> implements ValueEncoder<E>
/**
* {@inheritDoc}
*/
+ @Override
public String toClient(final E value)
{
if (value == null)
@@ -81,6 +82,7 @@ public class JpaValueEncoder<E> implements ValueEncoder<E>
/**
* {@inheritDoc}
*/
+ @Override
public E toValue(final String clientValue)
{
if (InternalUtils.isBlank(clientValue))
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PackageNamePersistenceUnitConfigurer.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PackageNamePersistenceUnitConfigurer.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PackageNamePersistenceUnitConfigurer.java
index 5d0e90f..f85d598 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PackageNamePersistenceUnitConfigurer.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PackageNamePersistenceUnitConfigurer.java
@@ -35,6 +35,7 @@ public class PackageNamePersistenceUnitConfigurer implements PersistenceUnitConf
/**
* {@inheritDoc}
*/
+ @Override
public void configure(TapestryPersistenceUnitInfo unitInfo)
{
for (String packageName : packageManager.getPackageNames())
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContentHandler.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContentHandler.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContentHandler.java
index e53eacf..9dcf8c9 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContentHandler.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContentHandler.java
@@ -54,26 +54,32 @@ public class PersistenceContentHandler implements ContentHandler
return persistenceUnits;
}
+ @Override
public void setDocumentLocator(final Locator locator)
{
}
+ @Override
public void startDocument() throws SAXException
{
}
+ @Override
public void endDocument() throws SAXException
{
}
+ @Override
public void startPrefixMapping(final String prefix, final String uri) throws SAXException
{
}
+ @Override
public void endPrefixMapping(final String prefix) throws SAXException
{
}
+ @Override
public void startElement(final String namespaceURI, final String localName, final String qName,
final Attributes atts) throws SAXException
{
@@ -101,6 +107,7 @@ public class PersistenceContentHandler implements ContentHandler
}
}
+ @Override
public void endElement(final String namespaceURI, final String localName, final String qName)
throws SAXException
{
@@ -156,6 +163,7 @@ public class PersistenceContentHandler implements ContentHandler
}
}
+ @Override
public void characters(final char[] ch, final int start, final int length) throws SAXException
{
final String s = new String(ch, start, length);
@@ -170,15 +178,18 @@ public class PersistenceContentHandler implements ContentHandler
}
+ @Override
public void ignorableWhitespace(final char[] ch, final int start, final int length)
throws SAXException
{
}
+ @Override
public void processingInstruction(final String target, final String data) throws SAXException
{
}
+ @Override
public void skippedEntity(final String name) throws SAXException
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContextWorker.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContextWorker.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContextWorker.java
index 5bd1bcd..e00d108 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContextWorker.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContextWorker.java
@@ -34,6 +34,7 @@ public class PersistenceContextWorker implements ComponentClassTransformWorker2
this.entityManagerManager = entityManagerManager;
}
+ @Override
public void transform(PlasticClass plasticClass, TransformationSupport support, MutableComponentModel model)
{
for (final PlasticField field : plasticClass
@@ -45,6 +46,7 @@ public class PersistenceContextWorker implements ComponentClassTransformWorker2
field.setConduit(new ReadOnlyComponentFieldConduit(plasticClass.getClassName(), field.getName())
{
+ @Override
public Object get(Object instance, InstanceContext context)
{
return JpaInternalUtils.getEntityManager(entityManagerManager, annotation);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java
index 463a4dd..a25bace 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java
@@ -71,6 +71,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public String getPersistenceUnitName()
{
return persistenceUnitName;
@@ -79,6 +80,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public String getPersistenceProviderClassName()
{
return persistenceProviderClassName;
@@ -87,6 +89,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public TapestryPersistenceUnitInfo persistenceProviderClassName(final String persistenceProviderClassName)
{
this.persistenceProviderClassName = persistenceProviderClassName;
@@ -97,6 +100,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public PersistenceUnitTransactionType getTransactionType()
{
return transactionType;
@@ -105,6 +109,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public TapestryPersistenceUnitInfo transactionType(final PersistenceUnitTransactionType transactionType)
{
this.transactionType = transactionType;
@@ -115,6 +120,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public DataSource getJtaDataSource()
{
return jtaDataSource;
@@ -123,6 +129,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public DataSource getNonJtaDataSource()
{
return nonJtaDataSource;
@@ -131,6 +138,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public TapestryPersistenceUnitInfo nonJtaDataSource(final String nonJtaDataSource)
{
this.nonJtaDataSource = lookupDataSource(nonJtaDataSource);
@@ -141,6 +149,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public TapestryPersistenceUnitInfo jtaDataSource(final String jtaDataSource)
{
this.jtaDataSource = lookupDataSource(jtaDataSource);
@@ -151,6 +160,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public List<String> getMappingFileNames()
{
List<String> tmp = CollectionFactory.newList(mappingFilesNames);
@@ -160,6 +170,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public TapestryPersistenceUnitInfo addMappingFileName(final String fileName)
{
mappingFilesNames.add(fileName);
@@ -171,6 +182,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public TapestryPersistenceUnitInfo addJarFileUrl(URL url)
{
jarFileUrls.add(url);
@@ -181,6 +193,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public TapestryPersistenceUnitInfo addJarFileUrl(String url)
{
try
@@ -196,6 +209,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public TapestryPersistenceUnitInfo addProperty(String name, String value)
{
getProperties().put(name, value);
@@ -207,6 +221,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public TapestryPersistenceUnitInfo excludeUnlistedClasses(boolean exclude)
{
this.excludeUnlistedClasses = exclude;
@@ -217,6 +232,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public List<URL> getJarFileUrls()
{
return Collections.unmodifiableList(jarFileUrls);
@@ -225,6 +241,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public URL getPersistenceUnitRootUrl()
{
return getClass().getResource("/");
@@ -233,6 +250,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public List<String> getManagedClassNames()
{
List<String> tmp = CollectionFactory.newList(managedClassNames);
@@ -242,6 +260,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public TapestryPersistenceUnitInfo addManagedClassName(final String className)
{
managedClassNames.add(className);
@@ -252,6 +271,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public TapestryPersistenceUnitInfo addManagedClass(final Class<?> clazz)
{
addManagedClassName(clazz.getName());
@@ -262,6 +282,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public boolean excludeUnlistedClasses()
{
return excludeUnlistedClasses;
@@ -270,6 +291,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public SharedCacheMode getSharedCacheMode()
{
return sharedCacheMode;
@@ -278,6 +300,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public TapestryPersistenceUnitInfo sharedCacheMode(final SharedCacheMode cacheMode)
{
sharedCacheMode = cacheMode;
@@ -288,6 +311,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public ValidationMode getValidationMode()
{
return validationMode;
@@ -296,6 +320,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public TapestryPersistenceUnitInfo validationMode(final ValidationMode validationMode)
{
this.validationMode = validationMode;
@@ -306,6 +331,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public Properties getProperties()
{
return properties;
@@ -314,6 +340,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public String getPersistenceXMLSchemaVersion()
{
return persistenceXMLSchemaVersion;
@@ -327,6 +354,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public ClassLoader getClassLoader()
{
return Thread.currentThread().getContextClassLoader();
@@ -335,6 +363,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public void addTransformer(final ClassTransformer transformer)
{
@@ -343,6 +372,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
/**
* {@inheritDoc}
*/
+ @Override
public ClassLoader getNewTempClassLoader()
{
return getClassLoader();
@@ -366,11 +396,13 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
}
+ @Override
public TapestryPersistenceUnitInfo setEntityManagerProperties(Map properties) {
entityManagerProperties = properties;
return this;
}
+ @Override
public Map getEntityManagerProperties() {
return entityManagerProperties;
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/JpaGridDataSource.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/JpaGridDataSource.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/JpaGridDataSource.java
index c572d00..040afdd 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/JpaGridDataSource.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/JpaGridDataSource.java
@@ -61,6 +61,7 @@ public class JpaGridDataSource<E> implements GridDataSource
/**
* {@inheritDoc}
*/
+ @Override
public int getAvailableRows()
{
final CriteriaBuilder builder = entityManager.getCriteriaBuilder();
@@ -79,6 +80,7 @@ public class JpaGridDataSource<E> implements GridDataSource
/**
* {@inheritDoc}
*/
+ @Override
public void prepare(final int startIndex, final int endIndex,
final List<SortConstraint> sortConstraints)
{
@@ -132,6 +134,7 @@ public class JpaGridDataSource<E> implements GridDataSource
/**
* {@inheritDoc}
*/
+ @Override
public Object getRowValue(final int index)
{
return preparedResults.get(index - startIndex);
@@ -140,6 +143,7 @@ public class JpaGridDataSource<E> implements GridDataSource
/**
* {@inheritDoc}
*/
+ @Override
public Class<E> getRowType()
{
return entityType;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/modules/JpaModule.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/modules/JpaModule.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/modules/JpaModule.java
index acb0db9..a9c824a 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/modules/JpaModule.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/modules/JpaModule.java
@@ -50,6 +50,7 @@ public class JpaModule
{
return new JpaEntityPackageManager()
{
+ @Override
public Collection<String> getPackageNames()
{
return packageNames;
@@ -139,6 +140,7 @@ public class JpaModule
final ValueEncoderFactory factory = new ValueEncoderFactory()
{
+ @Override
public ValueEncoder create(final Class type)
{
return new JpaValueEncoder(entity, entityManagerManager, info.getPersistenceUnitName(),
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImplTest.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImplTest.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImplTest.java
index 0cab6d4..e1f819f 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImplTest.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImplTest.java
@@ -60,6 +60,7 @@ public class EntityManagerSourceImplTest extends TapestryTestCase
{
PersistenceUnitConfigurer configurer = new PersistenceUnitConfigurer()
{
+ @Override
@SuppressWarnings(
{"unchecked", "rawtypes"})
public void configure(TapestryPersistenceUnitInfo unitInfo)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImplTest.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImplTest.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImplTest.java
index cde68f9..78173c8 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImplTest.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImplTest.java
@@ -458,11 +458,13 @@ public class JpaTransactionAdvisorImplTest extends IOCTestCase
return new ReturnTypeService()
{
+ @Override
public String returnTypeMethod()
{
return "Foo";
}
+ @Override
public int returnTypeMethodWithParam(final int first, final int second)
{
return first + second;
@@ -486,6 +488,7 @@ public class JpaTransactionAdvisorImplTest extends IOCTestCase
@PersistenceContext(unitName = UNIT_NAME)
int returnTypeMethodWithParam(int first, int second);
+ @Override
String toString();
}
@@ -522,6 +525,7 @@ public class JpaTransactionAdvisorImplTest extends IOCTestCase
}
public class ServiceImpl implements Service {
+ @Override
@CommitAfter
@PersistenceContext(unitName = UNIT_NAME)
public void perform()
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManager.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManager.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManager.java
index 23a350c..75697ab 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManager.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManager.java
@@ -35,203 +35,243 @@ public class DummyEntityManager implements EntityManager
}
+ @Override
public void persist(Object entity)
{
}
+ @Override
public <T> T merge(T entity)
{
return null;
}
+ @Override
public void remove(Object entity)
{
}
+ @Override
public <T> T find(Class<T> entityClass, Object primaryKey)
{
return null;
}
+ @Override
public <T> T find(Class<T> entityClass, Object primaryKey, Map<String, Object> properties)
{
return null;
}
+ @Override
public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode)
{
return null;
}
+ @Override
public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode,
Map<String, Object> properties)
{
return null;
}
+ @Override
public <T> T getReference(Class<T> entityClass, Object primaryKey)
{
return null;
}
+ @Override
public void flush()
{
}
+ @Override
public void setFlushMode(FlushModeType flushMode)
{
}
+ @Override
public FlushModeType getFlushMode()
{
return null;
}
+ @Override
public void lock(Object entity, LockModeType lockMode)
{
}
+ @Override
public void lock(Object entity, LockModeType lockMode, Map<String, Object> properties)
{
}
+ @Override
public void refresh(Object entity)
{
}
+ @Override
public void refresh(Object entity, Map<String, Object> properties)
{
}
+ @Override
public void refresh(Object entity, LockModeType lockMode)
{
}
+ @Override
public void refresh(Object entity, LockModeType lockMode, Map<String, Object> properties)
{
}
+ @Override
public void clear()
{
}
+ @Override
public void detach(Object entity)
{
}
+ @Override
public boolean contains(Object entity)
{
return false;
}
+ @Override
public LockModeType getLockMode(Object entity)
{
return null;
}
+ @Override
public void setProperty(String propertyName, Object value)
{
}
+ @Override
public Map<String, Object> getProperties()
{
return null;
}
+ @Override
public Query createQuery(String qlString)
{
return null;
}
+ @Override
public <T> TypedQuery<T> createQuery(CriteriaQuery<T> criteriaQuery)
{
return null;
}
+ @Override
public <T> TypedQuery<T> createQuery(String qlString, Class<T> resultClass)
{
return null;
}
+ @Override
public Query createNamedQuery(String name)
{
return null;
}
+ @Override
public <T> TypedQuery<T> createNamedQuery(String name, Class<T> resultClass)
{
return null;
}
+ @Override
public Query createNativeQuery(String sqlString)
{
return null;
}
+ @Override
@SuppressWarnings("rawtypes")
public Query createNativeQuery(String sqlString, Class resultClass)
{
return null;
}
+ @Override
public Query createNativeQuery(String sqlString, String resultSetMapping)
{
return null;
}
+ @Override
public void joinTransaction()
{
}
+ @Override
public <T> T unwrap(Class<T> cls)
{
return null;
}
+ @Override
public Object getDelegate()
{
return null;
}
+ @Override
public void close()
{
}
+ @Override
public boolean isOpen()
{
return false;
}
+ @Override
public EntityTransaction getTransaction()
{
return null;
}
+ @Override
public EntityManagerFactory getEntityManagerFactory()
{
return null;
}
+ @Override
public CriteriaBuilder getCriteriaBuilder()
{
return null;
}
+ @Override
public Metamodel getMetamodel()
{
return null;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManagerFactory.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManagerFactory.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManagerFactory.java
index 395686c..f4ab8da 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManagerFactory.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManagerFactory.java
@@ -24,47 +24,56 @@ import java.util.Map;
final class DummyEntityManagerFactory implements EntityManagerFactory
{
+ @Override
public boolean isOpen()
{
return false;
}
+ @Override
public Map<String, Object> getProperties()
{
return null;
}
+ @Override
public PersistenceUnitUtil getPersistenceUnitUtil()
{
return null;
}
+ @Override
public Metamodel getMetamodel()
{
return null;
}
+ @Override
public CriteriaBuilder getCriteriaBuilder()
{
return null;
}
+ @Override
public Cache getCache()
{
return null;
}
+ @Override
@SuppressWarnings("rawtypes")
public EntityManager createEntityManager(Map map)
{
return new DummyEntityManager();
}
+ @Override
public EntityManager createEntityManager()
{
return new DummyEntityManager();
}
+ @Override
public void close()
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyPersistenceProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyPersistenceProvider.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyPersistenceProvider.java
index 796aed4..723b677 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyPersistenceProvider.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyPersistenceProvider.java
@@ -23,16 +23,19 @@ import java.util.Map;
@SuppressWarnings("rawtypes")
public class DummyPersistenceProvider implements PersistenceProvider
{
+ @Override
public EntityManagerFactory createEntityManagerFactory(String emName, Map map)
{
return new DummyEntityManagerFactory();
}
+ @Override
public EntityManagerFactory createContainerEntityManagerFactory(PersistenceUnitInfo info, Map map)
{
return new DummyEntityManagerFactory();
}
+ @Override
public ProviderUtil getProviderUtil()
{
return null;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/example/app1/services/AppModule.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/example/app1/services/AppModule.java b/tapestry-jpa/src/test/java/org/example/app1/services/AppModule.java
index 6713f5c..926d803 100644
--- a/tapestry-jpa/src/test/java/org/example/app1/services/AppModule.java
+++ b/tapestry-jpa/src/test/java/org/example/app1/services/AppModule.java
@@ -54,6 +54,7 @@ public class AppModule
{
final PersistenceUnitConfigurer configurer = new PersistenceUnitConfigurer()
{
+ @Override
public void configure(final TapestryPersistenceUnitInfo unitInfo)
{
unitInfo.addManagedClass(User.class);
@@ -63,6 +64,7 @@ public class AppModule
final PersistenceUnitConfigurer configurer2 = new PersistenceUnitConfigurer()
{
+ @Override
public void configure(final TapestryPersistenceUnitInfo unitInfo)
{
unitInfo.addProperty("javax.persistence.jdbc.driver", "org.h2.Driver")
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/example/app1/services/impl/UserDAOImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/example/app1/services/impl/UserDAOImpl.java b/tapestry-jpa/src/test/java/org/example/app1/services/impl/UserDAOImpl.java
index ee2a564..ae2bf8b 100644
--- a/tapestry-jpa/src/test/java/org/example/app1/services/impl/UserDAOImpl.java
+++ b/tapestry-jpa/src/test/java/org/example/app1/services/impl/UserDAOImpl.java
@@ -30,11 +30,13 @@ public class UserDAOImpl implements UserDAO
@PersistenceContext(unitName = AppConstants.TEST_PERSISTENCE_UNIT)
private EntityManager entityManager;
+ @Override
public void add(final User user)
{
entityManager.persist(user);
}
+ @Override
@SuppressWarnings(
{ "unchecked" })
public List<User> findAll()
@@ -42,12 +44,14 @@ public class UserDAOImpl implements UserDAO
return entityManager.createQuery("select u from User u order by u.id desc").getResultList();
}
+ @Override
public void delete(final User... users)
{
for (final User user : users)
entityManager.remove(user);
}
+ @Override
public void deleteAll()
{
for (final User u : findAll())
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/example/app2/services/impl/UserDAOImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/example/app2/services/impl/UserDAOImpl.java b/tapestry-jpa/src/test/java/org/example/app2/services/impl/UserDAOImpl.java
index 9df4186..c8ee8e8 100644
--- a/tapestry-jpa/src/test/java/org/example/app2/services/impl/UserDAOImpl.java
+++ b/tapestry-jpa/src/test/java/org/example/app2/services/impl/UserDAOImpl.java
@@ -10,6 +10,7 @@ public class UserDAOImpl implements UserDAO
@Inject
private EntityManager entityManager;
+ @Override
public void persist(Object entity)
{
entityManager.persist(entity);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/example/app3/services/AppModule.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/example/app3/services/AppModule.java b/tapestry-jpa/src/test/java/org/example/app3/services/AppModule.java
index f0c47de..22a6e63 100644
--- a/tapestry-jpa/src/test/java/org/example/app3/services/AppModule.java
+++ b/tapestry-jpa/src/test/java/org/example/app3/services/AppModule.java
@@ -43,6 +43,7 @@ public class AppModule
final PersistenceUnitConfigurer configurer = new PersistenceUnitConfigurer()
{
+ @Override
public void configure(final TapestryPersistenceUnitInfo unitInfo)
{
unitInfo.nonJtaDataSource("jdbc/JPATest")
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/example/app5/services/AppModule.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/example/app5/services/AppModule.java b/tapestry-jpa/src/test/java/org/example/app5/services/AppModule.java
index 23221d4..05d2488 100644
--- a/tapestry-jpa/src/test/java/org/example/app5/services/AppModule.java
+++ b/tapestry-jpa/src/test/java/org/example/app5/services/AppModule.java
@@ -37,11 +37,13 @@ public class AppModule
PersistenceProviderResolverHolder.setPersistenceProviderResolver(
new PersistenceProviderResolver()
{
+ @Override
public List<PersistenceProvider> getPersistenceProviders()
{
return Arrays.<PersistenceProvider>asList(new DummyPersistenceProvider(), new org.eclipse.persistence.jpa.PersistenceProvider());
}
+ @Override
public void clearCachedProviders()
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/example/app6/services/AppModule.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/example/app6/services/AppModule.java b/tapestry-jpa/src/test/java/org/example/app6/services/AppModule.java
index 3973ec3..3883b54 100644
--- a/tapestry-jpa/src/test/java/org/example/app6/services/AppModule.java
+++ b/tapestry-jpa/src/test/java/org/example/app6/services/AppModule.java
@@ -54,6 +54,7 @@ public class AppModule
{
final PersistenceUnitConfigurer configurer = new PersistenceUnitConfigurer()
{
+ @Override
public void configure(final TapestryPersistenceUnitInfo unitInfo)
{
unitInfo.addManagedClass(User.class);
@@ -63,6 +64,7 @@ public class AppModule
final PersistenceUnitConfigurer configurer2 = new PersistenceUnitConfigurer()
{
+ @Override
public void configure(final TapestryPersistenceUnitInfo unitInfo)
{
unitInfo.addProperty("javax.persistence.jdbc.driver", "org.h2.Driver")
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/example/app6/services/impl/UserDAOImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/example/app6/services/impl/UserDAOImpl.java b/tapestry-jpa/src/test/java/org/example/app6/services/impl/UserDAOImpl.java
index 98f7b6e..cff6e2c 100644
--- a/tapestry-jpa/src/test/java/org/example/app6/services/impl/UserDAOImpl.java
+++ b/tapestry-jpa/src/test/java/org/example/app6/services/impl/UserDAOImpl.java
@@ -31,6 +31,7 @@ public class UserDAOImpl implements UserDAO
@PersistenceContext(unitName = AppConstants.TEST_PERSISTENCE_UNIT)
private EntityManager entityManager;
+ @Override
@CommitAfter
@PersistenceContext(unitName = AppConstants.TEST_PERSISTENCE_UNIT)
public void add(final User user)
@@ -38,6 +39,7 @@ public class UserDAOImpl implements UserDAO
entityManager.persist(user);
}
+ @Override
@SuppressWarnings(
{ "unchecked" })
public List<User> findAll()
@@ -46,6 +48,7 @@ public class UserDAOImpl implements UserDAO
return resultList;
}
+ @Override
@CommitAfter
@PersistenceContext(unitName = AppConstants.TEST_PERSISTENCE_UNIT)
public void delete(final User... users)
@@ -54,6 +57,7 @@ public class UserDAOImpl implements UserDAO
entityManager.remove(user);
}
+ @Override
public void deleteAll()
{
for (final User u : findAll())
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-json/src/main/java/org/apache/tapestry5/internal/json/StringToJSONArray.java
----------------------------------------------------------------------
diff --git a/tapestry-json/src/main/java/org/apache/tapestry5/internal/json/StringToJSONArray.java b/tapestry-json/src/main/java/org/apache/tapestry5/internal/json/StringToJSONArray.java
index 3c58779..71602a0 100644
--- a/tapestry-json/src/main/java/org/apache/tapestry5/internal/json/StringToJSONArray.java
+++ b/tapestry-json/src/main/java/org/apache/tapestry5/internal/json/StringToJSONArray.java
@@ -21,6 +21,7 @@ import org.apache.tapestry5.json.JSONArray;
* @since 5.3
*/
public class StringToJSONArray implements Coercion<String,JSONArray> {
+ @Override
public JSONArray coerce(String input) {
return new JSONArray(input);
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-json/src/main/java/org/apache/tapestry5/internal/json/StringToJSONObject.java
----------------------------------------------------------------------
diff --git a/tapestry-json/src/main/java/org/apache/tapestry5/internal/json/StringToJSONObject.java b/tapestry-json/src/main/java/org/apache/tapestry5/internal/json/StringToJSONObject.java
index 0ffb2c3..faf1f1f 100644
--- a/tapestry-json/src/main/java/org/apache/tapestry5/internal/json/StringToJSONObject.java
+++ b/tapestry-json/src/main/java/org/apache/tapestry5/internal/json/StringToJSONObject.java
@@ -21,6 +21,7 @@ import org.apache.tapestry5.json.JSONObject;
* @since 5.3
*/
public class StringToJSONObject implements Coercion<String,JSONObject> {
+ @Override
public JSONObject coerce(String input) {
return new JSONObject(input);
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-json/src/main/java/org/apache/tapestry5/json/CompactSession.java
----------------------------------------------------------------------
diff --git a/tapestry-json/src/main/java/org/apache/tapestry5/json/CompactSession.java b/tapestry-json/src/main/java/org/apache/tapestry5/json/CompactSession.java
index 563d17e..8eced69 100644
--- a/tapestry-json/src/main/java/org/apache/tapestry5/json/CompactSession.java
+++ b/tapestry-json/src/main/java/org/apache/tapestry5/json/CompactSession.java
@@ -30,21 +30,25 @@ class CompactSession implements JSONPrintSession
this.writer = writer;
}
+ @Override
public JSONPrintSession indent()
{
return this;
}
+ @Override
public JSONPrintSession newline()
{
return this;
}
+ @Override
public JSONPrintSession outdent()
{
return this;
}
+ @Override
public JSONPrintSession print(String value)
{
writer.print(value);
@@ -52,11 +56,13 @@ class CompactSession implements JSONPrintSession
return this;
}
+ @Override
public JSONPrintSession printQuoted(String value)
{
return print(JSONObject.quote(value));
}
+ @Override
public JSONPrintSession printSymbol(char symbol)
{
writer.print(symbol);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONArray.java
----------------------------------------------------------------------
diff --git a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONArray.java b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONArray.java
index 055ae43..b679bc7 100644
--- a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONArray.java
+++ b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONArray.java
@@ -117,6 +117,7 @@ public final class JSONArray extends JSONCollection implements Iterable<Object>
return new JSONArray().putAll(iterable);
}
+ @Override
public Iterator<Object> iterator()
{
return list.iterator();
@@ -446,6 +447,7 @@ public final class JSONArray extends JSONCollection implements Iterable<Object>
return list.equals(other.list);
}
+ @Override
void print(JSONPrintSession session)
{
session.printSymbol('[');
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONLiteral.java
----------------------------------------------------------------------
diff --git a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONLiteral.java b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONLiteral.java
index 8627134..a1e3b21 100644
--- a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONLiteral.java
+++ b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONLiteral.java
@@ -43,6 +43,7 @@ public class JSONLiteral implements JSONString, Serializable
return text;
}
+ @Override
public String toJSONString()
{
return text;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java
----------------------------------------------------------------------
diff --git a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java
index c8dd777..8c42bc4 100644
--- a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java
+++ b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java
@@ -126,6 +126,7 @@ public final class JSONObject extends JSONCollection
return "null";
}
+ @Override
public String toJSONString()
{
return "null";
@@ -871,6 +872,7 @@ public final class JSONObject extends JSONCollection
*
* @since 5.2.0
*/
+ @Override
void print(JSONPrintSession session)
{
session.printSymbol('{');
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-json/src/main/java/org/apache/tapestry5/json/PrettyPrintSession.java
----------------------------------------------------------------------
diff --git a/tapestry-json/src/main/java/org/apache/tapestry5/json/PrettyPrintSession.java b/tapestry-json/src/main/java/org/apache/tapestry5/json/PrettyPrintSession.java
index 6316fbd..c371993 100644
--- a/tapestry-json/src/main/java/org/apache/tapestry5/json/PrettyPrintSession.java
+++ b/tapestry-json/src/main/java/org/apache/tapestry5/json/PrettyPrintSession.java
@@ -54,6 +54,7 @@ class PrettyPrintSession implements JSONPrintSession
this.indentString = indentString;
}
+ @Override
public JSONPrintSession indent()
{
indentLevel++;
@@ -61,6 +62,7 @@ class PrettyPrintSession implements JSONPrintSession
return this;
}
+ @Override
public JSONPrintSession newline()
{
if (position != Position.MARGIN)
@@ -72,6 +74,7 @@ class PrettyPrintSession implements JSONPrintSession
return this;
}
+ @Override
public JSONPrintSession outdent()
{
indentLevel--;
@@ -105,6 +108,7 @@ class PrettyPrintSession implements JSONPrintSession
addSep();
}
+ @Override
public JSONPrintSession print(String value)
{
prepareToPrint();
@@ -116,11 +120,13 @@ class PrettyPrintSession implements JSONPrintSession
return this;
}
+ @Override
public JSONPrintSession printQuoted(String value)
{
return print(JSONObject.quote(value));
}
+ @Override
public JSONPrintSession printSymbol(char symbol)
{
addIndentation();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/internal/services/KaptchaDataTypeAnalyzer.java
----------------------------------------------------------------------
diff --git a/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/internal/services/KaptchaDataTypeAnalyzer.java b/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/internal/services/KaptchaDataTypeAnalyzer.java
index 820439a..c7f3016 100644
--- a/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/internal/services/KaptchaDataTypeAnalyzer.java
+++ b/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/internal/services/KaptchaDataTypeAnalyzer.java
@@ -20,6 +20,7 @@ import org.apache.tapestry5.services.DataTypeAnalyzer;
public class KaptchaDataTypeAnalyzer implements DataTypeAnalyzer
{
+ @Override
public String identifyDataType(PropertyAdapter adapter)
{
final Kaptcha annotation = adapter.getAnnotation(Kaptcha.class);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/internal/services/KaptchaProducerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/internal/services/KaptchaProducerImpl.java b/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/internal/services/KaptchaProducerImpl.java
index d61e3c4..cdeae23 100644
--- a/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/internal/services/KaptchaProducerImpl.java
+++ b/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/internal/services/KaptchaProducerImpl.java
@@ -42,21 +42,25 @@ public class KaptchaProducerImpl implements KaptchaProducer
width = config.getWidth();
}
+ @Override
public int getHeight()
{
return height;
}
+ @Override
public int getWidth()
{
return width;
}
+ @Override
public BufferedImage createImage(String text)
{
return producer.createImage(text);
}
+ @Override
public String createText()
{
return producer.createText();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-kaptcha/src/test/java/kaptcha/demo/services/AppModule.java
----------------------------------------------------------------------
diff --git a/tapestry-kaptcha/src/test/java/kaptcha/demo/services/AppModule.java b/tapestry-kaptcha/src/test/java/kaptcha/demo/services/AppModule.java
index b141291..463e0ff 100644
--- a/tapestry-kaptcha/src/test/java/kaptcha/demo/services/AppModule.java
+++ b/tapestry-kaptcha/src/test/java/kaptcha/demo/services/AppModule.java
@@ -41,21 +41,25 @@ public class AppModule
return new KaptchaProducer()
{
+ @Override
public int getWidth()
{
return producer.getWidth();
}
+ @Override
public int getHeight()
{
return producer.getHeight();
}
+ @Override
public BufferedImage createImage(String text)
{
return producer.createImage(text);
}
+ @Override
public String createText()
{
logger.info(String.format("Kaptcha text: '%s'", producer.createText()));
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-runner/src/main/java/org/apache/tapestry5/test/Jetty7Runner.java
----------------------------------------------------------------------
diff --git a/tapestry-runner/src/main/java/org/apache/tapestry5/test/Jetty7Runner.java b/tapestry-runner/src/main/java/org/apache/tapestry5/test/Jetty7Runner.java
index a87ec7b..4138528 100644
--- a/tapestry-runner/src/main/java/org/apache/tapestry5/test/Jetty7Runner.java
+++ b/tapestry-runner/src/main/java/org/apache/tapestry5/test/Jetty7Runner.java
@@ -84,6 +84,7 @@ public class Jetty7Runner implements ServletContainerRunner
}
/** Immediately shuts down the server instance. */
+ @Override
public void stop()
{
System.out.printf("Stopping Jetty instance on port %d/%d\n", port, sslPort);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-runner/src/main/java/org/apache/tapestry5/test/Tomcat6Runner.java
----------------------------------------------------------------------
diff --git a/tapestry-runner/src/main/java/org/apache/tapestry5/test/Tomcat6Runner.java b/tapestry-runner/src/main/java/org/apache/tapestry5/test/Tomcat6Runner.java
index 3367a15..03a4e9b 100644
--- a/tapestry-runner/src/main/java/org/apache/tapestry5/test/Tomcat6Runner.java
+++ b/tapestry-runner/src/main/java/org/apache/tapestry5/test/Tomcat6Runner.java
@@ -104,6 +104,7 @@ public class Tomcat6Runner implements ServletContainerRunner
/**
* Immediately shuts down the server instance.
*/
+ @Override
public void stop()
{
System.out.printf("Stopping Tomcat instance on port %d/%d\n", port, sslPort);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/SpringBeanServiceDef.java
----------------------------------------------------------------------
diff --git a/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/SpringBeanServiceDef.java b/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/SpringBeanServiceDef.java
index cce8095..4af153e 100644
--- a/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/SpringBeanServiceDef.java
+++ b/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/SpringBeanServiceDef.java
@@ -35,15 +35,18 @@ public class SpringBeanServiceDef implements ServiceDef2
this.context = context;
}
+ @Override
public boolean isPreventDecoration()
{
return true;
}
+ @Override
public ObjectCreator createServiceCreator(ServiceBuilderResources resources)
{
return new ObjectCreator()
{
+ @Override
public Object createObject()
{
return context.getBean(beanName);
@@ -57,26 +60,31 @@ public class SpringBeanServiceDef implements ServiceDef2
};
}
+ @Override
public String getServiceId()
{
return beanName;
}
+ @Override
public Set<Class> getMarkers()
{
return Collections.emptySet();
}
+ @Override
public Class getServiceInterface()
{
return context.getType(beanName);
}
+ @Override
public String getServiceScope()
{
return ScopeConstants.DEFAULT;
}
+ @Override
public boolean isEagerLoad()
{
return false;
[3/7] Required Java version is now 1.6,
this applies to building as well as to using Tapestry
Posted by jk...@apache.org.
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DelegatingInjectionResources.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DelegatingInjectionResources.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DelegatingInjectionResources.java
index e91741d..c3214ae 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DelegatingInjectionResources.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DelegatingInjectionResources.java
@@ -31,6 +31,7 @@ public class DelegatingInjectionResources implements InjectionResources
this.next = next;
}
+ @Override
public <T> T findResource(Class<T> type, Type genericType)
{
T result = first.findResource(type, genericType);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DummyLock.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DummyLock.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DummyLock.java
index bb5d903..fd20a43 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DummyLock.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DummyLock.java
@@ -23,10 +23,12 @@ import java.util.concurrent.locks.Lock;
*/
public class DummyLock implements Lock
{
+ @Override
public void lock()
{
}
+ @Override
public void lockInterruptibly() throws InterruptedException
{
}
@@ -34,23 +36,27 @@ public class DummyLock implements Lock
/**
* Returns null.
*/
+ @Override
public Condition newCondition()
{
return null;
}
/** @return true */
+ @Override
public boolean tryLock()
{
return true;
}
/** @return true */
+ @Override
public boolean tryLock(long time, TimeUnit unit) throws InterruptedException
{
return true;
}
+ @Override
public void unlock()
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java
index 5fd8c24..1a6dd80 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java
@@ -486,16 +486,19 @@ public class GenericsUtils
{
return new ParameterizedType()
{
+ @Override
public Type[] getActualTypeArguments()
{
return typeArguments;
}
+ @Override
public Type getRawType()
{
return rawType;
}
+ @Override
public Type getOwnerType()
{
return ownerType;
@@ -513,6 +516,7 @@ public class GenericsUtils
{
return new GenericArrayType()
{
+ @Override
public Type getGenericComponentType()
{
return componentType;
@@ -536,11 +540,13 @@ public class GenericsUtils
return new WildcardType()
{
+ @Override
public Type[] getUpperBounds()
{
return upperBounds;
}
+ @Override
public Type[] getLowerBounds()
{
return lowerBounds;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/IdToDependencyNode.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/IdToDependencyNode.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/IdToDependencyNode.java
index 3f4a1bc..fadd30c 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/IdToDependencyNode.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/IdToDependencyNode.java
@@ -56,6 +56,7 @@ public class IdToDependencyNode<T>
final DependencyLinker<T> before = new DependencyLinker<T>()
{
+ @Override
public void link(DependencyNode<T> source, DependencyNode<T> target)
{
target.addDependency(source);
@@ -67,6 +68,7 @@ public class IdToDependencyNode<T>
final DependencyLinker<T> after = new DependencyLinker<T>()
{
+ @Override
public void link(DependencyNode<T> source, DependencyNode<T> target)
{
source.addDependency(target);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearch.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearch.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearch.java
index c645807..f1830a7 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearch.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearch.java
@@ -76,16 +76,19 @@ public class InheritanceSearch implements Iterator<Class>, Iterable<Class>
}
}
+ @Override
public Iterator<Class> iterator()
{
return this;
}
+ @Override
public boolean hasNext()
{
return state != State.DONE;
}
+ @Override
public Class next()
{
switch (state)
@@ -147,6 +150,7 @@ public class InheritanceSearch implements Iterator<Class>, Iterable<Class>
* @throws UnsupportedOperationException
* always
*/
+ @Override
public void remove()
{
throw new UnsupportedOperationException();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java
index 3e15834..96c356b 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java
@@ -186,6 +186,7 @@ public class InternalUtils
{
return new ObjectCreator<Object>()
{
+ @Override
public Object createObject()
{
return fixedValue;
@@ -198,6 +199,7 @@ public class InternalUtils
{
final AnnotationProvider provider = new AnnotationProvider()
{
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationClass)
{
return findAnnotation(annotations, annotationClass);
@@ -244,6 +246,7 @@ public class InternalUtils
{
return new ObjectCreator()
{
+ @Override
public Object createObject()
{
return locator.getObject(injectionType, provider);
@@ -284,6 +287,7 @@ public class InternalUtils
final Invokable<ObjectCreator> operation = new Invokable<ObjectCreator>()
{
+ @Override
public ObjectCreator invoke()
{
return calculateInjection(type, genericType, annotations, locator, resources);
@@ -329,6 +333,7 @@ public class InternalUtils
final AnnotationProvider ap = new AnnotationProvider()
{
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationClass)
{
return f.getAnnotation(annotationClass);
@@ -341,6 +346,7 @@ public class InternalUtils
tracker.run(description, new Runnable()
{
+ @Override
public void run()
{
final Class<?> fieldType = f.getType();
@@ -610,16 +616,19 @@ public class InternalUtils
return new Iterator<T>()
{
+ @Override
public boolean hasNext()
{
return normal.hasPrevious();
}
+ @Override
public T next()
{
return normal.previous();
}
+ @Override
public void remove()
{
throw new UnsupportedOperationException();
@@ -704,6 +713,7 @@ public class InternalUtils
Comparator<Constructor> comparator = new Comparator<Constructor>()
{
+ @Override
public int compare(Constructor o1, Constructor o2)
{
return o2.getParameterTypes().length - o1.getParameterTypes().length;
@@ -824,6 +834,7 @@ public class InternalUtils
*/
public static final Mapper<Class, AnnotationProvider> CLASS_TO_AP_MAPPER = new Mapper<Class, AnnotationProvider>()
{
+ @Override
public AnnotationProvider map(final Class element)
{
return toAnnotationProvider(element);
@@ -838,6 +849,7 @@ public class InternalUtils
{
return new AnnotationProvider()
{
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationClass)
{
return annotationClass.cast(element.getAnnotation(annotationClass));
@@ -852,6 +864,7 @@ public class InternalUtils
*/
public static final Mapper<Method, AnnotationProvider> METHOD_TO_AP_MAPPER = new Mapper<Method, AnnotationProvider>()
{
+ @Override
public AnnotationProvider map(final Method element)
{
return toAnnotationProvider(element);
@@ -889,16 +902,19 @@ public class InternalUtils
{
// ServiceDef3 methods:
+ @Override
public AnnotationProvider getClassAnnotationProvider()
{
return toAnnotationProvider(getServiceInterface());
}
+ @Override
public AnnotationProvider getMethodAnnotationProvider(final String methodName, final Class... argumentTypes)
{
return toAnnotationProvider(findMethod(getServiceInterface(), methodName, argumentTypes));
}
+ @Override
public Class getServiceImplementation()
{
return null;
@@ -906,36 +922,43 @@ public class InternalUtils
// ServiceDef2 methods:
+ @Override
public boolean isPreventDecoration()
{
return sd2.isPreventDecoration();
}
+ @Override
public ObjectCreator createServiceCreator(ServiceBuilderResources resources)
{
return sd2.createServiceCreator(resources);
}
+ @Override
public String getServiceId()
{
return sd2.getServiceId();
}
+ @Override
public Set<Class> getMarkers()
{
return sd2.getMarkers();
}
+ @Override
public Class getServiceInterface()
{
return sd2.getServiceInterface();
}
+ @Override
public String getServiceScope()
{
return sd2.getServiceScope();
}
+ @Override
public boolean isEagerLoad()
{
return sd2.isEagerLoad();
@@ -953,6 +976,7 @@ public class InternalUtils
{
// ServiceDef2 methods:
+ @Override
public boolean isPreventDecoration()
{
return false;
@@ -960,31 +984,37 @@ public class InternalUtils
// ServiceDef methods:
+ @Override
public ObjectCreator createServiceCreator(ServiceBuilderResources resources)
{
return sd.createServiceCreator(resources);
}
+ @Override
public String getServiceId()
{
return sd.getServiceId();
}
+ @Override
public Set<Class> getMarkers()
{
return sd.getMarkers();
}
+ @Override
public Class getServiceInterface()
{
return sd.getServiceInterface();
}
+ @Override
public String getServiceScope()
{
return sd.getServiceScope();
}
+ @Override
public boolean isEagerLoad()
{
return sd.isEagerLoad();
@@ -1005,41 +1035,49 @@ public class InternalUtils
return new ModuleDef2()
{
+ @Override
public Set<AdvisorDef> getAdvisorDefs()
{
return Collections.emptySet();
}
+ @Override
public Class getBuilderClass()
{
return md.getBuilderClass();
}
+ @Override
public Set<ContributionDef> getContributionDefs()
{
return md.getContributionDefs();
}
+ @Override
public Set<DecoratorDef> getDecoratorDefs()
{
return md.getDecoratorDefs();
}
+ @Override
public String getLoggerName()
{
return md.getLoggerName();
}
+ @Override
public ServiceDef getServiceDef(String serviceId)
{
return md.getServiceDef(serviceId);
}
+ @Override
public Set<String> getServiceIds()
{
return md.getServiceIds();
}
+ @Override
public Set<StartupDef> getStartups()
{
return Collections.emptySet();
@@ -1057,16 +1095,19 @@ public class InternalUtils
return new ServiceLifecycle2()
{
+ @Override
public boolean requiresProxy()
{
return true;
}
+ @Override
public Object createService(ServiceResources resources, ObjectCreator creator)
{
return lifecycle.createService(resources, creator);
}
+ @Override
public boolean isSingleton()
{
return lifecycle.isSingleton();
@@ -1106,34 +1147,40 @@ public class InternalUtils
return new ContributionDef2()
{
+ @Override
public Set<Class> getMarkers()
{
return Collections.emptySet();
}
+ @Override
public Class getServiceInterface()
{
return null;
}
+ @Override
public void contribute(ModuleBuilderSource moduleSource, ServiceResources resources,
Configuration configuration)
{
contribution.contribute(moduleSource, resources, configuration);
}
+ @Override
public void contribute(ModuleBuilderSource moduleSource, ServiceResources resources,
OrderedConfiguration configuration)
{
contribution.contribute(moduleSource, resources, configuration);
}
+ @Override
public void contribute(ModuleBuilderSource moduleSource, ServiceResources resources,
MappedConfiguration configuration)
{
contribution.contribute(moduleSource, resources, configuration);
}
+ @Override
public String getServiceId()
{
return contribution.getServiceId();
@@ -1159,36 +1206,43 @@ public class InternalUtils
return new ContributionDef3()
{
+ @Override
public boolean isOptional()
{
return false;
}
+ @Override
public String getServiceId()
{
return cd2.getServiceId();
}
+ @Override
public void contribute(ModuleBuilderSource moduleSource, ServiceResources resources, Configuration configuration)
{
cd2.contribute(moduleSource, resources, configuration);
}
+ @Override
public void contribute(ModuleBuilderSource moduleSource, ServiceResources resources, OrderedConfiguration configuration)
{
cd2.contribute(moduleSource, resources, configuration);
}
+ @Override
public void contribute(ModuleBuilderSource moduleSource, ServiceResources resources, MappedConfiguration configuration)
{
cd2.contribute(moduleSource, resources, configuration);
}
+ @Override
public Set<Class> getMarkers()
{
return cd2.getMarkers();
}
+ @Override
public Class getServiceInterface()
{
return cd2.getServiceInterface();
@@ -1213,31 +1267,37 @@ public class InternalUtils
return new AdvisorDef2()
{
+ @Override
public ServiceAdvisor createAdvisor(ModuleBuilderSource moduleSource, ServiceResources resources)
{
return advisor.createAdvisor(moduleSource, resources);
}
+ @Override
public String getAdvisorId()
{
return advisor.getAdvisorId();
}
+ @Override
public String[] getConstraints()
{
return advisor.getConstraints();
}
+ @Override
public boolean matches(ServiceDef serviceDef)
{
return advisor.matches(serviceDef);
}
+ @Override
public Set<Class> getMarkers()
{
return Collections.emptySet();
}
+ @Override
public Class getServiceInterface()
{
return null;
@@ -1262,31 +1322,37 @@ public class InternalUtils
return new DecoratorDef2()
{
+ @Override
public ServiceDecorator createDecorator(ModuleBuilderSource moduleSource, ServiceResources resources)
{
return decorator.createDecorator(moduleSource, resources);
}
+ @Override
public String[] getConstraints()
{
return decorator.getConstraints();
}
+ @Override
public String getDecoratorId()
{
return decorator.getDecoratorId();
}
+ @Override
public boolean matches(ServiceDef serviceDef)
{
return decorator.matches(serviceDef);
}
+ @Override
public Set<Class> getMarkers()
{
return Collections.emptySet();
}
+ @Override
public Class getServiceInterface()
{
return null;
@@ -1334,6 +1400,7 @@ public class InternalUtils
return new Mapper<S, T>()
{
+ @Override
public T map(S value)
{
return coercion.coerce(value);
@@ -1396,6 +1463,7 @@ public class InternalUtils
return new AnnotationProvider()
{
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationClass)
{
return element.getAnnotation(annotationClass);
@@ -1413,6 +1481,7 @@ public class InternalUtils
constructor.getDeclaringClass().getName(),
constructor), new Invokable<ObjectCreator<T>>()
{
+ @Override
public ObjectCreator<T> invoke()
{
validateConstructorForAutobuild(constructor);
@@ -1453,6 +1522,7 @@ public class InternalUtils
final AnnotationProvider ap = new AnnotationProvider()
{
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationClass)
{
return f.getAnnotation(annotationClass);
@@ -1465,6 +1535,7 @@ public class InternalUtils
tracker.run(description, new Runnable()
{
+ @Override
public void run()
{
final Class<?> fieldType = f.getType();
@@ -1519,6 +1590,7 @@ public class InternalUtils
{
plan.add(new InitializationPlan<T>()
{
+ @Override
public String getDescription()
{
return String.format("Injecting %s into field %s of class %s.",
@@ -1527,6 +1599,7 @@ public class InternalUtils
field.getDeclaringClass().getName());
}
+ @Override
public void initialize(T instance)
{
inject(instance, field, injectedValue);
@@ -1555,6 +1628,7 @@ public class InternalUtils
tracker.run("Computing parameters for post-injection method " + method,
new Runnable()
{
+ @Override
public void run()
{
final ObjectCreator[] parameters = InternalUtils.calculateParametersForMethod(method, locator,
@@ -1562,11 +1636,13 @@ public class InternalUtils
plan.add(new InitializationPlan<Object>()
{
+ @Override
public String getDescription()
{
return "Invoking " + method;
}
+ @Override
public void initialize(Object instance)
{
Throwable fail = null;
@@ -1606,6 +1682,7 @@ public class InternalUtils
return tracker.invoke("Creating plan to invoke " + method, new Invokable<ObjectCreator<T>>()
{
+ @Override
public ObjectCreator<T> invoke()
{
ObjectCreator[] methodParameters = calculateParametersForMethod(method, locator, resources, tracker);
@@ -1624,6 +1701,7 @@ public class InternalUtils
*/
public static Mapper<ObjectCreator, Object> CREATE_OBJECT = new Mapper<ObjectCreator, Object>()
{
+ @Override
public Object map(ObjectCreator element)
{
return element.createObject();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LocationImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LocationImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LocationImpl.java
index 211ca3b..1ef232e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LocationImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LocationImpl.java
@@ -49,16 +49,19 @@ public final class LocationImpl implements Location
this.column = column;
}
+ @Override
public Resource getResource()
{
return resource;
}
+ @Override
public int getLine()
{
return line;
}
+ @Override
public int getColumn()
{
return column;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LoggingInvokableWrapper.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LoggingInvokableWrapper.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LoggingInvokableWrapper.java
index acaf2bf..1fe7ddb 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LoggingInvokableWrapper.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LoggingInvokableWrapper.java
@@ -35,6 +35,7 @@ public class LoggingInvokableWrapper<T> implements Invokable<T>
this.delegate = delegate;
}
+ @Override
public T invoke()
{
logger.debug(message);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MapInjectionResources.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MapInjectionResources.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MapInjectionResources.java
index 92aeb67..50a936b 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MapInjectionResources.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MapInjectionResources.java
@@ -26,6 +26,7 @@ public class MapInjectionResources implements InjectionResources
public MapInjectionResources(Map<Class, Object> map) {this.map = map;}
+ @Override
@SuppressWarnings({"unchecked"})
public <T> T findResource(Class<T> type, Type genericType)
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessageFormatterImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessageFormatterImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessageFormatterImpl.java
index 737a12b..f4d8949 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessageFormatterImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessageFormatterImpl.java
@@ -32,6 +32,7 @@ public class MessageFormatterImpl implements MessageFormatter
this.locale = locale;
}
+ @Override
public String format(Object... args)
{
for (int i = 0; i < args.length; i++)
@@ -55,6 +56,7 @@ public class MessageFormatterImpl implements MessageFormatter
*
* @since 5.4
*/
+ @Override
public String toString()
{
return format;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessagesImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessagesImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessagesImpl.java
index 9d7a5b4..c06ef90 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessagesImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessagesImpl.java
@@ -66,6 +66,7 @@ public class MessagesImpl extends AbstractMessages
return properties.get(key);
}
+ @Override
public Set<String> getKeys()
{
return properties.keySet();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MethodInvoker.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MethodInvoker.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MethodInvoker.java
index 53ce6fb..5b54e89 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MethodInvoker.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MethodInvoker.java
@@ -40,6 +40,7 @@ public class MethodInvoker<T> implements Invokable<T>
this.methodParameters = methodParameters;
}
+ @Override
public T invoke()
{
Throwable fail;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Orderer.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Orderer.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Orderer.java
index 565f6e8..9f7adfc 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Orderer.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Orderer.java
@@ -56,6 +56,7 @@ public class Orderer<T>
final DependencyLinker<T> _before = new DependencyLinker<T>()
{
+ @Override
public void link(DependencyNode<T> source, DependencyNode<T> target)
{
target.addDependency(source);
@@ -67,6 +68,7 @@ public class Orderer<T>
final DependencyLinker<T> _after = new DependencyLinker<T>()
{
+ @Override
public void link(DependencyNode<T> source, DependencyNode<T> target)
{
source.addDependency(target);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/TapestryException.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/TapestryException.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/TapestryException.java
index 7332a9d..ef217cb 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/TapestryException.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/TapestryException.java
@@ -58,6 +58,7 @@ public class TapestryException extends RuntimeException implements Locatable
this.location = location;
}
+ @Override
public 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/util/WrongConfigurationTypeGuard.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/WrongConfigurationTypeGuard.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/WrongConfigurationTypeGuard.java
index b18cb0a..3d76c54 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/WrongConfigurationTypeGuard.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/WrongConfigurationTypeGuard.java
@@ -34,6 +34,7 @@ public class WrongConfigurationTypeGuard implements InjectionResources
this.expectedType = expectedType;
}
+ @Override
public <T> T findResource(Class<T> type, Type genericType)
{
if (type == guardType)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/modules/TapestryIOCModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/modules/TapestryIOCModule.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/modules/TapestryIOCModule.java
index 7f95181..6e49788 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/modules/TapestryIOCModule.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/modules/TapestryIOCModule.java
@@ -95,6 +95,7 @@ public final class TapestryIOCModule
return new ServiceLifecycleSource()
{
+ @Override
public ServiceLifecycle get(String scope)
{
return lifecycles.get(scope);
@@ -139,6 +140,7 @@ public final class TapestryIOCModule
ObjectProvider wrapper = new ObjectProvider()
{
+ @Override
public <T> T provide(Class<T> objectType, AnnotationProvider annotationProvider, ObjectLocator locator)
{
return serviceOverride.getServiceOverrideProvider().provide(objectType, annotationProvider, locator);
@@ -188,6 +190,7 @@ public final class TapestryIOCModule
{
add(configuration, Object.class, String.class, new Coercion<Object, String>()
{
+ @Override
public String coerce(Object input)
{
return input.toString();
@@ -196,6 +199,7 @@ public final class TapestryIOCModule
add(configuration, Object.class, Boolean.class, new Coercion<Object, Boolean>()
{
+ @Override
public Boolean coerce(Object input)
{
return input != null;
@@ -204,6 +208,7 @@ public final class TapestryIOCModule
add(configuration, String.class, Double.class, new Coercion<String, Double>()
{
+ @Override
public Double coerce(String input)
{
return new Double(input);
@@ -215,6 +220,7 @@ public final class TapestryIOCModule
add(configuration, String.class, BigDecimal.class, new Coercion<String, BigDecimal>()
{
+ @Override
public BigDecimal coerce(String input)
{
return new BigDecimal(input);
@@ -223,6 +229,7 @@ public final class TapestryIOCModule
add(configuration, BigDecimal.class, Double.class, new Coercion<BigDecimal, Double>()
{
+ @Override
public Double coerce(BigDecimal input)
{
return input.doubleValue();
@@ -231,6 +238,7 @@ public final class TapestryIOCModule
add(configuration, String.class, BigInteger.class, new Coercion<String, BigInteger>()
{
+ @Override
public BigInteger coerce(String input)
{
return new BigInteger(input);
@@ -239,6 +247,7 @@ public final class TapestryIOCModule
add(configuration, String.class, Long.class, new Coercion<String, Long>()
{
+ @Override
public Long coerce(String input)
{
return new Long(input);
@@ -247,6 +256,7 @@ public final class TapestryIOCModule
add(configuration, Long.class, Byte.class, new Coercion<Long, Byte>()
{
+ @Override
public Byte coerce(Long input)
{
return input.byteValue();
@@ -255,6 +265,7 @@ public final class TapestryIOCModule
add(configuration, Long.class, Short.class, new Coercion<Long, Short>()
{
+ @Override
public Short coerce(Long input)
{
return input.shortValue();
@@ -263,6 +274,7 @@ public final class TapestryIOCModule
add(configuration, Long.class, Integer.class, new Coercion<Long, Integer>()
{
+ @Override
public Integer coerce(Long input)
{
return input.intValue();
@@ -271,6 +283,7 @@ public final class TapestryIOCModule
add(configuration, Number.class, Long.class, new Coercion<Number, Long>()
{
+ @Override
public Long coerce(Number input)
{
return input.longValue();
@@ -279,6 +292,7 @@ public final class TapestryIOCModule
add(configuration, Double.class, Float.class, new Coercion<Double, Float>()
{
+ @Override
public Float coerce(Double input)
{
return input.floatValue();
@@ -287,6 +301,7 @@ public final class TapestryIOCModule
add(configuration, Long.class, Double.class, new Coercion<Long, Double>()
{
+ @Override
public Double coerce(Long input)
{
return input.doubleValue();
@@ -295,6 +310,7 @@ public final class TapestryIOCModule
add(configuration, String.class, Boolean.class, new Coercion<String, Boolean>()
{
+ @Override
public Boolean coerce(String input)
{
String trimmed = input == null ? "" : input.trim();
@@ -310,6 +326,7 @@ public final class TapestryIOCModule
add(configuration, Number.class, Boolean.class, new Coercion<Number, Boolean>()
{
+ @Override
public Boolean coerce(Number input)
{
return input.longValue() != 0;
@@ -318,6 +335,7 @@ public final class TapestryIOCModule
add(configuration, Void.class, Boolean.class, new Coercion<Void, Boolean>()
{
+ @Override
public Boolean coerce(Void input)
{
return false;
@@ -326,6 +344,7 @@ public final class TapestryIOCModule
add(configuration, Collection.class, Boolean.class, new Coercion<Collection, Boolean>()
{
+ @Override
public Boolean coerce(Collection input)
{
return !input.isEmpty();
@@ -334,6 +353,7 @@ public final class TapestryIOCModule
add(configuration, Object.class, List.class, new Coercion<Object, List>()
{
+ @Override
public List coerce(Object input)
{
return Collections.singletonList(input);
@@ -342,6 +362,7 @@ public final class TapestryIOCModule
add(configuration, Object[].class, List.class, new Coercion<Object[], List>()
{
+ @Override
public List coerce(Object[] input)
{
return Arrays.asList(input);
@@ -350,6 +371,7 @@ public final class TapestryIOCModule
add(configuration, Object[].class, Boolean.class, new Coercion<Object[], Boolean>()
{
+ @Override
public Boolean coerce(Object[] input)
{
return input != null && input.length > 0;
@@ -358,6 +380,7 @@ public final class TapestryIOCModule
add(configuration, Float.class, Double.class, new Coercion<Float, Double>()
{
+ @Override
public Double coerce(Float input)
{
return input.doubleValue();
@@ -366,6 +389,7 @@ public final class TapestryIOCModule
Coercion primitiveArrayCoercion = new Coercion<Object, List>()
{
+ @Override
public List<Object> coerce(Object input)
{
int length = Array.getLength(input);
@@ -389,6 +413,7 @@ public final class TapestryIOCModule
add(configuration, String.class, File.class, new Coercion<String, File>()
{
+ @Override
public File coerce(String input)
{
return new File(input);
@@ -397,6 +422,7 @@ public final class TapestryIOCModule
add(configuration, String.class, TimeInterval.class, new Coercion<String, TimeInterval>()
{
+ @Override
public TimeInterval coerce(String input)
{
return new TimeInterval(input);
@@ -405,6 +431,7 @@ public final class TapestryIOCModule
add(configuration, TimeInterval.class, Long.class, new Coercion<TimeInterval, Long>()
{
+ @Override
public Long coerce(TimeInterval input)
{
return input.milliseconds();
@@ -413,6 +440,7 @@ public final class TapestryIOCModule
add(configuration, Object.class, Object[].class, new Coercion<Object, Object[]>()
{
+ @Override
public Object[] coerce(Object input)
{
return new Object[]
@@ -422,6 +450,7 @@ public final class TapestryIOCModule
add(configuration, Collection.class, Object[].class, new Coercion<Collection, Object[]>()
{
+ @Override
public Object[] coerce(Collection input)
{
return input.toArray();
@@ -430,6 +459,7 @@ public final class TapestryIOCModule
add(configuration, Flow.class, List.class, new Coercion<Flow, List>()
{
+ @Override
public List coerce(Flow input)
{
return input.toList();
@@ -438,6 +468,7 @@ public final class TapestryIOCModule
add(configuration, Flow.class, Boolean.class, new Coercion<Flow, Boolean>()
{
+ @Override
public Boolean coerce(Flow input)
{
return !input.isEmpty();
@@ -511,6 +542,7 @@ public final class TapestryIOCModule
shutdownHub.addRegistryShutdownListener(new Runnable()
{
+ @Override
public void run()
{
executorService.shutdown();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/CoercionTuple.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/CoercionTuple.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/CoercionTuple.java
index 8658686..746de1e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/CoercionTuple.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/CoercionTuple.java
@@ -49,6 +49,7 @@ public final class CoercionTuple<S, T>
this.coercion = coercion;
}
+ @Override
public WT coerce(WS input)
{
return coercion.coerce(input);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/CronSchedule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/CronSchedule.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/CronSchedule.java
index 1c76332..0198d59 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/CronSchedule.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/CronSchedule.java
@@ -34,11 +34,13 @@ public class CronSchedule implements Schedule
}
}
+ @Override
public long firstExecution()
{
return getNextValidTimeAfterNow();
}
+ @Override
public long nextExecution(long previousExecution)
{
return getNextValidTimeAfterNow();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/IntervalSchedule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/IntervalSchedule.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/IntervalSchedule.java
index 1c42ed0..70ecfbf 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/IntervalSchedule.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/IntervalSchedule.java
@@ -36,11 +36,13 @@ public class IntervalSchedule implements Schedule
this.interval = interval;
}
+ @Override
public long firstExecution()
{
return nextExecution(System.currentTimeMillis());
}
+ @Override
public long nextExecution(long previousExecution)
{
return previousExecution + interval;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/AbstractMessages.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/AbstractMessages.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/AbstractMessages.java
index 95641e0..590c337 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/AbstractMessages.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/AbstractMessages.java
@@ -50,11 +50,13 @@ public abstract class AbstractMessages implements Messages
protected abstract String valueForKey(String key);
+ @Override
public boolean contains(String key)
{
return valueForKey(key) != null;
}
+ @Override
public String get(String key)
{
if (contains(key)) return valueForKey(key);
@@ -62,6 +64,7 @@ public abstract class AbstractMessages implements Messages
return String.format("[[missing key: %s]]", key);
}
+ @Override
public MessageFormatter getFormatter(String key)
{
MessageFormatter result = cache.get(key);
@@ -82,6 +85,7 @@ public abstract class AbstractMessages implements Messages
return new MessageFormatterImpl(format, locale);
}
+ @Override
public String format(String key, Object... args)
{
return getFormatter(key).format(args);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java
index 09f464d..f5aff7e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java
@@ -52,16 +52,19 @@ public class CaseInsensitiveMap<V> extends AbstractMap<String, V> implements Ser
this.value = value;
}
+ @Override
public String getKey()
{
return key;
}
+ @Override
public V getValue()
{
return value;
}
+ @Override
public V setValue(V value)
{
V result = this.value;
@@ -98,11 +101,13 @@ public class CaseInsensitiveMap<V> extends AbstractMap<String, V> implements Ser
int current = -1;
+ @Override
public boolean hasNext()
{
return index < size;
}
+ @Override
public Object next()
{
check();
@@ -114,6 +119,7 @@ public class CaseInsensitiveMap<V> extends AbstractMap<String, V> implements Ser
return entries[current];
}
+ @Override
public void remove()
{
check();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/LocalizedNameGenerator.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/LocalizedNameGenerator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/LocalizedNameGenerator.java
index 62c8cdd..6f86cc7 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/LocalizedNameGenerator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/LocalizedNameGenerator.java
@@ -154,6 +154,7 @@ public class LocalizedNameGenerator implements Iterator<String>, Iterable<String
* Returns true if there are more name variants to be returned, false otherwise.
*/
+ @Override
public boolean hasNext()
{
return state != EXHAUSTED;
@@ -166,6 +167,7 @@ public class LocalizedNameGenerator implements Iterator<String>, Iterable<String
* if all variants have been returned.
*/
+ @Override
public String next()
{
if (state == EXHAUSTED)
@@ -239,6 +241,7 @@ public class LocalizedNameGenerator implements Iterator<String>, Iterable<String
/**
* @throws UnsupportedOperationException
*/
+ @Override
public void remove()
{
throw new UnsupportedOperationException();
@@ -247,6 +250,7 @@ public class LocalizedNameGenerator implements Iterator<String>, Iterable<String
/**
* So that LNG may be used with the for loop.
*/
+ @Override
public Iterator<String> iterator()
{
return this;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/util/StringToEnumCoercion.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/util/StringToEnumCoercion.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/util/StringToEnumCoercion.java
index f918773..77c9a8d 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/util/StringToEnumCoercion.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/util/StringToEnumCoercion.java
@@ -51,6 +51,7 @@ public final class StringToEnumCoercion<T extends Enum> implements Coercion<Stri
stringToEnum.put(value.name(), value);
}
+ @Override
public T coerce(String input)
{
if (InternalUtils.isBlank(input))
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/com/example/CounterImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/com/example/CounterImpl.java b/tapestry-ioc/src/test/java/com/example/CounterImpl.java
index dd6cc55..22d592a 100644
--- a/tapestry-ioc/src/test/java/com/example/CounterImpl.java
+++ b/tapestry-ioc/src/test/java/com/example/CounterImpl.java
@@ -24,6 +24,7 @@ public class CounterImpl implements Counter, ReloadAware
private int count;
+ @Override
public boolean shutdownImplementationForReload()
{
ReloadAwareModule.counterReloads++;
@@ -31,6 +32,7 @@ public class CounterImpl implements Counter, ReloadAware
return true;
}
+ @Override
public synchronized int increment()
{
return ++count;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/com/example/ExtraRunnableModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/com/example/ExtraRunnableModule.java b/tapestry-ioc/src/test/java/com/example/ExtraRunnableModule.java
index a00eb96..d65c35d 100644
--- a/tapestry-ioc/src/test/java/com/example/ExtraRunnableModule.java
+++ b/tapestry-ioc/src/test/java/com/example/ExtraRunnableModule.java
@@ -30,11 +30,13 @@ public class ExtraRunnableModule
{
return new ExtraRunnable()
{
+ @Override
public void runOrThrow() throws Exception
{
run();
}
+ @Override
public void run()
{
for (Runnable r : configuration)
@@ -49,6 +51,7 @@ public class ExtraRunnableModule
{
configuration.add("Solo", new Runnable()
{
+ @Override
public void run()
{
InvokeCounts.contributionInvokeCount++;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/AdviceDemoModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/AdviceDemoModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/AdviceDemoModule.java
index 581ac80..c3bad72 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/AdviceDemoModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/AdviceDemoModule.java
@@ -29,6 +29,7 @@ public class AdviceDemoModule
{
return new Greeter()
{
+ @Override
public String getGreeting()
{
return "Advice is Easy!";
@@ -47,6 +48,7 @@ public class AdviceDemoModule
{
MethodAdvice advice = new MethodAdvice()
{
+ @Override
public void advise(MethodInvocation invocation)
{
invocation.proceed();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/BarneyModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/BarneyModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/BarneyModule.java
index 55ea96b..89e6bc6 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/BarneyModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/BarneyModule.java
@@ -44,6 +44,7 @@ public class BarneyModule {
public void contributeSizer(MappedConfiguration<Class, Sizer> configuration) {
Sizer listSizer = new Sizer() {
+ @Override
public int size(Object object) {
List list = (List) object;
@@ -52,6 +53,7 @@ public class BarneyModule {
};
Sizer mapSizer = new Sizer() {
+ @Override
public int size(Object object) {
Map map = (Map) object;
@@ -67,12 +69,14 @@ public class BarneyModule {
@Contribute(Sizer.class)
public void moreSizerContributions(MappedConfiguration<Class, Sizer> configuration) {
Sizer defaultSizer = new Sizer() {
+ @Override
public int size(Object object) {
return 1;
}
};
Sizer nullSizer = new Sizer() {
+ @Override
public int size(Object object) {
return 0;
}
@@ -91,10 +95,12 @@ public class BarneyModule {
return new DecoratorList() {
private List<String> names = CollectionFactory.newList();
+ @Override
public void add(String name) {
names.add(name);
}
+ @Override
public List<String> getNames() {
return names;
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ContributeByClassModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ContributeByClassModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ContributeByClassModule.java
index a1700a0..3fd3ce5 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ContributeByClassModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ContributeByClassModule.java
@@ -26,6 +26,7 @@ public class ContributeByClassModule
{
return new StringTransformer()
{
+ @Override
public String transform(String input)
{
String current = input;
@@ -59,6 +60,7 @@ public class ContributeByClassModule
{
return new StringTransformer()
{
+ @Override
public String transform(String input)
{
return configuration.get("Default").transform(input);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CountingGreeterImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CountingGreeterImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CountingGreeterImpl.java
index 1df3097..8bd15b0 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CountingGreeterImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CountingGreeterImpl.java
@@ -21,6 +21,7 @@ public class CountingGreeterImpl implements Greeter
IntegrationTestFixture.countingGreeterInstantiationCount++;
}
+ @Override
public String getGreeting()
{
return "Hello";
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CyclicMOPModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CyclicMOPModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CyclicMOPModule.java
index 0a95fd9..775fc75 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CyclicMOPModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CyclicMOPModule.java
@@ -34,6 +34,7 @@ public class CyclicMOPModule
{
return new Runnable()
{
+ @Override
public void run()
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FailInConstructorRunnable.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FailInConstructorRunnable.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FailInConstructorRunnable.java
index 1957999..1e5be21 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FailInConstructorRunnable.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FailInConstructorRunnable.java
@@ -21,6 +21,7 @@ public class FailInConstructorRunnable implements Runnable
throw new RuntimeException("Failure in Runnable constructor.");
}
+ @Override
public void run()
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FieldResourceServiceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FieldResourceServiceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FieldResourceServiceImpl.java
index e9b2936..a60f4fe 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FieldResourceServiceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FieldResourceServiceImpl.java
@@ -29,11 +29,13 @@ public class FieldResourceServiceImpl implements FieldResourceService
@InjectResource
private Collection<String> configuration;
+ @Override
public String getServiceId()
{
return resources.getServiceId();
}
+ @Override
public List<String> getLabels()
{
List<String> result = CollectionFactory.newList(configuration);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FredModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FredModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FredModule.java
index c61301c..7ec3cae 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FredModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FredModule.java
@@ -38,6 +38,7 @@ public class FredModule
{
return new Runnable()
{
+ @Override
public void run()
{
}
@@ -72,6 +73,7 @@ public class FredModule
return new NameListHolder()
{
+ @Override
public List<String> getNames()
{
return sorted;
@@ -84,6 +86,7 @@ public class FredModule
return new NameListHolder()
{
+ @Override
public List<String> getNames()
{
return configuration;
@@ -107,11 +110,13 @@ public class FredModule
{
return new StringLookup()
{
+ @Override
public String lookup(String key)
{
return configuration.get(key);
}
+ @Override
public List<String> keys()
{
return InternalUtils.sortedKeys(configuration);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule.java
index b3605c5..f30df5f 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule.java
@@ -29,6 +29,7 @@ public class GreeterModule
{
return new Greeter()
{
+ @Override
public String getGreeting()
{
return "Hello";
@@ -40,6 +41,7 @@ public class GreeterModule
{
return new Greeter()
{
+ @Override
public String getGreeting()
{
return "Goodbye";
@@ -52,6 +54,7 @@ public class GreeterModule
{
return new Greeter()
{
+ @Override
public String getGreeting()
{
return "Blue";
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule2.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule2.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule2.java
index c226c9c..dc8cb50 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule2.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule2.java
@@ -22,6 +22,7 @@ public class GreeterModule2
{
return new Greeter()
{
+ @Override
public String getGreeting()
{
return "Green";
@@ -34,6 +35,7 @@ public class GreeterModule2
{
return new Greeter()
{
+ @Override
public String getGreeting()
{
return "Blue";
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterServiceOverrideModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterServiceOverrideModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterServiceOverrideModule.java
index 9bbede8..8eca5be 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterServiceOverrideModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterServiceOverrideModule.java
@@ -20,6 +20,7 @@ public class GreeterServiceOverrideModule
{
return new Greeter()
{
+ @Override
public String getGreeting()
{
return "Hello";
@@ -31,6 +32,7 @@ public class GreeterServiceOverrideModule
{
configuration.add(Greeter.class, new Greeter()
{
+ @Override
public String getGreeting()
{
return "Override Greeting";
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InjectionCheckImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InjectionCheckImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InjectionCheckImpl.java
index dec588a..c9f26e8 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InjectionCheckImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InjectionCheckImpl.java
@@ -31,11 +31,13 @@ public class InjectionCheckImpl implements InjectionCheck
this.configuration = configuration;
}
+ @Override
public Logger getLogger()
{
return logger;
}
+ @Override
public Object getValue(String key)
{
return configuration.get(key);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/IntHolderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/IntHolderImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/IntHolderImpl.java
index c6a0274..8c3c9ef 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/IntHolderImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/IntHolderImpl.java
@@ -23,6 +23,7 @@ public class IntHolderImpl implements IntHolder
this.value = value;
}
+ @Override
public int getValue()
{
return value;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InvalidContributeDefModule2.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InvalidContributeDefModule2.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InvalidContributeDefModule2.java
index 0fcb442..eb065d8 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InvalidContributeDefModule2.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InvalidContributeDefModule2.java
@@ -27,6 +27,7 @@ public class InvalidContributeDefModule2
return new NameListHolder()
{
+ @Override
public List<String> getNames()
{
return configuration;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InvalidContributeDefModule3.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InvalidContributeDefModule3.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InvalidContributeDefModule3.java
index 20e0556..9554ca3 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InvalidContributeDefModule3.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InvalidContributeDefModule3.java
@@ -27,6 +27,7 @@ public class InvalidContributeDefModule3
return new Runnable()
{
+ @Override
public void run()
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/LocalModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/LocalModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/LocalModule.java
index 7cc5340..7cab003 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/LocalModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/LocalModule.java
@@ -22,6 +22,7 @@ public class LocalModule
{
return new Greeter()
{
+ @Override
public String getGreeting()
{
return "Hello, y'all!";
@@ -33,10 +34,12 @@ public class LocalModule
{
return new StringHolder()
{
+ @Override
public void setValue(String value)
{
}
+ @Override
public String getValue()
{
return greeter.getGreeting();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/NoImplementationClassForSimpleIdModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/NoImplementationClassForSimpleIdModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/NoImplementationClassForSimpleIdModule.java
index f55bce4..1c5a289 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/NoImplementationClassForSimpleIdModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/NoImplementationClassForSimpleIdModule.java
@@ -20,6 +20,7 @@ public class NoImplementationClassForSimpleIdModule
{
binder.bind(Runnable.class, new ServiceBuilder<Runnable>()
{
+ @Override
public Runnable buildService(ServiceResources resources)
{
return null;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RecursiveConstructorModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RecursiveConstructorModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RecursiveConstructorModule.java
index 5b99bbd..b06a993 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RecursiveConstructorModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RecursiveConstructorModule.java
@@ -32,6 +32,7 @@ public class RecursiveConstructorModule
{
return new Runnable()
{
+ @Override
public void run()
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RedGreeterImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RedGreeterImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RedGreeterImpl.java
index 80d274e..78e5db7 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RedGreeterImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RedGreeterImpl.java
@@ -20,6 +20,7 @@ import org.apache.tapestry5.ioc.annotations.Marker;
public class RedGreeterImpl implements Greeter
{
+ @Override
public String getGreeting()
{
return null;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RegistryBuilderTestModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RegistryBuilderTestModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RegistryBuilderTestModule.java
index 9b8732f..719db46 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RegistryBuilderTestModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RegistryBuilderTestModule.java
@@ -23,6 +23,7 @@ public class RegistryBuilderTestModule
{
return new Square()
{
+ @Override
public long square(long input)
{
return input * input;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RocketImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RocketImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RocketImpl.java
index 9384bc8..3d534e0 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RocketImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RocketImpl.java
@@ -19,6 +19,7 @@ import org.apache.tapestry5.ioc.annotations.PreventServiceDecoration;
@PreventServiceDecoration
public class RocketImpl implements Rocket
{
+ @Override
public String getCountdown()
{
return "3, 2, 1, Launch!";
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceBuilderModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceBuilderModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceBuilderModule.java
index fcb9b48..4e9b78f 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceBuilderModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceBuilderModule.java
@@ -24,10 +24,12 @@ public class ServiceBuilderModule
{
binder.bind(Greeter.class, new ServiceBuilder<Greeter>()
{
+ @Override
public Greeter buildService(ServiceResources resources)
{
return new Greeter()
{
+ @Override
public String getGreeting()
{
return "Greetings from service Greeter.";
@@ -38,6 +40,7 @@ public class ServiceBuilderModule
binder.bind(Greeter.class, new ServiceBuilder<Greeter>()
{
+ @Override
public Greeter buildService(ServiceResources resources)
{
throw new RuntimeException("Failure inside ServiceBuilder callback.");
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceIdGreeter.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceIdGreeter.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceIdGreeter.java
index 4fdc614..aa74783 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceIdGreeter.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceIdGreeter.java
@@ -20,6 +20,7 @@ public class ServiceIdGreeter implements Greeter
{
private String greeting;
+ @Override
public String getGreeting()
{
return greeting;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SpecificDecoratorModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SpecificDecoratorModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SpecificDecoratorModule.java
index 45dfe66..1f5c7f1 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SpecificDecoratorModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SpecificDecoratorModule.java
@@ -20,6 +20,7 @@ public class SpecificDecoratorModule
{
return new Greeter()
{
+ @Override
public String getGreeting()
{
return delegate.getGreeting().toUpperCase();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StaticModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StaticModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StaticModule.java
index 50f3f2a..84b4a91 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StaticModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StaticModule.java
@@ -39,6 +39,7 @@ public class StaticModule {
public static Runnable buildFred() {
return new Runnable() {
+ @Override
public void run() {
setFredRan(true);
}
@@ -47,6 +48,7 @@ public class StaticModule {
public static Runnable buildBarney() {
return new Runnable() {
+ @Override
public void run() {
}
};
@@ -54,6 +56,7 @@ public class StaticModule {
public static Runnable decorateBarney(final Object delegate, String serviseId) {
return new Runnable() {
+ @Override
public void run() {
setDecoratorRan(true);
@@ -88,6 +91,7 @@ public class StaticModule {
public static NameListHolder buildNames(final Collection<String> configuration) {
return new NameListHolder() {
+ @Override
public List<String> getNames() {
List<String> result = CollectionFactory.newList(configuration);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StringHolderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StringHolderImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StringHolderImpl.java
index 495d980..f433ad4 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StringHolderImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StringHolderImpl.java
@@ -24,12 +24,14 @@ public class StringHolderImpl implements StringHolder
{
private String value;
+ @Override
@SimpleAnnotation("StringHolderImpl#getValue()")
public String getValue()
{
return value;
}
+ @Override
public void setValue(String value)
{
this.value = value;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SymbolExpandingTransformer.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SymbolExpandingTransformer.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SymbolExpandingTransformer.java
index 044e3a6..1526274 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SymbolExpandingTransformer.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SymbolExpandingTransformer.java
@@ -22,6 +22,7 @@ public class SymbolExpandingTransformer implements StringTransformer
public SymbolExpandingTransformer(SymbolSource symbolSource) {this.symbolSource = symbolSource;}
+ @Override
public String transform(String input)
{
return symbolSource.expandSymbols(input);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnbuildablePingable.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnbuildablePingable.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnbuildablePingable.java
index a1edc1a..76432c1 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnbuildablePingable.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnbuildablePingable.java
@@ -23,6 +23,7 @@ public class UnbuildablePingable implements Pingable
{
}
+ @Override
public void ping()
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnknownColorGreeterImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnknownColorGreeterImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnknownColorGreeterImpl.java
index 2dfbd8e..3dee8d5 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnknownColorGreeterImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnknownColorGreeterImpl.java
@@ -17,6 +17,7 @@ package org.apache.tapestry5.ioc;
public class UnknownColorGreeterImpl implements Greeter
{
+ @Override
public String getGreeting()
{
return null;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UppercaseStringTransformer.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UppercaseStringTransformer.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UppercaseStringTransformer.java
index 5cab33f..24637e7 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UppercaseStringTransformer.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UppercaseStringTransformer.java
@@ -16,6 +16,7 @@ package org.apache.tapestry5.ioc;
public class UppercaseStringTransformer implements StringTransformer
{
+ @Override
public String transform(String input)
{
return input.toUpperCase();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AdviseByMarkerModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AdviseByMarkerModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AdviseByMarkerModule.java
index 71f6751..e2905ef 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AdviseByMarkerModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AdviseByMarkerModule.java
@@ -56,6 +56,7 @@ public class AdviseByMarkerModule
receiver.adviseAllMethods(new MethodAdvice()
{
+ @Override
public void advise(MethodInvocation invocation)
{
invocation.proceed();
@@ -80,6 +81,7 @@ public class AdviseByMarkerModule
{
return new Greeter()
{
+ @Override
public String getGreeting()
{
return "Red";
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AdviseByMarkerModule2.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AdviseByMarkerModule2.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AdviseByMarkerModule2.java
index 9865f98..f0b5e74 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AdviseByMarkerModule2.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AdviseByMarkerModule2.java
@@ -32,6 +32,7 @@ public class AdviseByMarkerModule2
receiver.adviseAllMethods(new MethodAdvice()
{
+ @Override
public void advise(MethodInvocation invocation)
{
invocation.proceed();
@@ -70,6 +71,7 @@ public class AdviseByMarkerModule2
{
return new Greeter()
{
+ @Override
public String getGreeting()
{
return "Red";
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AlphabetModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AlphabetModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AlphabetModule.java
index c3b89dc..6fffeb1 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AlphabetModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AlphabetModule.java
@@ -32,6 +32,7 @@ public class AlphabetModule
return new NameListHolder()
{
+ @Override
public List<String> getNames()
{
return configuration;
@@ -61,6 +62,7 @@ public class AlphabetModule
{
return new NameListHolder2()
{
+ @Override
public List<String> getNames()
{
return configuration;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AlphabetModule2.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AlphabetModule2.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AlphabetModule2.java
index d3d1d3c..852caca 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AlphabetModule2.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AlphabetModule2.java
@@ -33,6 +33,7 @@ public class AlphabetModule2
return new NameListHolder()
{
+ @Override
public List<String> getNames()
{
return configuration;
@@ -46,6 +47,7 @@ public class AlphabetModule2
return new NameListHolder()
{
+ @Override
public List<String> getNames()
{
return configuration;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AnnotatedServiceInterfaceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AnnotatedServiceInterfaceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AnnotatedServiceInterfaceImpl.java
index ad5ddca..09c549e 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AnnotatedServiceInterfaceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AnnotatedServiceInterfaceImpl.java
@@ -16,6 +16,7 @@ package org.apache.tapestry5.ioc.internal;
public class AnnotatedServiceInterfaceImpl implements AnnotatedServiceInterface {
+ @Override
public String execute(int i) {
return null;
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule.java
index c722e54..3686a29 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule.java
@@ -70,6 +70,7 @@ public class DecorateByMarkerModule
builder.adviseAllMethods(new MethodAdvice()
{
+ @Override
public void advise(MethodInvocation invocation)
{
invocation.proceed();
@@ -89,6 +90,7 @@ public class DecorateByMarkerModule
{
return new Greeter()
{
+ @Override
public String getGreeting()
{
return "Red";
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule2.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule2.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule2.java
index 2335f89..e3d917a 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule2.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule2.java
@@ -63,6 +63,7 @@ public class DecorateByMarkerModule2
builder.adviseAllMethods(new MethodAdvice()
{
+ @Override
public void advise(MethodInvocation invocation)
{
invocation.proceed();
@@ -82,6 +83,7 @@ public class DecorateByMarkerModule2
{
return new Greeter()
{
+ @Override
public String getGreeting()
{
return "Red";
[6/7] Required Java version is now 1.6,
this applies to building as well as to using Tapestry
Posted by jk...@apache.org.
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
[5/7] Required Java version is now 1.6,
this applies to building as well as to using Tapestry
Posted by jk...@apache.org.
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)
[5/7] Required Java version is now 1.6,
this applies to building as well as to using Tapestry
Posted by jk...@apache.org.
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)
[4/7] Required Java version is now 1.6,
this applies to building as well as to using Tapestry
Posted by jk...@apache.org.
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectDecoratorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectDecoratorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectDecoratorImpl.java
index 66b3685..18aa888 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectDecoratorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectDecoratorImpl.java
@@ -36,11 +36,13 @@ public class AspectDecoratorImpl implements AspectDecorator
this.proxyFactory = proxyFactory;
}
+ @Override
public <T> AspectInterceptorBuilder<T> createBuilder(Class<T> serviceInterface, final T delegate, String description)
{
return createBuilder(serviceInterface, delegate, new AnnotationAccessImpl(delegate.getClass()), description);
}
+ @Override
public <T> AspectInterceptorBuilder<T> createBuilder(final Class<T> serviceInterface, final T delegate,
AnnotationAccess annotationAccess, final String description)
{
@@ -55,21 +57,25 @@ public class AspectDecoratorImpl implements AspectDecorator
{
private AspectInterceptorBuilder<T> builder;
+ @Override
public void adviseMethod(Method method, org.apache.tapestry5.plastic.MethodAdvice advice)
{
getBuilder().adviseMethod(method, advice);
}
+ @Override
public void adviseAllMethods(org.apache.tapestry5.plastic.MethodAdvice advice)
{
getBuilder().adviseAllMethods(advice);
}
+ @Override
public Class getInterface()
{
return serviceInterface;
}
+ @Override
public T build()
{
return builder == null ? delegate : builder.build();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectInterceptorBuilderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectInterceptorBuilderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectInterceptorBuilderImpl.java
index e93288d..95fb1f6 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectInterceptorBuilderImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectInterceptorBuilderImpl.java
@@ -67,6 +67,7 @@ public class AspectInterceptorBuilderImpl<T> extends AbtractAspectInterceptorBui
new MethodDescription(delegateTypeName, PlasticProxyFactoryImpl.INTERNAL_GET_DELEGATE);
plasticClass.introduceMethod(getDelegateMethodDescription, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadThis().getField(delegateField);
@@ -75,6 +76,7 @@ public class AspectInterceptorBuilderImpl<T> extends AbtractAspectInterceptorBui
});
}
+ @Override
public void adviseMethod(Method method, org.apache.tapestry5.plastic.MethodAdvice advice)
{
assert method != null;
@@ -87,6 +89,7 @@ public class AspectInterceptorBuilderImpl<T> extends AbtractAspectInterceptorBui
plasticClass.introduceMethod(method).addAdvice(advice);
}
+ @Override
public void adviseAllMethods(org.apache.tapestry5.plastic.MethodAdvice advice)
{
for (Method m : serviceInterface.getMethods())
@@ -95,11 +98,13 @@ public class AspectInterceptorBuilderImpl<T> extends AbtractAspectInterceptorBui
}
}
+ @Override
public Class getInterface()
{
return serviceInterface;
}
+ @Override
public T build()
{
return (T) transformation.createInstantiator().newInstance();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AutobuildObjectProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AutobuildObjectProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AutobuildObjectProvider.java
index 6f0dafd..a36657c 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AutobuildObjectProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AutobuildObjectProvider.java
@@ -25,6 +25,7 @@ import org.apache.tapestry5.ioc.annotations.Autobuild;
*/
public class AutobuildObjectProvider implements ObjectProvider
{
+ @Override
public <T> T provide(Class<T> objectType, AnnotationProvider annotationProvider,
ObjectLocator locator)
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilder.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilder.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilder.java
index 8ff4762..64dc84b 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilder.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilder.java
@@ -72,6 +72,7 @@ public class BridgeBuilder<S, F>
{
instantiator = proxyFactory.createProxy(serviceInterface, new PlasticClassTransformer()
{
+ @Override
public void transform(PlasticClass plasticClass)
{
PlasticField filterField = plasticClass.introduceField(filterInterface, "filter")
@@ -158,6 +159,7 @@ public class BridgeBuilder<S, F>
method.changeImplementation(new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
String message = String.format("Method %s has no match in filter interface %s.", ms, filterInterface.getName());
@@ -174,6 +176,7 @@ public class BridgeBuilder<S, F>
{
method.changeImplementation(new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadThis().getField(filterField);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CachingObjectCreator.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CachingObjectCreator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CachingObjectCreator.java
index 8a0cb22..b89ac09 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CachingObjectCreator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CachingObjectCreator.java
@@ -34,6 +34,7 @@ public class CachingObjectCreator<T> extends LockSupport implements ObjectCreato
this.delegate = delegate;
}
+ @Override
public T createObject()
{
try
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ChainBuilderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ChainBuilderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ChainBuilderImpl.java
index 8d7e9c7..07be24f 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ChainBuilderImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ChainBuilderImpl.java
@@ -40,6 +40,7 @@ public class ChainBuilderImpl implements ChainBuilder
this.proxyFactory = proxyFactory;
}
+ @Override
@SuppressWarnings("unchecked")
public <T> T build(final Class<T> commandInterface, List<T> commands)
{
@@ -51,6 +52,7 @@ public class ChainBuilderImpl implements ChainBuilder
ClassInstantiator<T> instantiator = proxyFactory.createProxy(commandInterface, new PlasticClassTransformer()
{
+ @Override
public void transform(PlasticClass plasticClass)
{
PlasticField commandsField = plasticClass.introduceField(commandsArray.getClass(), "commands").inject(
@@ -72,10 +74,12 @@ public class ChainBuilderImpl implements ChainBuilder
{
plasticClass.introduceMethod(method).changeImplementation(new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadThis().getField(commandsField).iterateArray(new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
// The command is on the stack; add the elements and invoke the method.
@@ -113,11 +117,13 @@ public class ChainBuilderImpl implements ChainBuilder
builder.when(condition, new WhenCallback()
{
+ @Override
public void ifTrue(InstructionBuilder builder)
{
builder.returnResult();
}
+ @Override
public void ifFalse(InstructionBuilder builder)
{
if (wide)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java
index 0168515..19b00ee 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java
@@ -37,6 +37,7 @@ public class ClassNameLocatorImpl implements ClassNameLocator
*/
private final ClasspathMatcher CLASS_NAME_MATCHER = new ClasspathMatcher()
{
+ @Override
public boolean matches(String packagePath, String fileName)
{
if (!CLASS_NAME_PATTERN.matcher(fileName).matches())
@@ -60,6 +61,7 @@ public class ClassNameLocatorImpl implements ClassNameLocator
*/
private final Mapper<String, String> CLASS_NAME_MAPPER = new Mapper<String, String>()
{
+ @Override
public String map(String element)
{
return element.substring(0, element.length() - 6).replace('/', '.');
@@ -75,6 +77,7 @@ public class ClassNameLocatorImpl implements ClassNameLocator
/**
* Synchronization should not be necessary, but perhaps the underlying ClassLoader's are sensitive to threading.
*/
+ @Override
public synchronized Collection<String> locateClassNames(String packageName)
{
String packagePath = packageName.replace('.', '/') + "/";
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java
index a7858cf..9e032e6 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java
@@ -73,6 +73,7 @@ public class ClassPropertyAdapterImpl implements ClassPropertyAdapter
}
}
+ @Override
public Class getBeanType()
{
return beanType;
@@ -86,26 +87,31 @@ public class ClassPropertyAdapterImpl implements ClassPropertyAdapter
return String.format("<ClassPropertyAdaptor %s: %s>", beanType.getName(), names);
}
+ @Override
public List<String> getPropertyNames()
{
return InternalUtils.sortedKeys(adapters);
}
+ @Override
public PropertyAdapter getPropertyAdapter(String name)
{
return adapters.get(name);
}
+ @Override
public Object get(Object instance, String propertyName)
{
return adaptorFor(propertyName).get(instance);
}
+ @Override
public void set(Object instance, String propertyName, Object value)
{
adaptorFor(propertyName).set(instance, value);
}
+ @Override
public Annotation getAnnotation(Object instance, String propertyName, Class<? extends Annotation> annotationClass) {
return adaptorFor(propertyName).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/ClasspathScannerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClasspathScannerImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClasspathScannerImpl.java
index 775bf97..55ac8cb 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClasspathScannerImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClasspathScannerImpl.java
@@ -56,6 +56,7 @@ public class ClasspathScannerImpl implements ClasspathScanner
* @return collection of matching paths, in no specified order
* @throws java.io.IOException
*/
+ @Override
public Set<String> scan(String packagePath, ClasspathMatcher matcher) throws IOException
{
assert packagePath != null && packagePath.endsWith("/");
@@ -205,6 +206,7 @@ public class ClasspathScannerImpl implements ClasspathScanner
{
queue.push(new IOWork()
{
+ @Override
public void run() throws IOException
{
scanDirStream(packagePath, url);
@@ -241,6 +243,7 @@ public class ClasspathScannerImpl implements ClasspathScanner
queue.push(new IOWork()
{
+ @Override
public void run() throws IOException
{
scanDir(nestedPackagePath, file);
@@ -299,6 +302,7 @@ public class ClasspathScannerImpl implements ClasspathScanner
queue.push(new IOWork()
{
+ @Override
public void run() throws IOException
{
scanURL(nestedPackagePath, newURL);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClasspathURLConverterImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClasspathURLConverterImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClasspathURLConverterImpl.java
index a0336fe..9c710fa 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClasspathURLConverterImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClasspathURLConverterImpl.java
@@ -23,6 +23,7 @@ import java.net.URL;
*/
public class ClasspathURLConverterImpl implements ClasspathURLConverter
{
+ @Override
public URL convert(URL url)
{
return url;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CompoundCoercion.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CompoundCoercion.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CompoundCoercion.java
index 071551e..4a5dece 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CompoundCoercion.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CompoundCoercion.java
@@ -35,6 +35,7 @@ public class CompoundCoercion<S, I, T> implements Coercion<S, T>
this.op2 = op2;
}
+ @Override
public T coerce(S input)
{
// Run the input through the first operation (S --> I), then run the result of that through
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/DefaultImplementationBuilderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/DefaultImplementationBuilderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/DefaultImplementationBuilderImpl.java
index 8512128..34c7bf2 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/DefaultImplementationBuilderImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/DefaultImplementationBuilderImpl.java
@@ -36,6 +36,7 @@ public class DefaultImplementationBuilderImpl implements DefaultImplementationBu
this.proxyFactory = proxyFactory;
}
+ @Override
public <S> S createDefaultImplementation(Class<S> serviceInterface)
{
S instance = serviceInterface.cast(cache.get(serviceInterface));
@@ -56,6 +57,7 @@ public class DefaultImplementationBuilderImpl implements DefaultImplementationBu
{
ClassInstantiator instantiator = proxyFactory.createProxy(serviceInterface, new PlasticClassTransformer()
{
+ @Override
public void transform(PlasticClass plasticClass)
{
plasticClass.addToString(String.format("<NoOp %s>", serviceInterface.getName()));
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalysisImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalysisImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalysisImpl.java
index 48a153a..928d3b9 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalysisImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalysisImpl.java
@@ -32,6 +32,7 @@ public class ExceptionAnalysisImpl implements ExceptionAnalysis
this.infos = unmodifiableList(infos);
}
+ @Override
public List<ExceptionInfo> getExceptionInfos()
{
return infos;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalyzerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalyzerImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalyzerImpl.java
index 002d338..a0e1359 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalyzerImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalyzerImpl.java
@@ -49,6 +49,7 @@ public class ExceptionAnalyzerImpl implements ExceptionAnalyzer
.getPropertyNames());
}
+ @Override
public ExceptionAnalysis analyze(Throwable rootException)
{
List<ExceptionInfo> list = CollectionFactory.newList();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionInfoImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionInfoImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionInfoImpl.java
index 51820c3..07b8996 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionInfoImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionInfoImpl.java
@@ -40,26 +40,31 @@ public class ExceptionInfoImpl implements ExceptionInfo
this.stackTrace = unmodifiableList(stackTrace);
}
+ @Override
public String getClassName()
{
return className;
}
+ @Override
public String getMessage()
{
return message;
}
+ @Override
public Object getProperty(String name)
{
return properties.get(name);
}
+ @Override
public List<String> getPropertyNames()
{
return InternalUtils.sortedKeys(properties);
}
+ @Override
public List<StackTraceElement> getStackTrace()
{
return stackTrace;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionTrackerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionTrackerImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionTrackerImpl.java
index 43a1540..9b8f9b8 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionTrackerImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionTrackerImpl.java
@@ -28,6 +28,7 @@ public class ExceptionTrackerImpl implements ExceptionTracker
{
private final Set<Throwable> exceptions = CollectionFactory.newSet();
+ @Override
public boolean exceptionLogged(Throwable exception)
{
boolean result = exceptions.contains(exception);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/JustInTimeObjectCreator.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/JustInTimeObjectCreator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/JustInTimeObjectCreator.java
index c61f450..25eeda6 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/JustInTimeObjectCreator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/JustInTimeObjectCreator.java
@@ -48,6 +48,7 @@ public class JustInTimeObjectCreator<T> implements ObjectCreator<T>, EagerLoadSe
*
* @throws IllegalStateException if the registry has been shutdown
*/
+ @Override
public T createObject()
{
if (object == null)
@@ -79,6 +80,7 @@ public class JustInTimeObjectCreator<T> implements ObjectCreator<T>, EagerLoadSe
/**
* Invokes {@link #createObject()} to force the creation of the underlying service.
*/
+ @Override
public void eagerLoadService()
{
// Force object creation now
@@ -90,10 +92,12 @@ public class JustInTimeObjectCreator<T> implements ObjectCreator<T>, EagerLoadSe
* Invoked when the Registry is shutdown; deletes the instantiated object (if it exists) and replaces
* the ObjectCreator with one that throws an IllegalStateException.
*/
+ @Override
public synchronized void run()
{
creator = new ObjectCreator<T>()
{
+ @Override
public T createObject()
{
throw new IllegalStateException(ServiceMessages.registryShutdown(serviceId));
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LazyAdvisorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LazyAdvisorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LazyAdvisorImpl.java
index 8a84d04..5f4514a 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LazyAdvisorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LazyAdvisorImpl.java
@@ -36,6 +36,7 @@ public class LazyAdvisorImpl implements LazyAdvisor
this.thunkCreator = thunkCreator;
}
+ @Override
public void addLazyMethodInvocationAdvice(MethodAdviceReceiver methodAdviceReceiver)
{
for (Method m : methodAdviceReceiver.getInterface().getMethods())
@@ -58,10 +59,12 @@ public class LazyAdvisorImpl implements LazyAdvisor
* When the method is invoked, we don't immediately proceed. Instead, we return a thunk instance
* that defers its behavior to the lazily invoked invocation.
*/
+ @Override
public void advise(final MethodInvocation invocation)
{
ObjectCreator deferred = new ObjectCreator()
{
+ @Override
public Object createObject()
{
invocation.proceed();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvice.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvice.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvice.java
index f34ae1a..7a068f6 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvice.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvice.java
@@ -28,6 +28,7 @@ public class LoggingAdvice implements MethodAdvice
methodLogger = new MethodLogger(logger, exceptionTracker);
}
+ @Override
public void advise(MethodInvocation invocation)
{
boolean debug = methodLogger.isDebugEnabled();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvisorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvisorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvisorImpl.java
index 5fb6916..5fc0354 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvisorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvisorImpl.java
@@ -31,6 +31,7 @@ public class LoggingAdvisorImpl implements LoggingAdvisor
this.exceptionTracker = exceptionTracker;
}
+ @Override
public void addLoggingAdvice(Logger logger, MethodAdviceReceiver receiver)
{
MethodAdvice advice = new LoggingAdvice(logger, exceptionTracker);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingDecoratorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingDecoratorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingDecoratorImpl.java
index f5cc903..f2f963a 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingDecoratorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingDecoratorImpl.java
@@ -34,6 +34,7 @@ public class LoggingDecoratorImpl implements LoggingDecorator
this.advisor = advisor;
}
+ @Override
public <T> T build(Class<T> serviceInterface, T delegate, String serviceId, final Logger logger)
{
AspectInterceptorBuilder<T> builder = aspectDecorator.createBuilder(serviceInterface, delegate, String.format(
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MapSymbolProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MapSymbolProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MapSymbolProvider.java
index 749f3db..e5de367 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MapSymbolProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MapSymbolProvider.java
@@ -31,6 +31,7 @@ public class MapSymbolProvider implements SymbolProvider
this.configuration = configuration;
}
+ @Override
public String valueForSymbol(String symbolName)
{
return configuration.get(symbolName);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MasterObjectProviderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MasterObjectProviderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MasterObjectProviderImpl.java
index b7fc153..dadf5c8 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MasterObjectProviderImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MasterObjectProviderImpl.java
@@ -38,6 +38,7 @@ public class MasterObjectProviderImpl implements MasterObjectProvider
this.configuration.add(0, new StaticObjectProvider(OperationTracker.class, tracker));
}
+ @Override
public <T> T provide(final Class<T> objectType, final AnnotationProvider annotationProvider,
final ObjectLocator locator,
final boolean required)
@@ -45,6 +46,7 @@ public class MasterObjectProviderImpl implements MasterObjectProvider
return tracker.invoke(String.format("Resolving object of type %s using MasterObjectProvider",
PlasticUtils.toTypeName(objectType)), new Invokable<T>()
{
+ @Override
public T invoke()
{
for (ObjectProvider provider : configuration)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodIterator.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodIterator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodIterator.java
index 5dc4b3a..c67ba75 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodIterator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodIterator.java
@@ -39,6 +39,7 @@ public class MethodIterator
private static final Comparator<MethodSignature> COMPARATOR = new Comparator<MethodSignature>()
{
+ @Override
public int compare(MethodSignature o1, MethodSignature o2)
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/NonParallelExecutor.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/NonParallelExecutor.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/NonParallelExecutor.java
index 7d685b2..4a8d7b8 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/NonParallelExecutor.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/NonParallelExecutor.java
@@ -30,32 +30,38 @@ import java.util.concurrent.TimeoutException;
*/
public class NonParallelExecutor implements ParallelExecutor
{
+ @Override
public <T> Future<T> invoke(Invokable<T> invocable)
{
final T result = invocable.invoke();
return new Future<T>()
{
+ @Override
public boolean cancel(boolean mayInterruptIfRunning)
{
return false;
}
+ @Override
public boolean isCancelled()
{
return false;
}
+ @Override
public boolean isDone()
{
return true;
}
+ @Override
public T get() throws InterruptedException, ExecutionException
{
return result;
}
+ @Override
public T get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException
{
return result;
@@ -63,6 +69,7 @@ public class NonParallelExecutor implements ParallelExecutor
};
}
+ @Override
public <T> T invoke(Class<T> proxyType, Invokable<T> invocable)
{
return invocable.invoke();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/OperationAdvisorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/OperationAdvisorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/OperationAdvisorImpl.java
index 0045ec5..a97f3bf 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/OperationAdvisorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/OperationAdvisorImpl.java
@@ -39,6 +39,7 @@ public class OperationAdvisorImpl implements OperationAdvisor
{
return new Runnable()
{
+ @Override
public void run()
{
invocation.proceed();
@@ -55,6 +56,7 @@ public class OperationAdvisorImpl implements OperationAdvisor
this.description = description;
}
+ @Override
public void advise(MethodInvocation invocation)
{
tracker.run(description, toRunnable(invocation));
@@ -70,6 +72,7 @@ public class OperationAdvisorImpl implements OperationAdvisor
this.format = format;
}
+ @Override
public void advise(MethodInvocation invocation)
{
Object[] parameters = extractParameters(invocation);
@@ -94,6 +97,7 @@ public class OperationAdvisorImpl implements OperationAdvisor
}
}
+ @Override
public void addOperationAdvice(MethodAdviceReceiver receiver)
{
for (Method m : receiver.getInterface().getMethods())
@@ -110,6 +114,7 @@ public class OperationAdvisorImpl implements OperationAdvisor
}
}
+ @Override
public MethodAdvice createAdvice(String description)
{
assert 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/services/ParallelExecutorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ParallelExecutorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ParallelExecutorImpl.java
index 06824fc..206d0fc 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ParallelExecutorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ParallelExecutorImpl.java
@@ -40,6 +40,7 @@ public class ParallelExecutorImpl implements ParallelExecutor
this.perthreadManager = perthreadManager;
}
+ @Override
public <T> Future<T> invoke(Invokable<T> invocable)
{
assert invocable != null;
@@ -51,6 +52,7 @@ public class ParallelExecutorImpl implements ParallelExecutor
{
return new Callable<T>()
{
+ @Override
public T call() throws Exception
{
try
@@ -65,12 +67,14 @@ public class ParallelExecutorImpl implements ParallelExecutor
};
}
+ @Override
public <T> T invoke(Class<T> proxyType, Invokable<T> invocable)
{
final Future<T> future = invoke(invocable);
ObjectCreator<T> creator = new ObjectCreator<T>()
{
+ @Override
public T createObject()
{
try
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceCreator.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceCreator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceCreator.java
index ea0c530..44b0d0f 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceCreator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceCreator.java
@@ -39,6 +39,7 @@ public class PerThreadServiceCreator implements ObjectCreator
* an instance, and later calls will reuse the same per-thread instance. The instance is stored in the
* {@link org.apache.tapestry5.ioc.services.PerthreadManager} and will be released at the end of the request.
*/
+ @Override
public Object createObject()
{
if (perThreadValue.exists())
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceLifecycle.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceLifecycle.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceLifecycle.java
index 5b17ce0..118cb44 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceLifecycle.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceLifecycle.java
@@ -49,11 +49,13 @@ public class PerThreadServiceLifecycle implements ServiceLifecycle
/**
* Returns false; this lifecycle represents a service that will be created many times (by each thread).
*/
+ @Override
public boolean isSingleton()
{
return false;
}
+ @Override
public Object createService(ServiceResources resources, ObjectCreator creator)
{
ObjectCreator perThreadCreator = new PerThreadServiceCreator(perthreadManager, creator);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java
index 382c9a3..1cad0dc 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java
@@ -64,6 +64,7 @@ public class PerthreadManagerImpl implements PerthreadManager
{
hub.addRegistryShutdownListener(new Runnable()
{
+ @Override
public void run()
{
cleanup();
@@ -106,12 +107,14 @@ public class PerthreadManagerImpl implements PerthreadManager
return result;
}
+ @Override
public void addThreadCleanupListener(final ThreadCleanupListener listener)
{
assert listener != null;
addThreadCleanupCallback(new Runnable()
{
+ @Override
public void run()
{
listener.threadDidCleanup();
@@ -119,6 +122,7 @@ public class PerthreadManagerImpl implements PerthreadManager
});
}
+ @Override
public void addThreadCleanupCallback(Runnable callback)
{
assert callback != null;
@@ -130,6 +134,7 @@ public class PerthreadManagerImpl implements PerthreadManager
* Instructs the hub to notify all its listeners (for the current thread).
* It also discards its list of listeners.
*/
+ @Override
public void cleanup()
{
List<Runnable> callbacks = getCallbacks();
@@ -173,11 +178,13 @@ public class PerthreadManagerImpl implements PerthreadManager
{
return new PerThreadValue<T>()
{
+ @Override
public T get()
{
return get(null);
}
+ @Override
public T get(T defaultValue)
{
Map map = getPerthreadMap();
@@ -195,6 +202,7 @@ public class PerthreadManagerImpl implements PerthreadManager
return defaultValue;
}
+ @Override
public T set(T newValue)
{
getPerthreadMap().put(key, newValue == null ? NULL_VALUE : newValue);
@@ -202,6 +210,7 @@ public class PerthreadManagerImpl implements PerthreadManager
return newValue;
}
+ @Override
public boolean exists()
{
return getPerthreadMap().containsKey(key);
@@ -209,11 +218,13 @@ public class PerthreadManagerImpl implements PerthreadManager
};
}
+ @Override
public <T> PerThreadValue<T> createValue()
{
return createValue(uuidGenerator.getAndIncrement());
}
+ @Override
public void run(Runnable runnable)
{
assert runnable != null;
@@ -227,6 +238,7 @@ public class PerthreadManagerImpl implements PerthreadManager
}
}
+ @Override
public <T> T invoke(Invokable<T> invokable)
{
try
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PipelineBuilderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PipelineBuilderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PipelineBuilderImpl.java
index a64815f..562043c 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PipelineBuilderImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PipelineBuilderImpl.java
@@ -38,6 +38,7 @@ public class PipelineBuilderImpl implements PipelineBuilder
this.defaultImplementationBuilder = defaultImplementationBuilder;
}
+ @Override
public <S, F> S build(Logger logger, Class<S> serviceInterface, Class<F> filterInterface, List<F> filters)
{
S terminator = defaultImplementationBuilder.createDefaultImplementation(serviceInterface);
@@ -45,6 +46,7 @@ public class PipelineBuilderImpl implements PipelineBuilder
return build(logger, serviceInterface, filterInterface, filters, terminator);
}
+ @Override
public <S, F> S build(Logger logger, Class<S> serviceInterface, Class<F> filterInterface, List<F> filters,
S terminator)
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticClassListenerLogger.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticClassListenerLogger.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticClassListenerLogger.java
index ac3fccf..8ebdede 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticClassListenerLogger.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticClassListenerLogger.java
@@ -30,6 +30,7 @@ public class PlasticClassListenerLogger implements PlasticClassListener
this.logger = logger;
}
+ @Override
public void classWillLoad(PlasticClassEvent event)
{
if (logger.isDebugEnabled())
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticProxyFactoryImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticProxyFactoryImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticProxyFactoryImpl.java
index a18bfba..112e29d 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticProxyFactoryImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticProxyFactoryImpl.java
@@ -57,37 +57,44 @@ public class PlasticProxyFactoryImpl implements PlasticProxyFactory
}
}
+ @Override
public ClassLoader getClassLoader()
{
return manager.getClassLoader();
}
+ @Override
public <T> ClassInstantiator<T> createProxy(Class<T> interfaceType, Class<? extends T> implementationType, PlasticClassTransformer callback)
{
return manager.createProxy(interfaceType, implementationType, callback);
}
+ @Override
public <T> ClassInstantiator<T> createProxy(Class<T> interfaceType, PlasticClassTransformer callback)
{
return manager.createProxy(interfaceType, callback);
}
+ @Override
public <T> PlasticClassTransformation<T> createProxyTransformation(Class<T> interfaceType,
Class<? extends T> implementationType)
{
return manager.createProxyTransformation(interfaceType, implementationType);
}
+ @Override
public <T> PlasticClassTransformation<T> createProxyTransformation(Class<T> interfaceType)
{
return createProxyTransformation(interfaceType, null);
}
+ @Override
public <T> T createProxy(final Class<T> interfaceType, final ObjectCreator<T> creator, final String description)
{ return createProxy(interfaceType, null, creator, description);
}
+ @Override
public <T> T createProxy(final Class<T> interfaceType, final Class<? extends T> implementationType,
final ObjectCreator<T> creator, final String description)
{
@@ -96,6 +103,7 @@ public class PlasticProxyFactoryImpl implements PlasticProxyFactory
ClassInstantiator<T> instantiator = createProxy(interfaceType, implementationType, new PlasticClassTransformer()
{
+ @Override
public void transform(PlasticClass plasticClass)
{
final PlasticField objectCreatorField = plasticClass.introduceField(ObjectCreator.class, "creator")
@@ -107,6 +115,7 @@ public class PlasticProxyFactoryImpl implements PlasticProxyFactory
final InstructionBuilderCallback returnCreateObject = new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadThis().getField(objectCreatorField);
@@ -142,10 +151,12 @@ public class PlasticProxyFactoryImpl implements PlasticProxyFactory
return bytecode == null ? null : PlasticInternalUtils.convertBytecodeToClassNode(bytecode);
}
+ @Override
public Location getMethodLocation(final Method method)
{
ObjectCreator<String> descriptionCreator = new ObjectCreator<String>()
{
+ @Override
public String createObject()
{
return InternalUtils.asString(method);
@@ -156,10 +167,12 @@ public class PlasticProxyFactoryImpl implements PlasticProxyFactory
descriptionCreator);
}
+ @Override
public Location getConstructorLocation(final Constructor constructor)
{
ObjectCreator<String> descriptionCreator = new ObjectCreator<String>()
{
+ @Override
public String createObject()
{
StringBuilder builder = new StringBuilder(constructor.getDeclaringClass().getName()).append("(");
@@ -183,6 +196,7 @@ public class PlasticProxyFactoryImpl implements PlasticProxyFactory
descriptionCreator);
}
+ @Override
public void clearCache()
{
memberToLocation.clear();
@@ -257,11 +271,13 @@ public class PlasticProxyFactoryImpl implements PlasticProxyFactory
return -1;
}
+ @Override
public void addPlasticClassListener(PlasticClassListener listener)
{
manager.addPlasticClassListener(listener);
}
+ @Override
public void removePlasticClassListener(PlasticClassListener listener)
{
manager.removePlasticClassListener(listener);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java
index 8a4a202..8dd1e02 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java
@@ -35,16 +35,19 @@ public class PropertyAccessImpl implements PropertyAccess
{
private final Map<Class, ClassPropertyAdapter> adapters = CollectionFactory.newConcurrentMap();
+ @Override
public Object get(Object instance, String propertyName)
{
return getAdapter(instance).get(instance, propertyName);
}
+ @Override
public void set(Object instance, String propertyName, Object value)
{
getAdapter(instance).set(instance, propertyName, value);
}
+ @Override
public Annotation getAnnotation(Object instance, String propertyName, Class<? extends Annotation> annotationClass) {
return getAdapter(instance).getAnnotation(instance, propertyName, annotationClass);
}
@@ -53,6 +56,7 @@ public class PropertyAccessImpl implements PropertyAccess
/**
* Clears the cache of adapters and asks the {@link Introspector} to clear its cache.
*/
+ @Override
public synchronized void clearCache()
{
adapters.clear();
@@ -60,11 +64,13 @@ public class PropertyAccessImpl implements PropertyAccess
Introspector.flushCaches();
}
+ @Override
public ClassPropertyAdapter getAdapter(Object instance)
{
return getAdapter(instance.getClass());
}
+ @Override
public ClassPropertyAdapter getAdapter(Class forClass)
{
ClassPropertyAdapter result = adapters.get(forClass);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAdapterImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAdapterImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAdapterImpl.java
index 5845cc6..97685ef 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAdapterImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAdapterImpl.java
@@ -78,31 +78,37 @@ public class PropertyAdapterImpl implements PropertyAdapter
writeMethod = null;
}
+ @Override
public String getName()
{
return name;
}
+ @Override
public Method getReadMethod()
{
return readMethod;
}
+ @Override
public Class getType()
{
return type;
}
+ @Override
public Method getWriteMethod()
{
return writeMethod;
}
+ @Override
public boolean isRead()
{
return field != null || readMethod != null;
}
+ @Override
public boolean isUpdate()
{
return writeMethod != null || (field != null && !isFinal(field));
@@ -113,6 +119,7 @@ public class PropertyAdapterImpl implements PropertyAdapter
return Modifier.isFinal(member.getModifiers());
}
+ @Override
public Object get(Object instance)
{
if (field == null && readMethod == null)
@@ -139,6 +146,7 @@ public class PropertyAdapterImpl implements PropertyAdapter
throw new RuntimeException(ServiceMessages.readFailure(name, instance, fail), fail);
}
+ @Override
public void set(Object instance, Object value)
{
if (field == null && writeMethod == null)
@@ -177,6 +185,7 @@ public class PropertyAdapterImpl implements PropertyAdapter
return instance == null ? "<null>" : instance.getClass().getName();
}
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationClass)
{
return getAnnnotationProvider().getAnnotation(annotationClass);
@@ -226,31 +235,37 @@ public class PropertyAdapterImpl implements PropertyAdapter
return annotationProvider;
}
+ @Override
public boolean isCastRequired()
{
return castRequired;
}
+ @Override
public ClassPropertyAdapter getClassAdapter()
{
return classAdapter;
}
+ @Override
public Class getBeanType()
{
return classAdapter.getBeanType();
}
+ @Override
public boolean isField()
{
return field != null;
}
+ @Override
public Field getField()
{
return field;
}
+ @Override
public Class getDeclaringClass()
{
return declaringClass;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyShadowBuilderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyShadowBuilderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyShadowBuilderImpl.java
index 187f25f..9011b6e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyShadowBuilderImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyShadowBuilderImpl.java
@@ -34,6 +34,7 @@ public class PropertyShadowBuilderImpl implements PropertyShadowBuilder
this.propertyAccess = propertyAccess;
}
+ @Override
public <T> T build(final Object source, final String propertyName, final Class<T> propertyType)
{
final Class sourceClass = source.getClass();
@@ -57,6 +58,7 @@ public class PropertyShadowBuilderImpl implements PropertyShadowBuilder
ClassInstantiator instantiator = proxyFactory.createProxy(propertyType, new PlasticClassTransformer()
{
+ @Override
public void transform(PlasticClass plasticClass)
{
final PlasticField sourceField = plasticClass.introduceField(sourceClass, "source").inject(source);
@@ -69,6 +71,7 @@ public class PropertyShadowBuilderImpl implements PropertyShadowBuilder
delegateMethod.changeImplementation(new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadThis().getField(sourceField);
@@ -78,6 +81,7 @@ public class PropertyShadowBuilderImpl implements PropertyShadowBuilder
builder.dupe().when(Condition.NULL, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.throwException(
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryShutdownHubImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryShutdownHubImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryShutdownHubImpl.java
index 912918e..338976d 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryShutdownHubImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryShutdownHubImpl.java
@@ -40,12 +40,14 @@ public class RegistryShutdownHubImpl implements RegistryShutdownHub
this.logger = logger;
}
+ @Override
public void addRegistryShutdownListener(final RegistryShutdownListener listener)
{
assert listener != null;
addRegistryShutdownListener(new Runnable()
{
+ @Override
public void run()
{
listener.registryDidShutdown();
@@ -53,6 +55,7 @@ public class RegistryShutdownHubImpl implements RegistryShutdownHub
});
}
+ @Override
public void addRegistryShutdownListener(Runnable listener)
{
assert listener != null;
@@ -62,6 +65,7 @@ public class RegistryShutdownHubImpl implements RegistryShutdownHub
listeners.add(listener);
}
+ @Override
public void addRegistryWillShutdownListener(Runnable listener)
{
assert listener != null;
@@ -81,6 +85,7 @@ public class RegistryShutdownHubImpl implements RegistryShutdownHub
F.flow(preListeners).concat(listeners).each(new Worker<Runnable>()
{
+ @Override
public void work(Runnable element)
{
try
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryStartup.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryStartup.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryStartup.java
index 13f0c1a..8988d74 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryStartup.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryStartup.java
@@ -43,6 +43,7 @@ public class RegistryStartup implements Runnable
* Invokes run() on each contributed object. If the object throws a runtime exception, it is logged but startup
* continues anyway. This method may only be {@linkplain OneShotLock invoked once}.
*/
+ @Override
public void run()
{
lock.lock();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ResourceSymbolProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ResourceSymbolProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ResourceSymbolProvider.java
index 0222ab7..cd9c1e6 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ResourceSymbolProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ResourceSymbolProvider.java
@@ -75,6 +75,7 @@ public class ResourceSymbolProvider implements SymbolProvider
}
}
+ @Override
public String valueForSymbol(String symbolName)
{
return properties.get(symbolName);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ServiceOverrideImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ServiceOverrideImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ServiceOverrideImpl.java
index cf29dad..a9d3e9e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ServiceOverrideImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ServiceOverrideImpl.java
@@ -32,10 +32,12 @@ public class ServiceOverrideImpl implements ServiceOverride
this.configuration = configuration;
}
+ @Override
public ObjectProvider getServiceOverrideProvider()
{
return new ObjectProvider()
{
+ @Override
public <T> T provide(Class<T> objectType, AnnotationProvider annotationProvider, ObjectLocator locator)
{
return objectType.cast(configuration.get(objectType));
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StaticObjectProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StaticObjectProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StaticObjectProvider.java
index 0aa0bcf..b8d454c 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StaticObjectProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StaticObjectProvider.java
@@ -39,6 +39,7 @@ public class StaticObjectProvider<S> implements ObjectProvider
}
+ @Override
public <T> T provide(Class<T> objectType, AnnotationProvider annotationProvider, ObjectLocator locator)
{
if (objectType == valueType)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImpl.java
index 5a333f4..e7f65a6 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImpl.java
@@ -39,11 +39,13 @@ public class StrategyBuilderImpl implements StrategyBuilder
this.proxyFactory = proxyFactory;
}
+ @Override
public <S> S build(StrategyRegistry<S> registry)
{
return createProxy(registry.getAdapterType(), registry);
}
+ @Override
public <S> S build(Class<S> adapterType, Map<Class, S> registrations)
{
StrategyRegistry<S> registry = StrategyRegistry.newInstance(adapterType, registrations);
@@ -55,6 +57,7 @@ public class StrategyBuilderImpl implements StrategyBuilder
{
ClassInstantiator instantiator = proxyFactory.createProxy(interfaceType, new PlasticClassTransformer()
{
+ @Override
public void transform(PlasticClass plasticClass)
{
final PlasticField registryField = plasticClass.introduceField(StrategyRegistry.class, "registry")
@@ -64,6 +67,7 @@ public class StrategyBuilderImpl implements StrategyBuilder
{
plasticClass.introduceMethod(new MethodDescription(method), new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
Class returnType = method.getReturnType();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StringLocation.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StringLocation.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StringLocation.java
index 3a94d04..0769b7e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StringLocation.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StringLocation.java
@@ -41,11 +41,13 @@ public final class StringLocation implements Location
/**
* Returns 0.
*/
+ @Override
public int getColumn()
{
return 0;
}
+ @Override
public int getLine()
{
return line;
@@ -54,6 +56,7 @@ public final class StringLocation implements Location
/**
* Returns null; we don't know where the file really is (it's probably a class on the class path).
*/
+ @Override
public Resource getResource()
{
return null;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolObjectProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolObjectProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolObjectProvider.java
index 5c5a847..ceba5b8 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolObjectProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolObjectProvider.java
@@ -40,6 +40,7 @@ public class SymbolObjectProvider implements ObjectProvider
this.typeCoercer = typeCoercer;
}
+ @Override
public <T> T provide(Class<T> objectType, AnnotationProvider annotationProvider, ObjectLocator locator)
{
Symbol annotation = annotationProvider.getAnnotation(Symbol.class);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolSourceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolSourceImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolSourceImpl.java
index c69af03..13830ee 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolSourceImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolSourceImpl.java
@@ -199,11 +199,13 @@ public class SymbolSourceImpl implements SymbolSource
this.providers = providers;
}
+ @Override
public String expandSymbols(String input)
{
return new SymbolExpansion().expandSymbols(input);
}
+ @Override
public String valueForSymbol(String symbolName)
{
String value = cache.get(symbolName);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemEnvSymbolProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemEnvSymbolProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemEnvSymbolProvider.java
index a064538..f2c7bcf 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemEnvSymbolProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemEnvSymbolProvider.java
@@ -29,6 +29,7 @@ public class SystemEnvSymbolProvider implements SymbolProvider
{
private final Map<String, String> symbols = CollectionFactory.newCaseInsensitiveMap();
+ @Override
public synchronized String valueForSymbol(String symbolName)
{
if (symbols.isEmpty())
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemPropertiesSymbolProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemPropertiesSymbolProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemPropertiesSymbolProvider.java
index 023f785..7de1254 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemPropertiesSymbolProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemPropertiesSymbolProvider.java
@@ -22,6 +22,7 @@ import org.apache.tapestry5.ioc.services.SymbolProvider;
*/
public class SystemPropertiesSymbolProvider implements SymbolProvider
{
+ @Override
public String valueForSymbol(String symbolName)
{
return System.getProperty(symbolName);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThreadLocaleImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThreadLocaleImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThreadLocaleImpl.java
index 1c16ae3..3191517 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThreadLocaleImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThreadLocaleImpl.java
@@ -25,11 +25,13 @@ public class ThreadLocaleImpl implements ThreadLocale
{
private Locale locale = Locale.getDefault();
+ @Override
public Locale getLocale()
{
return locale;
}
+ @Override
public void setLocale(Locale locale)
{
assert locale != null;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThunkCreatorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThunkCreatorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThunkCreatorImpl.java
index 24577ce..eafb2cd 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThunkCreatorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThunkCreatorImpl.java
@@ -47,6 +47,7 @@ public class ThunkCreatorImpl implements ThunkCreator
this.proxyFactory = proxyFactory;
}
+ @Override
public <T> T createThunk(Class<T> proxyType, ObjectCreator objectCreator, String description)
{
assert proxyType != null;
@@ -80,6 +81,7 @@ public class ThunkCreatorImpl implements ThunkCreator
{
return proxyFactory.createProxy(interfaceType, new PlasticClassTransformer()
{
+ @Override
public void transform(PlasticClass plasticClass)
{
final PlasticField objectCreatorField = plasticClass.introduceField(ObjectCreator.class, "creator")
@@ -90,6 +92,7 @@ public class ThunkCreatorImpl implements ThunkCreator
delegateMethod.changeImplementation(new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadThis().getField(objectCreatorField);
@@ -110,6 +113,7 @@ public class ThunkCreatorImpl implements ThunkCreator
plasticClass.introduceMethod(PlasticUtils.TO_STRING_DESCRIPTION, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadThis().getField(descriptionField).returnResult();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImpl.java
index 170ca52..46f1c0a 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImpl.java
@@ -101,6 +101,7 @@ public class TypeCoercerImpl extends LockSupport implements TypeCoercer
private static final Coercion NO_COERCION = new Coercion<Object, Object>()
{
+ @Override
public Object coerce(Object input)
{
return input;
@@ -109,6 +110,7 @@ public class TypeCoercerImpl extends LockSupport implements TypeCoercer
private static final Coercion COERCION_NULL_TO_OBJECT = new Coercion<Void, Object>()
{
+ @Override
public Object coerce(Void input)
{
return null;
@@ -131,6 +133,7 @@ public class TypeCoercerImpl extends LockSupport implements TypeCoercer
}
}
+ @Override
@SuppressWarnings("unchecked")
public Object coerce(Object input, Class targetType)
{
@@ -147,6 +150,7 @@ public class TypeCoercerImpl extends LockSupport implements TypeCoercer
return getTargetCoercion(effectiveTargetType).coerce(input);
}
+ @Override
@SuppressWarnings("unchecked")
public <S, T> Coercion<S, T> getCoercion(Class<S> sourceType, Class<T> targetType)
{
@@ -164,6 +168,7 @@ public class TypeCoercerImpl extends LockSupport implements TypeCoercer
return getTargetCoercion(effectiveTargetType).getCoercion(effectiveSourceType);
}
+ @Override
@SuppressWarnings("unchecked")
public <S, T> String explain(Class<S> sourceType, Class<T> targetType)
{
@@ -222,6 +227,7 @@ public class TypeCoercerImpl extends LockSupport implements TypeCoercer
}
}
+ @Override
public void clearCache()
{
try
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/UpdateListenerHubImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/UpdateListenerHubImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/UpdateListenerHubImpl.java
index 9fde2ae..1f33196 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/UpdateListenerHubImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/UpdateListenerHubImpl.java
@@ -28,6 +28,7 @@ public class UpdateListenerHubImpl implements UpdateListenerHub
{
private final List<WeakReference<UpdateListener>> listeners = CollectionFactory.newThreadSafeList();
+ @Override
public void addUpdateListener(UpdateListener listener)
{
assert listener != null;
@@ -37,6 +38,7 @@ public class UpdateListenerHubImpl implements UpdateListenerHub
/**
* Notifies all {@link UpdateListener}s.
*/
+ @Override
public void fireCheckForUpdates()
{
List<WeakReference<UpdateListener>> deadReferences = CollectionFactory.newList();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ValueObjectProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ValueObjectProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ValueObjectProvider.java
index 828c669..4766fcf 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ValueObjectProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ValueObjectProvider.java
@@ -42,6 +42,7 @@ public class ValueObjectProvider implements ObjectProvider
this.typeCoercer = typeCoercer;
}
+ @Override
public <T> T provide(Class<T> objectType, AnnotationProvider annotationProvider, ObjectLocator locator)
{
Value annotation = annotationProvider.getAnnotation(Value.class);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/CronExpression.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/CronExpression.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/CronExpression.java
index 864c61a..e2a3c75 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/CronExpression.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/CronExpression.java
@@ -386,6 +386,7 @@ public class CronExpression implements Serializable
*
* @return a string representation of the <CODE>CronExpression</CODE>
*/
+ @Override
public String toString()
{
return cronExpression;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/PeriodicExecutorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/PeriodicExecutorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/PeriodicExecutorImpl.java
index 0177c56..abfcde9 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/PeriodicExecutorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/PeriodicExecutorImpl.java
@@ -68,6 +68,7 @@ public class PeriodicExecutorImpl implements PeriodicExecutor, Runnable
nextExecution = schedule.firstExecution();
}
+ @Override
public String getName()
{
return name;
@@ -79,16 +80,19 @@ public class PeriodicExecutorImpl implements PeriodicExecutor, Runnable
}
+ @Override
public synchronized boolean isExecuting()
{
return executing;
}
+ @Override
public synchronized boolean isCanceled()
{
return canceled;
}
+ @Override
public synchronized void cancel()
{
canceled = true;
@@ -166,6 +170,7 @@ public class PeriodicExecutorImpl implements PeriodicExecutor, Runnable
}
}
+ @Override
public Void invoke()
{
if (logger.isDebugEnabled())
@@ -196,6 +201,7 @@ public class PeriodicExecutorImpl implements PeriodicExecutor, Runnable
{
hub.addRegistryShutdownListener(new Runnable()
{
+ @Override
public void run()
{
registryDidShutdown();
@@ -217,6 +223,7 @@ public class PeriodicExecutorImpl implements PeriodicExecutor, Runnable
}
+ @Override
public synchronized PeriodicJob addJob(Schedule schedule, String name, Runnable job)
{
assert schedule != null;
@@ -242,6 +249,7 @@ public class PeriodicExecutorImpl implements PeriodicExecutor, Runnable
return periodicJob;
}
+ @Override
public void run()
{
while (!isShutdown())
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/AbstractResource.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/AbstractResource.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/AbstractResource.java
index 7020cb9..f85cf02 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/AbstractResource.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/AbstractResource.java
@@ -64,11 +64,13 @@ public abstract class AbstractResource extends LockSupport implements Resource
this.path = path.startsWith("/") ? path.substring(1) : path;
}
+ @Override
public final String getPath()
{
return path;
}
+ @Override
public final String getFile()
{
return extractFile(path);
@@ -81,6 +83,7 @@ public abstract class AbstractResource extends LockSupport implements Resource
return path.substring(slashx + 1);
}
+ @Override
public final String getFolder()
{
int slashx = path.lastIndexOf('/');
@@ -88,6 +91,7 @@ public abstract class AbstractResource extends LockSupport implements Resource
return (slashx < 0) ? "" : path.substring(0, slashx);
}
+ @Override
public final Resource forFile(String relativePath)
{
assert relativePath != null;
@@ -140,6 +144,7 @@ public abstract class AbstractResource extends LockSupport implements Resource
return createResource(path.toString());
}
+ @Override
public final Resource forLocale(Locale locale)
{
try
@@ -202,6 +207,7 @@ public abstract class AbstractResource extends LockSupport implements Resource
return null;
}
+ @Override
public final Resource withExtension(String extension)
{
assert InternalUtils.isNonBlank(extension);
@@ -228,6 +234,7 @@ public abstract class AbstractResource extends LockSupport implements Resource
/**
* Simple check for whether {@link #toURL()} returns null or not.
*/
+ @Override
public boolean exists()
{
try
@@ -266,6 +273,7 @@ public abstract class AbstractResource extends LockSupport implements Resource
/**
* Obtains the URL for the Resource and opens the stream, wrapped by a BufferedInputStream.
*/
+ @Override
public InputStream openStream() throws IOException
{
URL url = toURL();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ClasspathResource.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ClasspathResource.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ClasspathResource.java
index 84e44f6..c49c88a 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ClasspathResource.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ClasspathResource.java
@@ -50,6 +50,7 @@ public final class ClasspathResource extends AbstractResource
return new ClasspathResource(classLoader, path);
}
+ @Override
public URL toURL()
{
try
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrier.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrier.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrier.java
index fd33d1f..f861e8d 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrier.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrier.java
@@ -105,6 +105,7 @@ public class ConcurrentBarrier
{
Invokable<Void> invokable = new Invokable<Void>()
{
+ @Override
public Void invoke()
{
runnable.run();
@@ -195,6 +196,7 @@ public class ConcurrentBarrier
{
Invokable<Void> invokable = new Invokable<Void>()
{
+ @Override
public Void invoke()
{
runnable.run();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConstructionPlan.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConstructionPlan.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConstructionPlan.java
index 9b702fc..e87ac39 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConstructionPlan.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConstructionPlan.java
@@ -55,6 +55,7 @@ public class ConstructionPlan<T> implements ObjectCreator<T>
return this;
}
+ @Override
public T createObject()
{
T result = tracker.invoke(description, instanceConstructor);
@@ -73,6 +74,7 @@ public class ConstructionPlan<T> implements ObjectCreator<T>
{
tracker.run(plan.getDescription(), new Runnable()
{
+ @Override
public void run()
{
plan.initialize(newInstance);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConstructorInvoker.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConstructorInvoker.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConstructorInvoker.java
index 17bd6da..3eea5ab 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConstructorInvoker.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConstructorInvoker.java
@@ -38,6 +38,7 @@ public class ConstructorInvoker<T> implements Invokable<T>
this.constructorParameters = constructorParameters;
}
+ @Override
public T invoke()
{
Throwable fail;