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 2021/06/24 21:11:44 UTC
[wicket] branch master updated: WICKET-6897 Javadoc build fails on
fresh checkout of master or rel/wicket-9.3.0
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 c8974ee WICKET-6897 Javadoc build fails on fresh checkout of master or rel/wicket-9.3.0
c8974ee is described below
commit c8974ee132d4ba1cf1f4651fcc89b0a61bdaae63
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Fri Jun 25 00:08:28 2021 +0300
WICKET-6897 Javadoc build fails on fresh checkout of master or rel/wicket-9.3.0
Use different configuration for maven-javadoc-plugin for JDK 11/12 and 13+. 13+ has no -no-module-directories option
Fix javadoc errors/warnings.
Remove useless javadoc
With this the javadoc build for JDK 11 & 16 seems to be fixed - there are no errors. JDK 17+ still has some problem
(cherry picked from commit 0559ec5ea858e1db4e87ea2859a0eb648703959e)
---
pom.xml | 103 +++++++++++-----
.../java/org/apache/wicket/MarkupContainer.java | 2 +-
.../ajax/AjaxNewWindowNotifyingBehavior.java | 2 +-
.../wicket/ajax/attributes/AjaxCallListener.java | 2 +-
.../AjaxFormChoiceComponentUpdatingBehavior.java | 2 +-
.../navigation/paging/AjaxPagingNavigator.java | 4 +-
.../wicket/core/util/crypt/AbstractJceCrypt.java | 4 +-
.../apache/wicket/markup/html/border/Border.java | 4 +-
.../wicket/markup/html/border/BorderBehavior.java | 4 +-
.../markup/html/form/AbstractCheckSelector.java | 2 +-
.../markup/html/form/AbstractSubmitLink.java | 5 +-
.../wicket/markup/html/form/AutoLabelResolver.java | 2 +-
.../markup/html/form/AutoLabelTextResolver.java | 2 +-
.../wicket/markup/html/form/CheckBoxSelector.java | 2 +-
.../apache/wicket/markup/html/form/CheckGroup.java | 14 ++-
.../html/form/CheckboxMultipleChoiceSelector.java | 2 +-
.../wicket/markup/resolver/AutoLinkResolver.java | 4 +-
.../protocol/http/AbstractRequestLogger.java | 2 +-
.../protocol/http/AjaxEnclosureListener.java | 2 +-
.../wicket/request/resource/AbstractResource.java | 8 +-
.../markup/html/form/AutoLabelWithContentTest.java | 2 +-
.../html/form/CheckBoxMultipleChoiceTest.java | 2 +-
wicket-examples/pom.xml | 4 -
.../request/flow/RedirectToUrlException.java | 7 +-
wicket-user-guide/pom.xml | 4 -
.../org/apache/wicket/util/string/StringValue.java | 4 +-
.../wicket/util/value/CopyOnWriteValueMap.java | 137 ---------------------
.../org/apache/wicket/util/value/ValueMap.java | 111 -----------------
28 files changed, 112 insertions(+), 331 deletions(-)
diff --git a/pom.xml b/pom.xml
index bfbee5a..a3a2e5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -999,30 +999,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${maven-javadoc-plugin.version}</version>
- <configuration>
- <minmemory>128m</minmemory>
- <maxmemory>256m</maxmemory>
- <quiet>true</quiet>
- <links>
- <link>https://docs.oracle.com/en/java/javase/11/docs/api/</link>
- </links>
- <failOnError>false</failOnError>
- <doclint>none</doclint>
- <additionalJOption>--no-module-directories</additionalJOption>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>${maven-release-plugin.version}</version>
<inherited>true</inherited>
@@ -1260,14 +1236,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <additionalJOption>--no-module-directories</additionalJOption>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
</plugin>
</plugins>
@@ -1580,6 +1548,77 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>on-java-12-</id>
+ <activation>
+ <jdk>[11,12]</jdk>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven-javadoc-plugin.version}</version>
+ <configuration>
+ <minmemory>128m</minmemory>
+ <maxmemory>256m</maxmemory>
+ <quiet>true</quiet>
+ <links>
+ <link>https://docs.oracle.com/en/java/javase/11/docs/api/</link>
+ </links>
+ <failOnError>false</failOnError>
+ <doclint>none</doclint>
+ <additionalJOption>--no-module-directories</additionalJOption>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ <profile>
+ <id>on-java-13+</id>
+ <activation>
+ <jdk>[13,)</jdk>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven-javadoc-plugin.version}</version>
+ <configuration>
+ <minmemory>128m</minmemory>
+ <maxmemory>256m</maxmemory>
+ <quiet>true</quiet>
+ <links>
+ <link>https://docs.oracle.com/en/java/javase/16/docs/api/</link>
+ </links>
+ <failOnError>false</failOnError>
+ <doclint>none</doclint>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
</profiles>
<reporting>
<plugins>
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 3cb4ce9..e095319 100644
--- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
@@ -2128,7 +2128,7 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
/**
* Adds a dequeued component to this container. This method should rarely be overridden because
* the common case of simply forwarding the component to
- * {@link MarkupContainer#add(Component...))} method should cover most cases. Components that
+ * {@link MarkupContainer#add(Component...)} method should cover most cases. Components that
* implement a custom hierarchy, such as borders, may wish to override it to support edge-case
* non-standard behavior.
*
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxNewWindowNotifyingBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxNewWindowNotifyingBehavior.java
index 4f8cb06..06497ec 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxNewWindowNotifyingBehavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxNewWindowNotifyingBehavior.java
@@ -52,7 +52,7 @@ public class AjaxNewWindowNotifyingBehavior extends AbstractDefaultAjaxBehavior
/**
* Returns the window's name.
*
- * @return name of {@value null} if not yet bound to a window
+ * @return name of {@code null} if not yet bound to a window
*/
public String getWindowName()
{
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/AjaxCallListener.java b/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/AjaxCallListener.java
index ac7d739..6c44322 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/AjaxCallListener.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/AjaxCallListener.java
@@ -63,7 +63,7 @@ public class AjaxCallListener implements IAjaxCallListener, IComponentAwareHeade
* Sets the JavaScript code that will be returned by {@link #getDoneHandler(Component)}.
* If this code was already set, the new one will be appended to the existing one.
*
- * @param init
+ * @param done
* the JavaScript code for the corresponding handler
* @return This
*/
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
index f646b7b..522c703 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
@@ -35,7 +35,7 @@ import org.danekja.java.util.function.serializable.SerializableConsumer;
* <p>
* Use the normal {@link AjaxFormComponentUpdatingBehavior} for the normal single component fields.
* <p>
- * Notification is triggered by a {@value change} JavaScript event - if needed {@link #getEvent()} can be overridden
+ * Notification is triggered by a {@code change} JavaScript event - if needed {@link #getEvent()} can be overridden
* to deviate from this default.
*
* @author jcompagner
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigator.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigator.java
index a8b3a55..c1ed544 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigator.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigator.java
@@ -135,7 +135,7 @@ public class AjaxPagingNavigator extends PagingNavigator
* @param target
* the request target to add the components that need to be updated in the ajax
* event.
- * @see Component#getOutputMarkupId(boolean)
+ * @see Component#getOutputMarkupId()
*/
protected void onAjaxEvent(AjaxRequestTarget target)
{
@@ -158,4 +158,4 @@ public class AjaxPagingNavigator extends PagingNavigator
target.add(this);
}
}
-}
\ No newline at end of file
+}
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/util/crypt/AbstractJceCrypt.java b/wicket-core/src/main/java/org/apache/wicket/core/util/crypt/AbstractJceCrypt.java
index 1f8ca90..fd1f630 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/util/crypt/AbstractJceCrypt.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/util/crypt/AbstractJceCrypt.java
@@ -85,7 +85,7 @@ public abstract class AbstractJceCrypt implements ICrypt
/**
* Encrypts the given text into a byte array.
*
- * @param plainText
+ * @param plainBytes
* text to encrypt
* @return the string encrypted
* @throws GeneralSecurityException
@@ -94,7 +94,7 @@ public abstract class AbstractJceCrypt implements ICrypt
@Override
- final public void setKey(String key)
+ public final void setKey(String key)
{
throw new UnsupportedOperationException("This method has been deprecated in ICrypt and will be removed.");
}
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java
index 7edf2d8..cc4cb93 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java
@@ -117,7 +117,7 @@ import org.apache.wicket.util.lang.Args;
* <html>
* <body>
* <span wicket:id = "myBorder">
- * <input wicket:id="name"/;>
+ * <input wicket:id="name"/>
* </span>
* </body>
* </html>
@@ -128,7 +128,7 @@ import org.apache.wicket.util.lang.Args;
* or its Body as well.
* <p/>
*
- * Other methods like {@link #remove()}, {@link #get(int)}, {@link #iterator()}, etc. are not
+ * Other methods like {@link #remove()}, {@link #get(String)}, {@link #iterator()}, etc. are not
* aliased to work on the border's body and attention must be paid when they need to be used.
*
* @see BorderPanel An alternative implementation based on Panel
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/border/BorderBehavior.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/border/BorderBehavior.java
index 9459918..c899611 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/border/BorderBehavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/border/BorderBehavior.java
@@ -38,8 +38,8 @@ import org.apache.wicket.util.resource.IResourceStream;
/**
* This is a behavior implementation that can be used if you have markup that should be around a
- * component. It works just like {@link Border} so you have to have a <wicket:border>HTML
- * before<wicket:body/>HTML after</wicket:border> in the html of your subclass. But different than
+ * component. It works just like {@link Border} so you have to have a <wicket:border>HTML
+ * before <wicket:body/> HTML after </wicket:border> in the html of your subclass. But different than
* Border you can not add components to the Border markup, only to the BorderBody.
*
* @author jcompagner
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractCheckSelector.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractCheckSelector.java
index 049d49e..d440d5c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractCheckSelector.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractCheckSelector.java
@@ -38,7 +38,7 @@ import org.apache.wicket.request.resource.ResourceReference;
* @see CheckGroupSelector
* @see CheckBoxSelector
*
- * @author Carl-Eric Menzel <cm...@wicketbuch.de>
+ * @author Carl-Eric Menzel
*/
public abstract class AbstractCheckSelector extends LabeledWebMarkupContainer
implements
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractSubmitLink.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractSubmitLink.java
index bc100d6..d100bbf 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractSubmitLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractSubmitLink.java
@@ -27,9 +27,6 @@ import org.apache.wicket.model.IModel;
*/
public abstract class AbstractSubmitLink extends AbstractLink implements IFormSubmittingComponent
{
- /**
- *
- */
private static final long serialVersionUID = 1L;
/**
@@ -95,7 +92,7 @@ public abstract class AbstractSubmitLink extends AbstractLink implements IFormSu
* onSubmit method of the parent form is not called. A common use for this is to create a cancel
* button.
*
- * TODO: This is a copy & paste from Button
+ * TODO: This is a copy and paste from Button
*
* @param defaultFormProcessing
* defaultFormProcessing
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 4ca498a..c39addd 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
@@ -63,7 +63,7 @@ import org.slf4j.LoggerFactory;
* </p>
*
* @author igor
- * @author Carl-Eric Menzel <cm...@wicketbuch.de>
+ * @author Carl-Eric Menzel
*/
public class AutoLabelResolver implements IComponentResolver
{
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelTextResolver.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelTextResolver.java
index bf48aaa..22384bc 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelTextResolver.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelTextResolver.java
@@ -94,7 +94,7 @@ import org.apache.wicket.util.string.Strings;
* </ul>
*
*
- * @author Carl-Eric Menzel <cm...@wicketbuch.de>
+ * @author Carl-Eric Menzel
* @author igor
*/
public class AutoLabelTextResolver implements IComponentResolver
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBoxSelector.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBoxSelector.java
index 83ae73d..41c7a86 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBoxSelector.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBoxSelector.java
@@ -31,7 +31,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
* automatically updates the state of the "select all" checkbox. Override
* {@link AbstractCheckSelector#wantAutomaticUpdate()} to change this.
*
- * @author Carl-Eric Menzel <cm...@wicketbuch.de>
+ * @author Carl-Eric Menzel
*/
public class CheckBoxSelector extends AbstractCheckSelector
{
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java
index e05b0d5..05dce6b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java
@@ -38,16 +38,18 @@ import org.slf4j.LoggerFactory;
* be in the component hierarchy somewhere below the group component. The model of the CheckGroup
* component has to be an instance of java.util.Collection. The model collection of the group is
* filled with model objects of all selected Check components.
- *
- * ie <code>
- * <span wicket:id="checkboxgroup">
+ *
+ * <p>
+ * i.e. <code>
+ * <span wicket:id="checkboxgroup">
* ...
- * <input type="checkbox" wicket:id="checkbox1">choice 1</input>
+ * <input type="checkbox" wicket:id="checkbox1">choice 1</input>
* ...
- * <input type="checkbox" wicket:id="checkbox2">choice 2</input>
+ * <input type="checkbox" wicket:id="checkbox2">choice 2</input>
* ...
- * </span>
+ * </span>
* </code>
+ * </p>
*
* @see org.apache.wicket.markup.html.form.Check
* @see org.apache.wicket.markup.html.form.CheckGroupSelector <p>
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckboxMultipleChoiceSelector.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckboxMultipleChoiceSelector.java
index deb4820..98c2b73 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckboxMultipleChoiceSelector.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckboxMultipleChoiceSelector.java
@@ -22,7 +22,7 @@ package org.apache.wicket.markup.html.form;
* "select all" checkbox. Override {@link AbstractCheckSelector#wantAutomaticUpdate()} to change
* this.
*
- * @author Carl-Eric Menzel <cm...@wicketbuch.de>
+ * @author Carl-Eric Menzel
*/
public class CheckboxMultipleChoiceSelector extends AbstractCheckSelector
{
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java
index 8b462dd..c23cf75 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java
@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
* "autolink" by the MarkupParser for all tags with href attribute, such as anchor and link tags
* with no explicit wicket id. E.g. <a href="Home.html">
* <p>
- * If href points to a *.html file, a BookmarkablePageLink<?> will automatically be created, except
+ * If href points to a *.html file, a BookmarkablePageLink will automatically be created, except
* for absolute paths, where an ExternalLink is created.
* <p>
* If href points to a *.html file, it resolves the given URL by searching for a page class, either
@@ -144,7 +144,7 @@ public final class AutoLinkResolver implements IComponentResolver
private final String anchor;
/**
- * When using <wicket:link> to let Wicket lookup for pages and create the related links,
+ * When using <wicket:link> to let Wicket lookup for pages and create the related links,
* it's not possible to change the "setAutoEnable" property, which defaults to true. This
* affects the prototype because, sometimes designers _want_ links to be enabled.
*/
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 e39ca47..02e42fd 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
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
* <p>
* The information in the log files can take any format, depending on the request logger
* implementation: currently Wicket supports two formats: a {@link RequestLogger legacy, log4j
- * compatible format}, and a {@link JsonRequestLogger JSON format}.
+ * compatible format}, and a <em>JsonRequestLogger</em> JSON format.
*/
public abstract class AbstractRequestLogger implements IRequestLogger
{
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/AjaxEnclosureListener.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/AjaxEnclosureListener.java
index 351d549..acd96f6 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/AjaxEnclosureListener.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/AjaxEnclosureListener.java
@@ -41,7 +41,7 @@ import org.apache.wicket.util.visit.IVisitor;
*
* Syntax for inline enclosure:
*
- * <tr wicket:enclosure="controllingChildId">
+ * <tr wicket:enclosure="controllingChildId">
*
* In this example the tag used is tr, but any other tag could be used as well. The attribute
* "wicket:enclosure" is mandatory, and is used to recognise an inline enclosure. The value of the
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 9aa29c9..c249b2b 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
@@ -426,7 +426,7 @@ public abstract class AbstractResource implements IResource
/**
* Check to determine if the resource data needs to be written. This method checks the
* <code>If-Modified-Since</code> request header and compares it to lastModified property.
- * In order for this method to work {@link #setLastModified(Time)} has to be called first.
+ * In order for this method to work {@link #setLastModified(Instant)} has to be called first.
*
* @param attributes
* request attributes
@@ -497,7 +497,7 @@ public abstract class AbstractResource implements IResource
*
* @return duration for caching
*
- * @see org.apache.wicket.settings.ResourceSettings#setDefaultCacheDuration(org.apache.wicket.util.time.Duration)
+ * @see org.apache.wicket.settings.ResourceSettings#setDefaultCacheDuration(Duration)
* @see org.apache.wicket.settings.ResourceSettings#getDefaultCacheDuration()
*/
public Duration getCacheDuration()
@@ -519,7 +519,7 @@ public abstract class AbstractResource implements IResource
* @return cache scope
*
* @see org.apache.wicket.request.resource.AbstractResource.ResourceResponse#getCacheDuration()
- * @see org.apache.wicket.request.resource.AbstractResource.ResourceResponse#setCacheDuration(org.apache.wicket.util.time.Duration)
+ * @see org.apache.wicket.request.resource.AbstractResource.ResourceResponse#setCacheDuration(Duration)
* @see org.apache.wicket.request.http.WebResponse.CacheScope
*/
public WebResponse.CacheScope getCacheScope()
@@ -536,7 +536,7 @@ public abstract class AbstractResource implements IResource
* scope for caching
*
* @see org.apache.wicket.request.resource.AbstractResource.ResourceResponse#getCacheDuration()
- * @see org.apache.wicket.request.resource.AbstractResource.ResourceResponse#setCacheDuration(org.apache.wicket.util.time.Duration)
+ * @see org.apache.wicket.request.resource.AbstractResource.ResourceResponse#setCacheDuration(Duration)
* @see org.apache.wicket.request.http.WebResponse.CacheScope
*
* @return {@code this}, for chaining.
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithContentTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithContentTest.java
index ee1ebb5..e32117c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithContentTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithContentTest.java
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
* components to support things like
* {@literal <label wicket:for="foo"><input wicket:id="foo"/></label>}.
*
- * @author Carl-Eric Menzel <cm...@wicketbuch.de>
+ * @author Carl-Eric Menzel
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
class AutoLabelWithContentTest extends WicketTestCase
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoiceTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoiceTest.java
index 465eb17..c93276d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoiceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoiceTest.java
@@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test;
* Test the dynamic prefix/suffix feature introduced with
* https://issues.apache.org/jira/browse/WICKET-3478
*
- * @author Carl-Eric Menzel <cm...@wicketbuch.de> <ca...@c1-setcon.de>
+ * @author Carl-Eric Menzel
*/
class CheckBoxMultipleChoiceTest extends WicketTestCase
{
diff --git a/wicket-examples/pom.xml b/wicket-examples/pom.xml
index 8629787..6745e70 100644
--- a/wicket-examples/pom.xml
+++ b/wicket-examples/pom.xml
@@ -236,10 +236,6 @@
<artifactId>maven-war-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
</plugin>
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/flow/RedirectToUrlException.java b/wicket-request/src/main/java/org/apache/wicket/request/flow/RedirectToUrlException.java
index eb2eab0..71d4149 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/flow/RedirectToUrlException.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/flow/RedirectToUrlException.java
@@ -25,10 +25,9 @@ import org.apache.wicket.request.http.handler.RedirectRequestHandler;
* Causes Wicket to interrupt current request processing and send a redirect to the given url.
*
* Use this if you want to redirect to an external or none Wicket url. If you want to redirect to a
- * page use the {@link RestartResponseException}
- *
- * @see RestartResponseException
- * @see RestartResponseAtInterceptPageException
+ * page use the <em>org.apache.wicket.RestartResponseException</em>
+ *
+ * Also see org.apache.wicket.RestartResponseAtInterceptPageException
*/
public class RedirectToUrlException extends ReplaceHandlerException
{
diff --git a/wicket-user-guide/pom.xml b/wicket-user-guide/pom.xml
index fc851e4..a6ea1dd 100644
--- a/wicket-user-guide/pom.xml
+++ b/wicket-user-guide/pom.xml
@@ -46,10 +46,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
</plugins>
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/string/StringValue.java b/wicket-util/src/main/java/org/apache/wicket/util/string/StringValue.java
index 9e696db..7e991c2 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/string/StringValue.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/string/StringValue.java
@@ -548,7 +548,7 @@ public class StringValue implements IClusterable
*
* @return Converted text
* @throws StringValueConversionException
- * @see Duration#valueOf(String, java.util.Locale)
+ * @see Duration#parse(CharSequence)
*/
public final Duration toDuration() throws StringValueConversionException
{
@@ -569,7 +569,7 @@ public class StringValue implements IClusterable
* the default value
* @return the converted text as a duration or the default value if text is empty or
* inconvertible
- * @see Duration#valueOf(String, java.util.Locale)
+ * @see Duration#parse(CharSequence)
*/
public final Duration toDuration(final Duration defaultValue)
{
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/value/CopyOnWriteValueMap.java b/wicket-util/src/main/java/org/apache/wicket/util/value/CopyOnWriteValueMap.java
index fa2834c..603f4bd 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/value/CopyOnWriteValueMap.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/value/CopyOnWriteValueMap.java
@@ -55,9 +55,6 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
this.wrapped = wrapped;
}
- /**
- * @see java.util.Map#clear()
- */
@Override
public void clear()
{
@@ -78,27 +75,18 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
}
}
- /**
- * @see java.util.Map#containsKey(Object)
- */
@Override
public boolean containsKey(final Object key)
{
return wrapped.containsKey(key);
}
- /**
- * @see java.util.Map#containsValue(Object)
- */
@Override
public boolean containsValue(final Object value)
{
return wrapped.containsValue(value);
}
- /**
- * @see java.util.Map#entrySet()
- */
@Override
public Set<Entry<String, Object>> entrySet()
{
@@ -106,9 +94,6 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
return wrapped.entrySet();
}
- /**
- * @see java.util.Map#equals(Object)
- */
@Override
public boolean equals(final Object o)
{
@@ -121,171 +106,114 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
return wrapped.hashCode();
}
- /**
- * @see java.util.Map#get(Object)
- */
@Override
public Object get(final Object key)
{
return wrapped.get(key);
}
- /**
- * @see IValueMap#getBoolean(String)
- */
@Override
public boolean getBoolean(final String key) throws StringValueConversionException
{
return wrapped.getBoolean(key);
}
- /**
- * @see IValueMap#getCharSequence(String)
- */
@Override
public CharSequence getCharSequence(final String key)
{
return wrapped.getCharSequence(key);
}
- /**
- * @see IValueMap#getDouble(String)
- */
@Override
public double getDouble(final String key) throws StringValueConversionException
{
return wrapped.getDouble(key);
}
- /**
- * @see IValueMap#getDouble(String, double)
- */
@Override
public double getDouble(final String key, final double defaultValue)
{
return wrapped.getDouble(key, defaultValue);
}
- /**
- * @see IValueMap#getDuration(String)
- */
@Override
public Duration getDuration(final String key) throws StringValueConversionException
{
return wrapped.getDuration(key);
}
- /**
- * @see IValueMap#getInt(String, int)
- */
@Override
public int getInt(final String key, final int defaultValue)
{
return wrapped.getInt(key, defaultValue);
}
- /**
- * @see IValueMap#getInt(String)
- */
@Override
public int getInt(final String key) throws StringValueConversionException
{
return wrapped.getInt(key);
}
- /**
- * @see IValueMap#getKey(String)
- */
@Override
public String getKey(final String key)
{
return wrapped.getKey(key);
}
- /**
- * @see IValueMap#getLong(String, long)
- */
@Override
public long getLong(final String key, final long defaultValue)
{
return wrapped.getLong(key, defaultValue);
}
- /**
- * @see IValueMap#getLong(String)
- */
@Override
public long getLong(final String key) throws StringValueConversionException
{
return wrapped.getLong(key);
}
- /**
- * @see IValueMap#getString(String, String)
- */
@Override
public String getString(final String key, final String defaultValue)
{
return wrapped.getString(key, defaultValue);
}
- /**
- * @see IValueMap#getString(String)
- */
@Override
public String getString(final String key)
{
return wrapped.getString(key);
}
- /**
- * @see IValueMap#getStringArray(String)
- */
@Override
public String[] getStringArray(final String key)
{
return wrapped.getStringArray(key);
}
- /**
- * @see IValueMap#getStringValue(String)
- */
@Override
public StringValue getStringValue(final String key)
{
return wrapped.getStringValue(key);
}
- /**
- * @see IValueMap#getInstant(String)
- */
@Override
public Instant getInstant(final String key) throws StringValueConversionException
{
return wrapped.getInstant(key);
}
- /**
- * @see java.util.Map#isEmpty()
- */
@Override
public boolean isEmpty()
{
return wrapped.isEmpty();
}
- /**
- * @see IValueMap#isImmutable()
- */
@Override
public boolean isImmutable()
{
return false;
}
- /**
- * @see java.util.Map#keySet()
- */
@Override
public Set<String> keySet()
{
@@ -293,18 +221,12 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
return wrapped.keySet();
}
- /**
- * @see IValueMap#makeImmutable()
- */
@Override
public IValueMap makeImmutable()
{
return wrapped.makeImmutable();
}
- /**
- * @see java.util.Map#put(Object, Object)
- */
@Override
public Object put(final String key, final Object value)
{
@@ -312,9 +234,6 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
return wrapped.put(key, value);
}
- /**
- * @see java.util.Map#putAll(Map)
- */
@Override
public void putAll(final Map<? extends String, ?> map)
{
@@ -322,9 +241,6 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
wrapped.putAll(map);
}
- /**
- * @see java.util.Map#remove(Object)
- */
@Override
public Object remove(final Object key)
{
@@ -332,18 +248,12 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
return wrapped.remove(key);
}
- /**
- * @see java.util.Map#size()
- */
@Override
public int size()
{
return wrapped.size();
}
- /**
- * @see java.util.Map#values()
- */
@Override
public Collection<Object> values()
{
@@ -354,137 +264,90 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
// // getAs convenience methods
// //
- /**
- * @see IValueMap#getAsBoolean(String)
- *
- */
@Override
public Boolean getAsBoolean(final String key)
{
return wrapped.getAsBoolean(key);
}
- /**
- * @see IValueMap#getAsBoolean(String, boolean)
- *
- */
@Override
public boolean getAsBoolean(final String key, final boolean defaultValue)
{
return wrapped.getAsBoolean(key, defaultValue);
}
- /**
- * @see IValueMap#getAsInteger(String)
- */
@Override
public Integer getAsInteger(final String key)
{
return wrapped.getAsInteger(key);
}
- /**
- * @see IValueMap#getAsInteger(String, int)
- */
@Override
public int getAsInteger(final String key, final int defaultValue)
{
return wrapped.getAsInteger(key, defaultValue);
}
- /**
- * @see IValueMap#getAsLong(String)
- */
@Override
public Long getAsLong(final String key)
{
return wrapped.getAsLong(key);
}
- /**
- * @see IValueMap#getAsLong(String, long)
- */
@Override
public long getAsLong(final String key, final long defaultValue)
{
return wrapped.getAsLong(key, defaultValue);
}
- /**
- * @see IValueMap#getAsDouble(String)
- */
@Override
public Double getAsDouble(final String key)
{
return wrapped.getAsDouble(key);
}
- /**
- * @see IValueMap#getAsDouble(String, double)
- */
@Override
public double getAsDouble(final String key, final double defaultValue)
{
return wrapped.getAsDouble(key, defaultValue);
}
- /**
- * @see IValueMap#getAsDuration(String)
- */
@Override
public Duration getAsDuration(final String key)
{
return wrapped.getAsDuration(key);
}
- /**
- * @see IValueMap#getAsDuration(String, Duration)
- */
@Override
public Duration getAsDuration(final String key, final Duration defaultValue)
{
return wrapped.getAsDuration(key, defaultValue);
}
- /**
- * @see IValueMap#getAsInstant(String)
- */
@Override
public Instant getAsInstant(final String key)
{
return wrapped.getAsInstant(key);
}
- /**
- * @see IValueMap#getAsTime(String, Time)
- */
@Override
public Instant getAsTime(final String key, final Instant defaultValue)
{
return wrapped.getAsTime(key, defaultValue);
}
- /**
- * @see IValueMap#getAsEnum(String, Class)
- */
@Override
public <T extends Enum<T>> T getAsEnum(final String key, final Class<T> eClass)
{
return wrapped.getAsEnum(key, eClass);
}
- /**
- * @see IValueMap#getAsEnum
- */
@Override
public <T extends Enum<T>> T getAsEnum(final String key, final T defaultValue)
{
return wrapped.getAsEnum(key, defaultValue);
}
- /**
- * @see IValueMap#getAsEnum(String, Class, Enum)
- */
@Override
public <T extends Enum<T>> T getAsEnum(final String key, final Class<T> eClass,
final T defaultValue)
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/value/ValueMap.java b/wicket-util/src/main/java/org/apache/wicket/util/value/ValueMap.java
index ae554ae..02247a3 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/value/ValueMap.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/value/ValueMap.java
@@ -217,9 +217,6 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
}
}
- /**
- * @see java.util.Map#clear()
- */
@Override
public final void clear()
{
@@ -227,81 +224,54 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
super.clear();
}
- /**
- * @see IValueMap#getBoolean(String)
- */
@Override
public final boolean getBoolean(final String key) throws StringValueConversionException
{
return getStringValue(key).toBoolean();
}
- /**
- * @see IValueMap#getDouble(String)
- */
@Override
public final double getDouble(final String key) throws StringValueConversionException
{
return getStringValue(key).toDouble();
}
- /**
- * @see IValueMap#getDouble(String, double)
- */
@Override
public final double getDouble(final String key, final double defaultValue)
{
return getStringValue(key).toDouble(defaultValue);
}
- /**
- * @see IValueMap#getDuration(String)
- */
@Override
public final Duration getDuration(final String key) throws StringValueConversionException
{
return getStringValue(key).toDuration();
}
- /**
- * @see IValueMap#getInt(String)
- */
@Override
public final int getInt(final String key) throws StringValueConversionException
{
return getStringValue(key).toInt();
}
- /**
- * @see IValueMap#getInt(String, int)
- */
@Override
public final int getInt(final String key, final int defaultValue)
{
return getStringValue(key).toInt(defaultValue);
}
- /**
- * @see IValueMap#getLong(String)
- */
@Override
public final long getLong(final String key) throws StringValueConversionException
{
return getStringValue(key).toLong();
}
- /**
- * @see IValueMap#getLong(String, long)
- */
@Override
public final long getLong(final String key, final long defaultValue)
{
return getStringValue(key).toLong(defaultValue);
}
- /**
- * @see IValueMap#getString(String, String)
- */
@Override
public final String getString(final String key, final String defaultValue)
{
@@ -309,9 +279,6 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
return value != null ? value : defaultValue;
}
- /**
- * @see IValueMap#getString(String)
- */
@Override
public final String getString(final String key)
{
@@ -340,9 +307,6 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
}
}
- /**
- * @see IValueMap#getCharSequence(String)
- */
@Override
public final CharSequence getCharSequence(final String key)
{
@@ -379,9 +343,6 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
}
}
- /**
- * @see IValueMap#getStringArray(String)
- */
@Override
public String[] getStringArray(final String key)
{
@@ -411,36 +372,24 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
return new String[] { o.toString() };
}
- /**
- * @see IValueMap#getStringValue(String)
- */
@Override
public StringValue getStringValue(final String key)
{
return StringValue.valueOf(getString(key));
}
- /**
- * @see IValueMap#getInstant(String)
- */
@Override
public final Instant getInstant(final String key) throws StringValueConversionException
{
return getStringValue(key).toInstant();
}
- /**
- * @see IValueMap#isImmutable()
- */
@Override
public final boolean isImmutable()
{
return immutable;
}
- /**
- * @see IValueMap#makeImmutable()
- */
@Override
public final IValueMap makeImmutable()
{
@@ -448,9 +397,6 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
return this;
}
- /**
- * @see java.util.Map#put(Object, Object)
- */
@Override
public Object put(final String key, final Object value)
{
@@ -500,9 +446,6 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
}
}
- /**
- * @see java.util.Map#putAll(java.util.Map)
- */
@Override
public void putAll(final Map<? extends String, ?> map)
{
@@ -510,9 +453,6 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
super.putAll(map);
}
- /**
- * @see java.util.Map#remove(java.lang.Object)
- */
@Override
public Object remove(final Object key)
{
@@ -520,9 +460,6 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
return super.remove(key);
}
- /**
- * @see IValueMap#getKey(String)
- */
@Override
public String getKey(final String key)
{
@@ -591,10 +528,6 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
// // getAs convenience methods
// //
- /**
- * @see IValueMap#getAsBoolean(String)
- *
- */
@Override
public Boolean getAsBoolean(final String key)
{
@@ -613,10 +546,6 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
}
}
- /**
- * @see IValueMap#getAsBoolean(String, boolean)
- *
- */
@Override
public boolean getAsBoolean(final String key, final boolean defaultValue)
{
@@ -635,9 +564,6 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
}
}
- /**
- * @see IValueMap#getAsInteger(String)
- */
@Override
public Integer getAsInteger(final String key)
{
@@ -656,18 +582,12 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
}
}
- /**
- * @see IValueMap#getAsInteger(String, int)
- */
@Override
public int getAsInteger(final String key, final int defaultValue)
{
return getInt(key, defaultValue);
}
- /**
- * @see IValueMap#getAsLong(String)
- */
@Override
public Long getAsLong(final String key)
{
@@ -686,18 +606,12 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
}
}
- /**
- * @see IValueMap#getAsLong(String, long)
- */
@Override
public long getAsLong(final String key, final long defaultValue)
{
return getLong(key, defaultValue);
}
- /**
- * @see IValueMap#getAsDouble(String)
- */
@Override
public Double getAsDouble(final String key)
{
@@ -716,27 +630,18 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
}
}
- /**
- * @see IValueMap#getAsDouble(String, double)
- */
@Override
public double getAsDouble(final String key, final double defaultValue)
{
return getDouble(key, defaultValue);
}
- /**
- * @see IValueMap#getAsDuration(String)
- */
@Override
public Duration getAsDuration(final String key)
{
return getAsDuration(key, null);
}
- /**
- * @see IValueMap#getAsDuration(String, Duration)
- */
@Override
public Duration getAsDuration(final String key, final Duration defaultValue)
{
@@ -755,18 +660,12 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
}
}
- /**
- * @see IValueMap#getAsInstant(String)
- */
@Override
public Instant getAsInstant(final String key)
{
return getAsTime(key, null);
}
- /**
- * @see IValueMap#getAsTime(String, Time)
- */
@Override
public Instant getAsTime(final String key, final Instant defaultValue)
{
@@ -785,9 +684,6 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
}
}
- /**
- * @see org.apache.wicket.util.value.IValueMap#getAsEnum(java.lang.String, java.lang.Class)
- */
@Override
public <T extends Enum<T>> T getAsEnum(final String key, final Class<T> eClass)
{
@@ -795,9 +691,6 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
return this.getEnumImpl(key, eClass, (T)null);
}
- /**
- * @see org.apache.wicket.util.value.IValueMap#getAsEnum(java.lang.String, java.lang.Enum)
- */
@Override
public <T extends Enum<T>> T getAsEnum(final String key, final T defaultValue)
{
@@ -809,10 +702,6 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
return getEnumImpl(key, defaultValue.getClass(), defaultValue);
}
- /**
- * @see org.apache.wicket.util.value.IValueMap#getAsEnum(java.lang.String, java.lang.Class,
- * java.lang.Enum)
- */
@Override
public <T extends Enum<T>> T getAsEnum(final String key, final Class<T> eClass,
final T defaultValue)