You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2019/03/02 22:11:26 UTC
[wicket] branch master updated: Remove generics type since it is no
more needed in newer versions of Java
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/master by this push:
new d80fd5c Remove generics type since it is no more needed in newer versions of Java
d80fd5c is described below
commit d80fd5c2d31b61afb54c9c25c549a0c0605c4773
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Sun Mar 3 00:10:44 2019 +0200
Remove generics type since it is no more needed in newer versions of Java
---
.../role/metadata/MetaDataRoleAuthorizationStrategy.java | 4 ++--
.../wicket/bean/validation/BeanValidationConfiguration.java | 2 +-
.../src/main/java/org/apache/wicket/cdi/CdiConfiguration.java | 2 +-
.../main/java/org/apache/wicket/cdi/ConversationPropagator.java | 4 ++--
.../src/main/java/org/apache/wicket/cdi/DetachEventEmitter.java | 2 +-
wicket-core/src/main/java/org/apache/wicket/Component.java | 8 ++++----
wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java | 2 +-
.../apache/wicket/RestartResponseAtInterceptPageException.java | 2 +-
wicket-core/src/main/java/org/apache/wicket/Session.java | 2 +-
.../wicket/core/util/crypt/KeyInSessionSunJceCryptFactory.java | 2 +-
.../src/main/java/org/apache/wicket/feedback/FeedbackDelay.java | 2 +-
.../main/java/org/apache/wicket/feedback/FencedFeedbackPanel.java | 2 +-
.../apache/wicket/markup/head/filter/FilteringHeaderResponse.java | 2 +-
.../main/java/org/apache/wicket/markup/html/debug/PageView.java | 4 ++--
.../org/apache/wicket/markup/html/form/AutoLabelResolver.java | 2 +-
.../org/apache/wicket/markup/html/form/ListMultipleChoice.java | 2 +-
.../org/apache/wicket/markup/parser/AbstractMarkupFilter.java | 2 +-
.../java/org/apache/wicket/page/DefaultPageManagerContext.java | 2 +-
.../org/apache/wicket/protocol/http/AbstractRequestLogger.java | 4 ++--
.../apache/wicket/request/cycle/PageRequestHandlerTracker.java | 4 ++--
.../java/org/apache/wicket/request/resource/AbstractResource.java | 4 ++--
.../wicket/request/resource/caching/IResourceCachingStrategy.java | 2 +-
.../caching/version/RequestCycleCachedResourceVersion.java | 2 +-
.../java/org/apache/wicket/resource/FileSystemJarPathService.java | 2 +-
wicket-core/src/test/java/org/apache/wicket/MetaDataTest.java | 8 ++++----
.../wicket/markup/html/link/BookmarkableThrowsInterceptPage.java | 2 +-
.../main/java/org/apache/wicket/devutils/debugbar/DebugBar.java | 2 +-
.../main/java/org/apache/wicket/examples/tree/FooExpansion.java | 2 +-
.../src/main/java/org/apache/wicket/http2/Http2Settings.java | 2 +-
.../src/main/java/org/apache/wicket/metrics/WicketMetrics.java | 4 ++--
.../main/java/org/apache/wicket/guice/GuiceInjectorHolder.java | 2 +-
.../src/main/java/org/apache/wicket/injection/Injector.java | 2 +-
.../java/org/apache/wicket/protocol/ws/WebSocketSettings.java | 2 +-
.../ws/api/registry/SimpleWebSocketConnectionRegistry.java | 2 +-
.../wicket/spring/injection/annot/SpringComponentInjector.java | 2 +-
.../src/main/asciidoc/requestProcessing/requestProcessing_4.adoc | 2 +-
36 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java
index fecf499..96c2b29 100644
--- a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java
+++ b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java
@@ -57,7 +57,7 @@ public class MetaDataRoleAuthorizationStrategy extends AbstractRoleAuthorization
* Component meta data key for actions/roles information. Typically, you do not need to use this
* meta data key directly, but instead use one of the bind methods of this class.
*/
- public static final MetaDataKey<ActionPermissions> ACTION_PERMISSIONS = new MetaDataKey<ActionPermissions>()
+ public static final MetaDataKey<ActionPermissions> ACTION_PERMISSIONS = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
@@ -66,7 +66,7 @@ public class MetaDataRoleAuthorizationStrategy extends AbstractRoleAuthorization
* Application meta data key for actions/roles information. Typically, you do not need to use
* this meta data key directly, but instead use one of the bind methods of this class.
*/
- public static final MetaDataKey<InstantiationPermissions> INSTANTIATION_PERMISSIONS = new MetaDataKey<InstantiationPermissions>()
+ public static final MetaDataKey<InstantiationPermissions> INSTANTIATION_PERMISSIONS = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
diff --git a/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/BeanValidationConfiguration.java b/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/BeanValidationConfiguration.java
index a36a248..d705a63 100644
--- a/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/BeanValidationConfiguration.java
+++ b/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/BeanValidationConfiguration.java
@@ -23,7 +23,7 @@ import org.apache.wicket.util.lang.Args;
*/
public class BeanValidationConfiguration implements BeanValidationContext
{
- private static final MetaDataKey<BeanValidationConfiguration> KEY = new MetaDataKey<BeanValidationConfiguration>()
+ private static final MetaDataKey<BeanValidationConfiguration> KEY = new MetaDataKey<>()
{
};
diff --git a/wicket-cdi/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java b/wicket-cdi/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java
index 30778aa..196af12 100644
--- a/wicket-cdi/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java
+++ b/wicket-cdi/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java
@@ -30,7 +30,7 @@ import org.apache.wicket.request.cycle.RequestCycleListenerCollection;
*/
public class CdiConfiguration
{
- private static final MetaDataKey<CdiConfiguration> CDI_CONFIGURATION_KEY = new MetaDataKey<CdiConfiguration>()
+ private static final MetaDataKey<CdiConfiguration> CDI_CONFIGURATION_KEY = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
diff --git a/wicket-cdi/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java b/wicket-cdi/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java
index 613f6a5..160d459 100644
--- a/wicket-cdi/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java
+++ b/wicket-cdi/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java
@@ -52,12 +52,12 @@ public class ConversationPropagator implements IRequestCycleListener
{
private static final Logger logger = LoggerFactory.getLogger(ConversationPropagator.class);
- private static final MetaDataKey<Boolean> CONVERSATION_STARTED_KEY = new MetaDataKey<Boolean>()
+ private static final MetaDataKey<Boolean> CONVERSATION_STARTED_KEY = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
- private static final MetaDataKey<String> CONVERSATION_ID_KEY = new MetaDataKey<String>()
+ private static final MetaDataKey<String> CONVERSATION_ID_KEY = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
diff --git a/wicket-cdi/src/main/java/org/apache/wicket/cdi/DetachEventEmitter.java b/wicket-cdi/src/main/java/org/apache/wicket/cdi/DetachEventEmitter.java
index b141236..e983ca3 100644
--- a/wicket-cdi/src/main/java/org/apache/wicket/cdi/DetachEventEmitter.java
+++ b/wicket-cdi/src/main/java/org/apache/wicket/cdi/DetachEventEmitter.java
@@ -36,7 +36,7 @@ public class DetachEventEmitter implements IRequestCycleListener
{
private static final Logger logger = LoggerFactory.getLogger(DetachEventEmitter.class);
- private static final MetaDataKey<Boolean> DETACH_SCHEDULED_KEY = new MetaDataKey<Boolean>()
+ private static final MetaDataKey<Boolean> DETACH_SCHEDULED_KEY = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java
index a0dfb6e..f752e97 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -280,13 +280,13 @@ public abstract class Component
public static final Action RENDER = new Action(Action.RENDER);
/** meta data for user specified markup id */
- private static final MetaDataKey<String> MARKUP_ID_KEY = new MetaDataKey<String>()
+ private static final MetaDataKey<String> MARKUP_ID_KEY = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
/** meta data for user specified markup id */
- private static final MetaDataKey<FeedbackMessages> FEEDBACK_KEY = new MetaDataKey<FeedbackMessages>()
+ private static final MetaDataKey<FeedbackMessages> FEEDBACK_KEY = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
@@ -401,7 +401,7 @@ public abstract class Component
* Meta data key for line precise error logging for the moment of addition. Made package private
* for access in {@link MarkupContainer} and {@link Page}
*/
- static final MetaDataKey<String> ADDED_AT_KEY = new MetaDataKey<String>()
+ static final MetaDataKey<String> ADDED_AT_KEY = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
@@ -410,7 +410,7 @@ public abstract class Component
* meta data key for line precise error logging for the moment of construction. Made package
* private for access in {@link Page}
*/
- static final MetaDataKey<String> CONSTRUCTED_AT_KEY = new MetaDataKey<String>()
+ static final MetaDataKey<String> CONSTRUCTED_AT_KEY = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
diff --git a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
index 329e503..93c13e8 100644
--- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
@@ -129,7 +129,7 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
* This is stored in meta data because it only is necessary when a child is removed, and this
* saves the memory necessary for a field on a widely used class.
*/
- private static final MetaDataKey<LinkedList<RemovedChild>> REMOVALS_KEY = new MetaDataKey<LinkedList<RemovedChild>>()
+ private static final MetaDataKey<LinkedList<RemovedChild>> REMOVALS_KEY = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
diff --git a/wicket-core/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java b/wicket-core/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java
index 0415809..e592f69 100644
--- a/wicket-core/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java
+++ b/wicket-core/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java
@@ -185,7 +185,7 @@ public class RestartResponseAtInterceptPageException extends ResetResponseExcept
}
}
- private static final MetaDataKey<InterceptData> key = new MetaDataKey<InterceptData>()
+ private static final MetaDataKey<InterceptData> key = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
diff --git a/wicket-core/src/main/java/org/apache/wicket/Session.java b/wicket-core/src/main/java/org/apache/wicket/Session.java
index d4a708f..c44c72f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Session.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Session.java
@@ -114,7 +114,7 @@ public abstract class Session implements IClusterable, IEventSink, IMetadataCont
private static final Logger log = LoggerFactory.getLogger(Session.class);
/** records if session has been invalidated by the current request */
- private static final MetaDataKey<Boolean> SESSION_INVALIDATED = new MetaDataKey<Boolean>()
+ private static final MetaDataKey<Boolean> SESSION_INVALIDATED = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/util/crypt/KeyInSessionSunJceCryptFactory.java b/wicket-core/src/main/java/org/apache/wicket/core/util/crypt/KeyInSessionSunJceCryptFactory.java
index eb76cf5..3afb05f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/util/crypt/KeyInSessionSunJceCryptFactory.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/util/crypt/KeyInSessionSunJceCryptFactory.java
@@ -39,7 +39,7 @@ import org.apache.wicket.util.lang.Args;
public class KeyInSessionSunJceCryptFactory implements ICryptFactory
{
/** metadata-key used to store crypto-key in session metadata */
- private static final MetaDataKey<String> KEY = new MetaDataKey<String>()
+ private static final MetaDataKey<String> KEY = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
diff --git a/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackDelay.java b/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackDelay.java
index 8dc43ef..b042b08 100644
--- a/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackDelay.java
+++ b/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackDelay.java
@@ -35,7 +35,7 @@ import org.apache.wicket.request.cycle.RequestCycle;
*/
public class FeedbackDelay implements Serializable, AutoCloseable
{
- private static final MetaDataKey<FeedbackDelay> KEY = new MetaDataKey<FeedbackDelay>()
+ private static final MetaDataKey<FeedbackDelay> KEY = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
diff --git a/wicket-core/src/main/java/org/apache/wicket/feedback/FencedFeedbackPanel.java b/wicket-core/src/main/java/org/apache/wicket/feedback/FencedFeedbackPanel.java
index feac059..dcb3270 100644
--- a/wicket-core/src/main/java/org/apache/wicket/feedback/FencedFeedbackPanel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/feedback/FencedFeedbackPanel.java
@@ -80,7 +80,7 @@ public class FencedFeedbackPanel extends FeedbackPanel
private static final long serialVersionUID = 1L;
- private static final MetaDataKey<Integer> FENCE_KEY = new MetaDataKey<Integer>()
+ private static final MetaDataKey<Integer> FENCE_KEY = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java
index 4b27c02..bb8b1b3 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java
@@ -92,7 +92,7 @@ public class FilteringHeaderResponse extends DecoratingHeaderResponse
* we store this FilteringHeaderResponse in the RequestCycle so that the containers can access
* it to render their bucket of stuff
*/
- private static final MetaDataKey<FilteringHeaderResponse> RESPONSE_KEY = new MetaDataKey<FilteringHeaderResponse>()
+ private static final MetaDataKey<FilteringHeaderResponse> RESPONSE_KEY = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/debug/PageView.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/debug/PageView.java
index 054f406..8df984d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/debug/PageView.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/debug/PageView.java
@@ -59,7 +59,7 @@ public final class PageView extends Panel
* A meta data key used by RenderPerformaceListener in wicket-devutils to collect the time
* needed by a component to render itself
*/
- public static final MetaDataKey<Long> RENDER_KEY = new MetaDataKey<Long>()
+ public static final MetaDataKey<Long> RENDER_KEY = new MetaDataKey<>()
{
};
@@ -225,4 +225,4 @@ public final class PageView extends Panel
return data;
}
-}
\ No newline at end of file
+}
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelResolver.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelResolver.java
index e3e400e..221082e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelResolver.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelResolver.java
@@ -191,7 +191,7 @@ public class AutoLabelResolver implements IComponentResolver
return component.getMarkupId() + "-w-lbl";
}
- public static final MetaDataKey<AutoLabelMarker> MARKER_KEY = new MetaDataKey<AutoLabelMarker>()
+ public static final MetaDataKey<AutoLabelMarker> MARKER_KEY = new MetaDataKey<>()
{
};
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java
index 2afd195..9c60c79 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java
@@ -46,7 +46,7 @@ public class ListMultipleChoice<T> extends AbstractChoice<Collection<T>, T>
private static final long serialVersionUID = 1L;
/** Meta key for the retain disabled flag */
- static MetaDataKey<Boolean> RETAIN_DISABLED_META_KEY = new MetaDataKey<Boolean>()
+ static MetaDataKey<Boolean> RETAIN_DISABLED_META_KEY = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/AbstractMarkupFilter.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/AbstractMarkupFilter.java
index 981614c..8852e41 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/AbstractMarkupFilter.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/AbstractMarkupFilter.java
@@ -54,7 +54,7 @@ public abstract class AbstractMarkupFilter implements IMarkupFilter
* meaning that each container has its own counter.
* The counters are used by {@link #getRequestUniqueId()} to get unique ids for markup tags.
* **/
- protected final static MetaDataKey<Map<String, AtomicInteger>> REQUEST_COUNTER_KEY = new MetaDataKey<Map<String, AtomicInteger>>()
+ protected final static MetaDataKey<Map<String, AtomicInteger>> REQUEST_COUNTER_KEY = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
diff --git a/wicket-core/src/main/java/org/apache/wicket/page/DefaultPageManagerContext.java b/wicket-core/src/main/java/org/apache/wicket/page/DefaultPageManagerContext.java
index 78f4b49..8607cfc 100644
--- a/wicket-core/src/main/java/org/apache/wicket/page/DefaultPageManagerContext.java
+++ b/wicket-core/src/main/java/org/apache/wicket/page/DefaultPageManagerContext.java
@@ -29,7 +29,7 @@ import org.apache.wicket.request.cycle.RequestCycle;
*/
public class DefaultPageManagerContext implements IPageManagerContext
{
- private static final MetaDataKey<Object> requestCycleMetaDataKey = new MetaDataKey<Object>()
+ private static final MetaDataKey<Object> requestCycleMetaDataKey = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/AbstractRequestLogger.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/AbstractRequestLogger.java
index 43150c6..dda4147 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/AbstractRequestLogger.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/AbstractRequestLogger.java
@@ -56,7 +56,7 @@ public abstract class AbstractRequestLogger implements IRequestLogger
/**
* Key for storing request data in the request cycle's meta data.
*/
- private static MetaDataKey<RequestData> REQUEST_DATA = new MetaDataKey<RequestData>()
+ private static MetaDataKey<RequestData> REQUEST_DATA = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
@@ -64,7 +64,7 @@ public abstract class AbstractRequestLogger implements IRequestLogger
/**
* Key for storing session data in the request cycle's meta data.
*/
- private static MetaDataKey<SessionData> SESSION_DATA = new MetaDataKey<SessionData>()
+ private static MetaDataKey<SessionData> SESSION_DATA = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/cycle/PageRequestHandlerTracker.java b/wicket-core/src/main/java/org/apache/wicket/request/cycle/PageRequestHandlerTracker.java
index 90fb984..836c97c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/cycle/PageRequestHandlerTracker.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/cycle/PageRequestHandlerTracker.java
@@ -43,12 +43,12 @@ public class PageRequestHandlerTracker implements IRequestCycleListener
/**
* The key for the first handler
*/
- public static final MetaDataKey<IPageRequestHandler> FIRST_HANDLER_KEY = new MetaDataKey<IPageRequestHandler>() {};
+ public static final MetaDataKey<IPageRequestHandler> FIRST_HANDLER_KEY = new MetaDataKey<>() {};
/**
* The key for the last handler
*/
- public static final MetaDataKey<IPageRequestHandler> LAST_HANDLER_KEY = new MetaDataKey<IPageRequestHandler>() {};
+ public static final MetaDataKey<IPageRequestHandler> LAST_HANDLER_KEY = new MetaDataKey<>() {};
@Override
public void onRequestHandlerResolved(RequestCycle cycle, IRequestHandler handler)
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
index 1fbb2ec..7957c90 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
@@ -57,13 +57,13 @@ public abstract class AbstractResource implements IResource
public static final Set<String> INTERNAL_HEADERS;
/** The meta data key of the content range start byte **/
- public static final MetaDataKey<Long> CONTENT_RANGE_STARTBYTE = new MetaDataKey<Long>()
+ public static final MetaDataKey<Long> CONTENT_RANGE_STARTBYTE = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
/** The meta data key of the content range end byte **/
- public static final MetaDataKey<Long> CONTENT_RANGE_ENDBYTE = new MetaDataKey<Long>()
+ public static final MetaDataKey<Long> CONTENT_RANGE_ENDBYTE = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/IResourceCachingStrategy.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/IResourceCachingStrategy.java
index ed5459f..c11d258 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/IResourceCachingStrategy.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/IResourceCachingStrategy.java
@@ -37,7 +37,7 @@ public interface IResourceCachingStrategy
* A key used to store the extracted resource's version in
* {@linkplain #undecorateUrl(ResourceUrl)} into the request cycle
*/
- MetaDataKey<String> URL_VERSION = new MetaDataKey<String>()
+ MetaDataKey<String> URL_VERSION = new MetaDataKey<>()
{
};
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/RequestCycleCachedResourceVersion.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/RequestCycleCachedResourceVersion.java
index e726858..739782b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/RequestCycleCachedResourceVersion.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/RequestCycleCachedResourceVersion.java
@@ -38,7 +38,7 @@ import org.apache.wicket.util.lang.Generics;
public class RequestCycleCachedResourceVersion implements IResourceVersion
{
private static final MetaDataKey<Map<Serializable, String>> CACHE_KEY =
- new MetaDataKey<Map<Serializable, String>>()
+ new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemJarPathService.java b/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemJarPathService.java
index 87600f4..38be6e2 100644
--- a/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemJarPathService.java
+++ b/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemJarPathService.java
@@ -39,7 +39,7 @@ public class FileSystemJarPathService implements FileSystemPathService
{
/** The key for the file system meta data **/
- public static final MetaDataKey<Map<String, FileSystem>> FILE_SYSTEM_META_DATA_KEY = new MetaDataKey<Map<String, FileSystem>>()
+ public static final MetaDataKey<Map<String, FileSystem>> FILE_SYSTEM_META_DATA_KEY = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
diff --git a/wicket-core/src/test/java/org/apache/wicket/MetaDataTest.java b/wicket-core/src/test/java/org/apache/wicket/MetaDataTest.java
index babee8f..db6467e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/MetaDataTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/MetaDataTest.java
@@ -27,22 +27,22 @@ import org.junit.jupiter.api.Test;
*/
class MetaDataTest
{
- private static final MetaDataKey<String> KEY1 = new MetaDataKey<String>()
+ private static final MetaDataKey<String> KEY1 = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
- private static final MetaDataKey<String> KEY2 = new MetaDataKey<String>()
+ private static final MetaDataKey<String> KEY2 = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
- private static final MetaDataKey<String> KEY3 = new MetaDataKey<String>()
+ private static final MetaDataKey<String> KEY3 = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
- private static final MetaDataKey<String> KEY4 = new MetaDataKey<String>()
+ private static final MetaDataKey<String> KEY4 = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkableThrowsInterceptPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkableThrowsInterceptPage.java
index 31e3f4a..a6bdcc2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkableThrowsInterceptPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkableThrowsInterceptPage.java
@@ -31,7 +31,7 @@ public class BookmarkableThrowsInterceptPage extends WebPage
/**
*
*/
- public static final MetaDataKey<Boolean> SECURITY = new MetaDataKey<Boolean>()
+ public static final MetaDataKey<Boolean> SECURITY = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java
index 41c14f3..c1f6a69 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java
@@ -68,7 +68,7 @@ public class DebugBar extends DevUtilsPanel
{
private static final long serialVersionUID = 1L;
- private static final MetaDataKey<List<IDebugBarContributor>> CONTRIBS_META_KEY = new MetaDataKey<List<IDebugBarContributor>>()
+ private static final MetaDataKey<List<IDebugBarContributor>> CONTRIBS_META_KEY = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/FooExpansion.java b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/FooExpansion.java
index 09ee939..db85f94 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/FooExpansion.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/FooExpansion.java
@@ -39,7 +39,7 @@ public class FooExpansion implements Set<Foo>, Serializable
{
private static final long serialVersionUID = 1L;
- private static MetaDataKey<FooExpansion> KEY = new MetaDataKey<FooExpansion>()
+ private static MetaDataKey<FooExpansion> KEY = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
diff --git a/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/Http2Settings.java b/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/Http2Settings.java
index 08ba298..dc4ff64 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/Http2Settings.java
+++ b/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/Http2Settings.java
@@ -32,7 +32,7 @@ public class Http2Settings
/**
* The meta data key of the http2 settings
*/
- private static final MetaDataKey<Http2Settings> KEY = new MetaDataKey<Http2Settings>()
+ private static final MetaDataKey<Http2Settings> KEY = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
diff --git a/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/WicketMetrics.java b/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/WicketMetrics.java
index 3a01dab..3cd2b2b 100644
--- a/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/WicketMetrics.java
+++ b/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/WicketMetrics.java
@@ -42,13 +42,13 @@ public class WicketMetrics
private static final String APPLICATION_ERROR = "The application couldn't be resolved, please ensure to apply \"<aspect name=\"org.apache.wicket.metrics.aspects.WicketFilterInitAspect\" />\" to your aspects";
/** The key for metrics registry **/
- public static final MetaDataKey<MetricRegistry> METRIC_REGISTRY = new MetaDataKey<MetricRegistry>()
+ public static final MetaDataKey<MetricRegistry> METRIC_REGISTRY = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
/** The key for metrics registry **/
- public static final MetaDataKey<WicketMetricsSettings> METRIC_SETTINGS = new MetaDataKey<WicketMetricsSettings>()
+ public static final MetaDataKey<WicketMetricsSettings> METRIC_SETTINGS = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
diff --git a/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceInjectorHolder.java b/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceInjectorHolder.java
index a7c3873..c91b6b1 100644
--- a/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceInjectorHolder.java
+++ b/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceInjectorHolder.java
@@ -34,7 +34,7 @@ public class GuiceInjectorHolder implements IClusterable
/**
* Metadata key used to store Injector holder in application's metadata
*/
- public static final MetaDataKey<GuiceInjectorHolder> INJECTOR_KEY = new MetaDataKey<GuiceInjectorHolder>()
+ public static final MetaDataKey<GuiceInjectorHolder> INJECTOR_KEY = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
diff --git a/wicket-ioc/src/main/java/org/apache/wicket/injection/Injector.java b/wicket-ioc/src/main/java/org/apache/wicket/injection/Injector.java
index 3787b35..950994a 100644
--- a/wicket-ioc/src/main/java/org/apache/wicket/injection/Injector.java
+++ b/wicket-ioc/src/main/java/org/apache/wicket/injection/Injector.java
@@ -34,7 +34,7 @@ import org.apache.wicket.util.collections.ClassMetaCache;
*/
public abstract class Injector
{
- private static final MetaDataKey<Injector> KEY = new MetaDataKey<Injector>()
+ private static final MetaDataKey<Injector> KEY = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
};
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/WebSocketSettings.java b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/WebSocketSettings.java
index d3ae9d1..0a30d01 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/WebSocketSettings.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/WebSocketSettings.java
@@ -52,7 +52,7 @@ public class WebSocketSettings
private static final Logger LOG = LoggerFactory.getLogger(WebSocketSettings.class);
- private static final MetaDataKey<WebSocketSettings> KEY = new MetaDataKey<WebSocketSettings>()
+ private static final MetaDataKey<WebSocketSettings> KEY = new MetaDataKey<>()
{
};
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/registry/SimpleWebSocketConnectionRegistry.java b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/registry/SimpleWebSocketConnectionRegistry.java
index d21676c..b5005aa 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/registry/SimpleWebSocketConnectionRegistry.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/registry/SimpleWebSocketConnectionRegistry.java
@@ -36,7 +36,7 @@ import org.apache.wicket.util.lang.Generics;
public class SimpleWebSocketConnectionRegistry implements IWebSocketConnectionRegistry
{
private static final MetaDataKey<ConcurrentMap<String, ConcurrentMap<IKey, IWebSocketConnection>>> KEY =
- new MetaDataKey<ConcurrentMap<String, ConcurrentMap<IKey, IWebSocketConnection>>>()
+ new MetaDataKey<>()
{
};
diff --git a/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java b/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java
index eb722d4..7cfad53 100644
--- a/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java
+++ b/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java
@@ -60,7 +60,7 @@ public class SpringComponentInjector extends Injector
/**
* Metadata key used to store application context in application's metadata
*/
- private static MetaDataKey<ApplicationContext> CONTEXT_KEY = new MetaDataKey<ApplicationContext>()
+ private static MetaDataKey<ApplicationContext> CONTEXT_KEY = new MetaDataKey<>()
{
private static final long serialVersionUID = 1L;
diff --git a/wicket-user-guide/src/main/asciidoc/requestProcessing/requestProcessing_4.adoc b/wicket-user-guide/src/main/asciidoc/requestProcessing/requestProcessing_4.adoc
index 49ce686..e5ede08 100644
--- a/wicket-user-guide/src/main/asciidoc/requestProcessing/requestProcessing_4.adoc
+++ b/wicket-user-guide/src/main/asciidoc/requestProcessing/requestProcessing_4.adoc
@@ -133,7 +133,7 @@ public static MetaDataApp extends WebApplication{
/**
* Metadata key definition
*/
- public static MetaDataKey<Connection> connectionKey = new MetaDataKey<Connection> (){};
+ public static MetaDataKey<Connection> connectionKey = new MetaDataKey<> (){};
/**
* Application's initialization