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 2013/05/24 10:23:54 UTC
git commit: WICKET-5201 Remove deprecated classes/methods/fields
Updated Branches:
refs/heads/master fbe422303 -> f072c5076
WICKET-5201 Remove deprecated classes/methods/fields
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f072c507
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f072c507
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f072c507
Branch: refs/heads/master
Commit: f072c5076f1dae4c05dac44659187345f6d8af39
Parents: fbe4223
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri May 24 11:19:52 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri May 24 11:19:52 2013 +0300
----------------------------------------------------------------------
.../java/org/apache/wicket/AttributeModifier.java | 20 --
.../src/main/java/org/apache/wicket/Session.java | 17 --
.../apache/wicket/ajax/markup/html/AjaxLink.java | 12 -
.../paging/AjaxPagingNavigationIncrementLink.java | 20 --
.../apache/wicket/behavior/AttributeAppender.java | 21 --
.../wicket/core/request/mapper/HomePageMapper.java | 29 --
.../wicket/core/request/mapper/MountedMapper.java | 30 --
.../apache/wicket/core/util/string/UrlUtils.java | 50 ----
...JavaScriptFilteredIntoFooterHeaderResponse.java | 2 +-
.../markup/html/SecurePackageResourceGuard.java | 14 -
.../markup/html/form/AutoLabelTagHandler.java | 12 -
.../parser/filter/InlineEnclosureHandler.java | 12 -
.../markup/parser/filter/RootMarkupFilter.java | 12 -
.../http/mock/MockHttpServletResponse.java | 10 -
.../apache/wicket/request/cycle/RequestCycle.java | 31 --
.../apache/wicket/session/HttpSessionStore.java | 13 -
.../wicket/util/tester/BaseWicketTester.java | 37 ---
.../apache/wicket/util/tester/WicketTester.java | 8 +-
.../apache/wicket/validation/ValidationError.java | 15 -
.../validation/validator/AbstractValidator.java | 216 ---------------
.../org/apache/wicket/markup/MarkupCacheTest.java | 9 +-
.../loader/ValidatorStringResourceLoaderTest.java | 5 +-
.../wicket/stateless/ImageStatelessTest.java | 25 ++-
.../devutils/inspector/SessionSizeModel.java | 11 -
.../wicket/devutils/inspector/SessionView.java | 2 +-
.../devutils/inspector/SessionSizeModelTest.java | 2 +-
.../devutils/stateless/StatelessCheckerTest.java | 2 +-
.../html/repeater/data/table/PropertyColumn.java | 17 +-
.../java/org/apache/wicket/util/ClassProvider.java | 66 -----
29 files changed, 39 insertions(+), 681 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/f072c507/wicket-core/src/main/java/org/apache/wicket/AttributeModifier.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/AttributeModifier.java b/wicket-core/src/main/java/org/apache/wicket/AttributeModifier.java
index 71a225a..3a9b3f7 100644
--- a/wicket-core/src/main/java/org/apache/wicket/AttributeModifier.java
+++ b/wicket-core/src/main/java/org/apache/wicket/AttributeModifier.java
@@ -83,26 +83,6 @@ public class AttributeModifier extends Behavior implements IClusterable
/**
* Create a new attribute modifier with the given attribute name and model to replace with. The
- * additional boolean flag specifies whether to add the attribute if it is not present.
- *
- * @param attribute
- * The attribute name to replace the value for
- * @param addAttributeIfNotPresent
- * Whether to add the attribute if it is not present
- * @param replaceModel
- * The model to replace the value with
- * @deprecated AttributeModifier will now always add the attribute if not present, use
- * {@link #AttributeModifier(String, IModel)} instead
- */
- @Deprecated
- public AttributeModifier(final String attribute, final boolean addAttributeIfNotPresent,
- final IModel<?> replaceModel)
- {
- this(attribute, replaceModel);
- }
-
- /**
- * Create a new attribute modifier with the given attribute name and model to replace with. The
* attribute will be added with the model value or the value will be replaced with the model
* value if the attribute is already present.
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/f072c507/wicket-core/src/main/java/org/apache/wicket/Session.java
----------------------------------------------------------------------
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 83e55d2..253ed7d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Session.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Session.java
@@ -37,12 +37,10 @@ import org.apache.wicket.page.PageAccessSynchronizer;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.session.ISessionStore;
-import org.apache.wicket.settings.IApplicationSettings;
import org.apache.wicket.util.IProvider;
import org.apache.wicket.util.LazyInitializer;
import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.util.lang.Objects;
-import org.apache.wicket.util.tester.BaseWicketTester;
import org.apache.wicket.util.time.Duration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -278,21 +276,6 @@ public abstract class Session implements IClusterable, IEventSink
}
/**
- * Cleans up all rendered feedback messages and any unrendered, dangling feedback messages there
- * may be left after that.
- *
- * @deprecated see
- * {@link IApplicationSettings#setFeedbackMessageCleanupFilter(org.apache.wicket.feedback.IFeedbackMessageFilter)}
- * for cleanup during testing see {@link BaseWicketTester#cleanupFeedbackMessages()}
- */
- @Deprecated
- public final void cleanupFeedbackMessages()
- {
- throw new UnsupportedOperationException("Deprecated, see the javadoc");
- }
-
-
- /**
* Removes all pages from the session. Although this method should rarely be needed, it is
* available (possibly for security reasons).
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/f072c507/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java
index 20b819d..f0970fd 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java
@@ -17,8 +17,6 @@
package org.apache.wicket.ajax.markup.html;
import org.apache.wicket.IGenericComponent;
-import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
-import org.apache.wicket.ajax.AjaxChannel;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
@@ -99,16 +97,6 @@ public abstract class AjaxLink<T> extends AbstractLink implements IAjaxLink, IGe
{
}
- /**
- * @return the channel that manages how Ajax calls are executed
- * @see AbstractDefaultAjaxBehavior#getChannel()
- */
- @Deprecated
- protected AjaxChannel getChannel()
- {
- return null;
- }
-
@Override
protected void onComponentTag(ComponentTag tag)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/f072c507/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationIncrementLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationIncrementLink.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationIncrementLink.java
index e4bc726..cf6a47c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationIncrementLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationIncrementLink.java
@@ -100,26 +100,6 @@ public class AjaxPagingNavigationIncrementLink extends PagingNavigationIncrement
}
/**
- * Returns the javascript event handler for this component. This function is used to decorate
- * the generated javascript handler.
- * <p>
- * NOTE: It is recommended that you only prepend additional javascript to the default handler
- * because the default handler uses the return func() format so any appended javascript will not
- * be evaluated by default.
- *
- * @param defaultHandler
- * default javascript event handler generated by this link
- * @return javascript event handler for this link
- * @deprecated This method is not used since Wicket 6.0.0
- */
- @Deprecated
- protected String getEventHandler(String defaultHandler)
- {
- return defaultHandler;
- }
-
-
- /**
* Fallback event listener, will redisplay the current page.
*
* @see org.apache.wicket.markup.html.link.Link#onClick()
http://git-wip-us.apache.org/repos/asf/wicket/blob/f072c507/wicket-core/src/main/java/org/apache/wicket/behavior/AttributeAppender.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/behavior/AttributeAppender.java b/wicket-core/src/main/java/org/apache/wicket/behavior/AttributeAppender.java
index 5db4526..3e690fc 100644
--- a/wicket-core/src/main/java/org/apache/wicket/behavior/AttributeAppender.java
+++ b/wicket-core/src/main/java/org/apache/wicket/behavior/AttributeAppender.java
@@ -62,27 +62,6 @@ public class AttributeAppender extends AttributeModifier
private String separator;
/**
- * Creates an AttributeModifier that appends the appendModel's value to the current value of the
- * attribute, and will add the attribute when addAttributeIfNotPresent is true.
- *
- * @param attribute
- * the attribute to append the appendModels value to
- * @param addAttributeIfNotPresent
- * when true, adds the attribute to the tag
- * @param appendModel
- * the model supplying the value to append
- * @param separator
- * the separator string, comes between the original value and the append value
- * @deprecated use {@link #AttributeAppender(String, IModel)} instead.
- */
- @Deprecated
- public AttributeAppender(String attribute, boolean addAttributeIfNotPresent,
- IModel<?> appendModel, String separator)
- {
- this(attribute, appendModel, separator);
- }
-
- /**
* Creates an attribute modifier that concatenates the {@code replaceModel} to the attribute's
* current value, optionally separated by the {@link #getSeparator() separator}.
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/f072c507/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/HomePageMapper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/HomePageMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/HomePageMapper.java
index 51e0863..c6a3d03 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/HomePageMapper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/HomePageMapper.java
@@ -20,9 +20,7 @@ import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.mapper.parameter.IPageParametersEncoder;
-import org.apache.wicket.util.ClassProvider;
import org.apache.wicket.util.IProvider;
-import org.apache.wicket.util.reference.ClassReference;
/**
* A mapper that is used when a request to the home page ("/") is made
@@ -47,18 +45,6 @@ public class HomePageMapper extends MountedMapper
* @param pageClassProvider
* the class of the page which should handle requests to "/"
*/
- @Deprecated
- public HomePageMapper(ClassProvider<? extends IRequestablePage> pageClassProvider)
- {
- super("/", pageClassProvider);
- }
-
- /**
- * Construct.
- *
- * @param pageClassProvider
- * the class of the page which should handle requests to "/"
- */
public HomePageMapper(IProvider<Class<? extends IRequestablePage>> pageClassProvider)
{
super("/", pageClassProvider);
@@ -79,21 +65,6 @@ public class HomePageMapper extends MountedMapper
}
/**
- * Construct.
- *
- * @param pageClassProvider
- * the class of the page which should handle requests to "/"
- * @param pageParametersEncoder
- * the encoder that will be used to encode/decode the page parameters
- */
- @Deprecated
- public HomePageMapper(final ClassProvider<? extends IRequestablePage> pageClassProvider,
- IPageParametersEncoder pageParametersEncoder)
- {
- super("/", new ClassReference(pageClassProvider.get()), pageParametersEncoder);
- }
-
- /**
* Matches only when there are no segments/indexed parameters
*
* @see AbstractBookmarkableMapper#parseRequest(org.apache.wicket.request.Request)
http://git-wip-us.apache.org/repos/asf/wicket/blob/f072c507/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/MountedMapper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/MountedMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/MountedMapper.java
index 17e9af3..ae742d6 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/MountedMapper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/MountedMapper.java
@@ -32,7 +32,6 @@ import org.apache.wicket.request.mapper.info.PageInfo;
import org.apache.wicket.request.mapper.parameter.IPageParametersEncoder;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.mapper.parameter.PageParametersEncoder;
-import org.apache.wicket.util.ClassProvider;
import org.apache.wicket.util.IProvider;
import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.reference.ClassReference;
@@ -158,19 +157,6 @@ public class MountedMapper extends AbstractBookmarkableMapper
* @param mountPath
* @param pageClassProvider
*/
- @Deprecated
- public MountedMapper(String mountPath,
- ClassProvider<? extends IRequestablePage> pageClassProvider)
- {
- this(mountPath, new ClassReference(pageClassProvider.get()), new PageParametersEncoder());
- }
-
- /**
- * Construct.
- *
- * @param mountPath
- * @param pageClassProvider
- */
public MountedMapper(String mountPath,
IProvider<Class<? extends IRequestablePage>> pageClassProvider)
{
@@ -197,22 +183,6 @@ public class MountedMapper extends AbstractBookmarkableMapper
* @param pageClassProvider
* @param pageParametersEncoder
*/
- @Deprecated
- public MountedMapper(String mountPath,
- ClassProvider<? extends IRequestablePage> pageClassProvider,
- IPageParametersEncoder pageParametersEncoder)
- {
- this(mountPath, new ClassReference(pageClassProvider.get()),
- pageParametersEncoder);
- }
-
- /**
- * Construct.
- *
- * @param mountPath
- * @param pageClassProvider
- * @param pageParametersEncoder
- */
public MountedMapper(String mountPath,
IProvider<Class<? extends IRequestablePage>> pageClassProvider,
IPageParametersEncoder pageParametersEncoder)
http://git-wip-us.apache.org/repos/asf/wicket/blob/f072c507/wicket-core/src/main/java/org/apache/wicket/core/util/string/UrlUtils.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/util/string/UrlUtils.java b/wicket-core/src/main/java/org/apache/wicket/core/util/string/UrlUtils.java
deleted file mode 100644
index ba16f4d..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/core/util/string/UrlUtils.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.core.util.string;
-
-import org.apache.wicket.request.cycle.RequestCycle;
-
-/**
- * Various url utilities
- *
- * @author igor.vaynberg
- * @deprecated Use {@link org.apache.wicket.request.UrlUtils} instead.
- */
-@Deprecated
-public class UrlUtils extends org.apache.wicket.request.UrlUtils
-{
- /**
- * Rewrites a relative url to be context relative, leaves absolute urls same.
- *
- * @param url
- * @param requestCycle
- * @return rewritten url
- * @deprecated use {@link #rewriteToContextRelative(String, org.apache.wicket.request.IRequestCycle)} instead
- */
- @Deprecated
- public static String rewriteToContextRelative(String url, RequestCycle requestCycle)
- {
- if (isRelative(url))
- {
- return requestCycle.getUrlRenderer().renderContextRelativeUrl(url);
- }
- else
- {
- return url;
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/f072c507/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptFilteredIntoFooterHeaderResponse.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptFilteredIntoFooterHeaderResponse.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptFilteredIntoFooterHeaderResponse.java
index b15b33b..ec7e6b2 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptFilteredIntoFooterHeaderResponse.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptFilteredIntoFooterHeaderResponse.java
@@ -33,7 +33,7 @@ public final class JavaScriptFilteredIntoFooterHeaderResponse extends FilteringH
/**
* The name of the filter that renders the head section of the page
*/
- @Deprecated
+ @Deprecated // Remove in Wicket 8.0
public static final String HEADER_FILTER_NAME = DEFAULT_HEADER_FILTER_NAME;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/f072c507/wicket-core/src/main/java/org/apache/wicket/markup/html/SecurePackageResourceGuard.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/SecurePackageResourceGuard.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/SecurePackageResourceGuard.java
index 3058938..b7333d7 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/SecurePackageResourceGuard.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/SecurePackageResourceGuard.java
@@ -130,20 +130,6 @@ public class SecurePackageResourceGuard extends PackageResourceGuard
}
/**
- * Get a new cache implementation. Subclasses may return null to disable caching. More advanced
- * caches (e.h. ehcache) should be used in production environments to limit the size and remove
- * "old" entries.
- *
- * @return the cache implementation
- * @deprecated Pass the cache as a parameter to the constructor
- */
- @Deprecated
- public ConcurrentHashMap<String, Boolean> newCache()
- {
- return new SimpleCache(100);
- }
-
- /**
*
*/
public void clearCache()
http://git-wip-us.apache.org/repos/asf/wicket/blob/f072c507/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelTagHandler.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelTagHandler.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelTagHandler.java
index 17bdd82..9387ff1 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelTagHandler.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelTagHandler.java
@@ -33,18 +33,6 @@ import org.apache.wicket.util.string.Strings;
*/
public class AutoLabelTagHandler extends AbstractMarkupFilter
{
-
- /**
- * Constructor.
- *
- * @deprecated Use #AutoLabelResolver(MarkupResourceStream) instead
- */
- @Deprecated
- public AutoLabelTagHandler()
- {
- this(null);
- }
-
public AutoLabelTagHandler(MarkupResourceStream resourceStream)
{
super(resourceStream);
http://git-wip-us.apache.org/repos/asf/wicket/blob/f072c507/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/InlineEnclosureHandler.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/InlineEnclosureHandler.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/InlineEnclosureHandler.java
index ca6922e..1cc9a59 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/InlineEnclosureHandler.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/InlineEnclosureHandler.java
@@ -178,18 +178,6 @@ public final class InlineEnclosureHandler extends AbstractMarkupFilter
* @param tag
* The ComponentTag of the markup element with wicket:enclosure attribute
* @return The value of wicket:enclosure attribute or null if not found
- * @deprecated This method always uses 'wicket:' as a namespace. It will be removed in Wicket 7
- */
- @Deprecated
- public static final String getInlineEnclosureAttribute(final ComponentTag tag)
- {
- return tag.getAttributes().getString("wicket:" + INLINE_ENCLOSURE_ATTRIBUTE_NAME);
- }
-
- /**
- * @param tag
- * The ComponentTag of the markup element with wicket:enclosure attribute
- * @return The value of wicket:enclosure attribute or null if not found
*/
private String getAttribute(final ComponentTag tag, MarkupStream markupStream)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/f072c507/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/RootMarkupFilter.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/RootMarkupFilter.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/RootMarkupFilter.java
index 08a9b48..1c37fba 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/RootMarkupFilter.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/RootMarkupFilter.java
@@ -40,18 +40,6 @@ public final class RootMarkupFilter extends AbstractMarkupFilter
private final IXmlPullParser parser;
/**
- * Constructor.
- *
- * @param parser
- * the parser that reads the markup
- * @deprecated Use #RootMarkupFilter(IXmlPullParser, MarkupResourceStream) instead
- */
- public RootMarkupFilter(final IXmlPullParser parser)
- {
- this(parser, null);
- }
-
- /**
* Construct.
*
* @param parser
http://git-wip-us.apache.org/repos/asf/wicket/blob/f072c507/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletResponse.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletResponse.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletResponse.java
index a522bd5..5cb496c 100755
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletResponse.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletResponse.java
@@ -839,16 +839,6 @@ public class MockHttpServletResponse implements HttpServletResponse, IMetaDataBu
}
/**
- * @deprecated use {@link #getDocument()}
- * @return response as String
- */
- @Deprecated
- public String getTextResponse()
- {
- return getDocument();
- }
-
- /**
* @return binary response
*/
public String getBinaryResponse()
http://git-wip-us.apache.org/repos/asf/wicket/blob/f072c507/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java b/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
index aa6b2bc..0a84739 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
@@ -46,7 +46,6 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.IResource;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.request.resource.caching.IStaticCacheableResource;
-import org.apache.wicket.settings.IApplicationSettings;
import org.apache.wicket.util.lang.Args;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -696,36 +695,6 @@ public class RequestCycle implements IRequestCycle, IEventSink
}
/**
- * Gets whether or not feedback messages are to be cleaned up on detach.
- *
- * @return true if they are
- * @deprecated see {@link IApplicationSettings#getFeedbackMessageCleanupFilter()}
- *
- * TODO 7.0 remove
- */
- @Deprecated
- public final boolean isCleanupFeedbackMessagesOnDetach()
- {
- throw new UnsupportedOperationException("Deprecated, see javadoc");
- }
-
- /**
- * Sets whether or not feedback messages should be cleaned up on detach.
- *
- * @param cleanupFeedbackMessagesOnDetach
- * true if you want them to be cleaned up
- *
- * @deprecated see {@link #isCleanupFeedbackMessagesOnDetach()}
- *
- * TODO 7.0 remove
- */
- @Deprecated
- public final void setCleanupFeedbackMessagesOnDetach(boolean cleanupFeedbackMessagesOnDetach)
- {
- throw new UnsupportedOperationException("Deprecated, see javadoc");
- }
-
- /**
* @return The start time for this request
*/
public final long getStartTime()
http://git-wip-us.apache.org/repos/asf/wicket/blob/f072c507/wicket-core/src/main/java/org/apache/wicket/session/HttpSessionStore.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/session/HttpSessionStore.java b/wicket-core/src/main/java/org/apache/wicket/session/HttpSessionStore.java
index 3b0426b..c73b3a4 100644
--- a/wicket-core/src/main/java/org/apache/wicket/session/HttpSessionStore.java
+++ b/wicket-core/src/main/java/org/apache/wicket/session/HttpSessionStore.java
@@ -422,19 +422,6 @@ public class HttpSessionStore implements ISessionStore
private final Session wicketSession;
/**
- * Constructor.
- *
- * @param applicationKey
- * The unique key of the application within this web application
- * @deprecated Use #SessionBindingListener(String, Session) instead
- */
- @Deprecated
- public SessionBindingListener(final String applicationKey)
- {
- this(applicationKey, Session.get());
- }
-
- /**
* Construct.
*
* @param applicationKey
http://git-wip-us.apache.org/repos/asf/wicket/blob/f072c507/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
index 29db03e..bc6697d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
@@ -1471,43 +1471,6 @@ public class BaseWicketTester
}
/**
- * A helper method for starting a component for a test without attaching it to a Page.
- *
- * Components which are somehow dependent on the page structure can not be currently tested with
- * this method.
- *
- * Example:
- *
- * UserDataView view = new UserDataView("view", new ListDataProvider(userList));
- * tester.startComponent(view); assertEquals(4, view.size());
- *
- * @param component
- * @return the processed component
- * @see #startComponentInPage(Class)
- * @deprecated Use {@linkplain #startComponentInPage(Component)} instead. WICKET-5097
- */
- @Deprecated
- public Component startComponent(final Component component)
- {
- try
- {
- component.internalInitialize();
- if (component instanceof FormComponent)
- {
- ((FormComponent<?>)component).processInput();
- }
- component.beforeRender();
- }
- finally
- {
- getRequestCycle().detach();
- component.detach();
- }
-
- return component;
- }
-
- /**
* Gets the component with the given path from last rendered page. This method fails in case the
* component couldn't be found.
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/f072c507/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
index 8f17548..56362c6 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
@@ -16,7 +16,10 @@
*/
package org.apache.wicket.util.tester;
-import static junit.framework.Assert.*;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertTrue;
+import static junit.framework.Assert.fail;
import java.io.Serializable;
import java.util.ArrayList;
@@ -39,7 +42,6 @@ import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.protocol.http.mock.MockHttpServletRequest;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.lang.Objects;
import org.slf4j.Logger;
@@ -674,7 +676,7 @@ public class WicketTester extends BaseWicketTester
{
log.info("=== " + component.getClass().getName() + " ===");
- startComponent(component);
+ startComponentInPage(component);
assertResultPage(testClass, filename);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/f072c507/wicket-core/src/main/java/org/apache/wicket/validation/ValidationError.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/validation/ValidationError.java b/wicket-core/src/main/java/org/apache/wicket/validation/ValidationError.java
index 1c414e0..255215a 100644
--- a/wicket-core/src/main/java/org/apache/wicket/validation/ValidationError.java
+++ b/wicket-core/src/main/java/org/apache/wicket/validation/ValidationError.java
@@ -111,21 +111,6 @@ public final class ValidationError implements IValidationError
* Adds a key to the list of keys that will be tried against <code>IErrorMessageSource</code> to
* locate the error message string.
*
- * @deprecated use {@link #addKey(String)}
- *
- * @param key
- * @return this <code>ValidationError</code> for chaining purposes
- */
- @Deprecated
- public ValidationError addMessageKey(String key)
- {
- return addKey(key);
- }
-
- /**
- * Adds a key to the list of keys that will be tried against <code>IErrorMessageSource</code> to
- * locate the error message string.
- *
* @param key
* a message key to be added
* @return this <code>ValidationError</code> for chaining purposes
http://git-wip-us.apache.org/repos/asf/wicket/blob/f072c507/wicket-core/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java b/wicket-core/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java
deleted file mode 100755
index ef8d434..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.validation.validator;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.util.io.IClusterable;
-import org.apache.wicket.util.lang.Classes;
-import org.apache.wicket.validation.INullAcceptingValidator;
-import org.apache.wicket.validation.IValidatable;
-import org.apache.wicket.validation.IValidator;
-import org.apache.wicket.validation.ValidationError;
-
-
-/**
- * Convenience base class for {@link IValidator}s. This class is thread-safe and therefore it is
- * safe to share validators across sessions/threads.
- * <p>
- * Error messages can be registered by calling one of the error (<code>IValidatable</code>)
- * overloads. By default this class will skip validation if the {@link IValidatable#getValue()}
- * returns <code>null</code>. Validators that wish to validate the <code>null</code> value need to
- * override {@link #validateOnNullValue()} and return <code>true</code>.
- *
- * FIXME 7.0 remove
- *
- * @author Jonathan Locke
- * @author Eelco Hillenius
- * @author Igor Vaynberg (ivaynberg)
- * @param <T>
- * type of validatable
- * @since 1.2.6
- * @deprecated with changes to {@link ValidationError} in 6.0 this class serves very little purpose.
- * Validators should implement {@link IValidator} directly and extend {@link Behavior}
- * where needed.
- *
- *
- */
-@Deprecated
-public abstract class AbstractValidator<T> extends Behavior
- implements
- INullAcceptingValidator<T>,
- IClusterable
-{
- private static final long serialVersionUID = 1L;
-
- /**
- * Indicates whether or not to validate the value if it is <code>null</code>. It is usually
- * desirable to skip validation if the value is <code>null</code>, unless we want to make sure
- * the value is in fact <code>null</code> (a rare use case). Validators that extend this and
- * wish to ensure the value is <code>null</code> should override this method and return
- * <code>true</code>.
- *
- * @return <code>true</code> to validate on <code>null</code> value, <code>false</code> to skip
- * validation on <code>null</code> value
- */
- public boolean validateOnNullValue()
- {
- return false;
- }
-
- /**
- * Validates the <code>IValidatable</code> instance.
- *
- * @param validatable
- * the given <code>IValidatable</code> instance
- */
- protected abstract void onValidate(IValidatable<T> validatable);
-
- /**
- * @see IValidator#validate(IValidatable)
- */
- @Override
- public final void validate(IValidatable<T> validatable)
- {
- if (validatable.getValue() != null || validateOnNullValue())
- {
- onValidate(validatable);
- }
- }
-
- /**
- * Reports an error against an <code>IValidatable</code> instance using the <code>Map</code>
- * returned by {@link #variablesMap(IValidatable)} for variable interpolations and the message
- * resource key returned by {@link #resourceKey()}.
- *
- * @param validatable
- * the <code>IValidatable</code> instance being validated
- *
- */
- public void error(final IValidatable<T> validatable)
- {
- error(validatable, resourceKey(), variablesMap(validatable));
- }
-
- /**
- * Reports an error against an <code>IValidatable</code> instance using the <code>Map</code>
- * returned by {@link #variablesMap(IValidatable)} for variable interpolations and the given
- * message resource key.
- *
- * @param validatable
- * the <code>IValidatable</code> instance being validated
- * @param resourceKey
- * the message resource key to use
- *
- */
- public void error(final IValidatable<T> validatable, String resourceKey)
- {
- if (resourceKey == null)
- {
- throw new IllegalArgumentException("Argument [[resourceKey]] cannot be null");
- }
- error(validatable, resourceKey, variablesMap(validatable));
- }
-
- /**
- * Reports an error against an <code>IValidatable</code> instance using the given
- * <code>Map</code> for variable interpolations and message resource key provided by
- * {@link #resourceKey()}.
- *
- * @param validatable
- * the <code>IValidatable</code> instance being validated
- * @param vars
- * <code>Map</code> of variables for variable interpolation
- */
- public void error(final IValidatable<T> validatable, final Map<String, Object> vars)
- {
- if (vars == null)
- {
- throw new IllegalArgumentException("Argument [[vars]] cannot be null");
- }
- error(validatable, resourceKey(), vars);
- }
-
- /**
- * Reports an error against an <code>IValidatable</code> instance using the given message
- * resource key and <code>Map</code> for variable interpolations.
- *
- * @param validatable
- * the <code>IValidatable</code> instance being validated
- * @param resourceKey
- * the message resource key to use
- * @param vars
- * <code>Map</code> of variables for variable interpolation
- */
- public void error(final IValidatable<T> validatable, final String resourceKey,
- Map<String, Object> vars)
- {
- if (validatable == null)
- {
- throw new IllegalArgumentException("Argument [[validatable]] cannot be null");
- }
- if (vars == null)
- {
- throw new IllegalArgumentException("Argument [[vars]] cannot be null");
- }
- if (resourceKey == null)
- {
- throw new IllegalArgumentException("Argument [[resourceKey]] cannot be null");
- }
-
-
- ValidationError error = new ValidationError().addKey(resourceKey);
- final String defaultKey = Classes.simpleName(getClass());
- if (!resourceKey.equals(defaultKey))
- {
- error.addKey(defaultKey);
- }
-
- error.setVariables(vars);
- validatable.error(error);
- }
-
- /**
- * Gets the message resource key for this validator's error message from the
- * <code>ApplicationSettings</code> class.
- *
- * <strong>NOTE</strong>: THIS METHOD SHOULD NEVER RETURN <code>null</code>.
- *
- * @return the message resource key for this validator
- */
- protected String resourceKey()
- {
- return Classes.simpleName(getClass());
- }
-
- /**
- * Gets the default <code>Map</code> of variables.
- *
- * <strong>NOTE</strong>: THIS METHOD SHOULD NEVER RETURN <code>null</code>.
- *
- * @param validatable
- * the <code>IValidatable</code> instance being validated
- *
- * @return a <code>Map</code> of variables for variable interpolation
- */
- protected Map<String, Object> variablesMap(IValidatable<T> validatable)
- {
- return new HashMap<String, Object>(1);
- }
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/f072c507/wicket-core/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java
index 1240e85..24c4c54 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java
@@ -21,6 +21,7 @@ import org.apache.wicket.MarkupContainer;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.util.resource.IResourceStream;
+import org.apache.wicket.util.resource.StringResourceStream;
import org.junit.Before;
import org.junit.Test;
@@ -50,7 +51,7 @@ public class MarkupCacheTest extends WicketTestCase
});
component = new MarkupCachingAssumingComponent("panel");
- tester.startComponent(component);
+ tester.startComponentInPage(component);
}
/**
@@ -60,10 +61,10 @@ public class MarkupCacheTest extends WicketTestCase
public void markupNotFoundInformationIsCachedInDeploymentMode()
{
IMarkupFragment markup = cache.getMarkup(component, null, false);
- assertNull(markup);
+ assertNotNull(markup);
markup = cache.getMarkup(component, null, false);
- assertNull(markup);
+ assertNotNull(markup);
}
/**
@@ -105,7 +106,7 @@ public class MarkupCacheTest extends WicketTestCase
if (firstCall)
{
firstCall = false;
- return null;
+ return new StringResourceStream("<wicket:panel><div></div></wicket:panel>");
}
fail("Markup should be cached");
throw new IllegalStateException();
http://git-wip-us.apache.org/repos/asf/wicket/blob/f072c507/wicket-core/src/test/java/org/apache/wicket/resource/loader/ValidatorStringResourceLoaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/loader/ValidatorStringResourceLoaderTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/loader/ValidatorStringResourceLoaderTest.java
index 6302c8e..cca3a9a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/loader/ValidatorStringResourceLoaderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/loader/ValidatorStringResourceLoaderTest.java
@@ -34,7 +34,6 @@ import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidator;
import org.apache.wicket.validation.ValidationError;
-import org.apache.wicket.validation.validator.AbstractValidator;
import org.junit.Test;
/**
@@ -108,10 +107,10 @@ public class ValidatorStringResourceLoaderTest extends WicketTestCase
}
}
- private static class ClassValidator extends AbstractValidator<String>
+ private static class ClassValidator implements IValidator<String>
{
@Override
- protected void onValidate(IValidatable<String> validatable)
+ public void validate(IValidatable<String> validatable)
{
ValidationError error = new ValidationError();
error.addKey("testError");
http://git-wip-us.apache.org/repos/asf/wicket/blob/f072c507/wicket-core/src/test/java/org/apache/wicket/stateless/ImageStatelessTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/ImageStatelessTest.java b/wicket-core/src/test/java/org/apache/wicket/stateless/ImageStatelessTest.java
index 7b285d1..f733a40 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/ImageStatelessTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/ImageStatelessTest.java
@@ -16,10 +16,15 @@
*/
package org.apache.wicket.stateless;
+import org.apache.wicket.MarkupContainer;
import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.markup.IMarkupResourceStreamProvider;
+import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.request.resource.ByteArrayResource;
import org.apache.wicket.request.resource.PackageResourceReference;
+import org.apache.wicket.util.resource.IResourceStream;
+import org.apache.wicket.util.resource.StringResourceStream;
import org.junit.Test;
/**
@@ -33,8 +38,10 @@ public class ImageStatelessTest extends WicketTestCase
@Test
public void resourceReference()
{
+ ImageStatelessPage page = new ImageStatelessPage();
final Image i = new Image("test", new PackageResourceReference("test"));
- tester.startComponent(i);
+ page.add(i);
+ tester.startPage(page);
assertTrue("image with resource reference should be stateless", i.isStateless());
}
@@ -44,8 +51,20 @@ public class ImageStatelessTest extends WicketTestCase
@Test
public void resource()
{
+ ImageStatelessPage page = new ImageStatelessPage();
final Image i = new Image("test", new ByteArrayResource("text/text", new byte[0]));
- tester.startComponent(i);
- assertTrue("image with resource should be statefull", !i.isStateless());
+ page.add(i);
+ tester.startPage(page);
+ assertTrue("image with resource should be stateful", !i.isStateless());
+ }
+
+ private static class ImageStatelessPage extends WebPage implements IMarkupResourceStreamProvider
+ {
+
+ @Override
+ public IResourceStream getMarkupResourceStream(MarkupContainer container, Class<?> containerClass)
+ {
+ return new StringResourceStream("<html><body><img wicket:id='test'/></body></html>");
+ }
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/f072c507/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionSizeModel.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionSizeModel.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionSizeModel.java
index 7cc3026..a1ae31a 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionSizeModel.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionSizeModel.java
@@ -36,17 +36,6 @@ public class SessionSizeModel extends AbstractReadOnlyModel<Bytes>
{
}
- /**
- * Constructor that calculates the size of the passed Session.
- *
- * @param ignored
- * the session which size to measure. Ignored.
- */
- @Deprecated
- public SessionSizeModel(@SuppressWarnings("unused")Session ignored)
- {
- }
-
@Override
public Bytes getObject()
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/f072c507/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.java
index 612041a..d68d64f 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.java
@@ -46,7 +46,7 @@ public final class SessionView extends DevUtilsPanel
add(new Label("id", session.getId()));
add(new Label("locale", session.getLocale().toString()));
add(new Label("style", session.getStyle() == null ? "[None]" : session.getStyle()));
- add(new Label("size", new SessionSizeModel(session)));
+ add(new Label("size", new SessionSizeModel()));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/f072c507/wicket-devutils/src/test/java/org/apache/wicket/devutils/inspector/SessionSizeModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/test/java/org/apache/wicket/devutils/inspector/SessionSizeModelTest.java b/wicket-devutils/src/test/java/org/apache/wicket/devutils/inspector/SessionSizeModelTest.java
index a5e7141..6e310c5 100644
--- a/wicket-devutils/src/test/java/org/apache/wicket/devutils/inspector/SessionSizeModelTest.java
+++ b/wicket-devutils/src/test/java/org/apache/wicket/devutils/inspector/SessionSizeModelTest.java
@@ -43,7 +43,7 @@ public class SessionSizeModelTest extends TestCase
return new TestSession(request);
}
});
- SessionSizeModel model = new SessionSizeModel(tester.getSession());
+ SessionSizeModel model = new SessionSizeModel();
assertEquals(null, model.getObject());
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/f072c507/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/StatelessCheckerTest.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/StatelessCheckerTest.java b/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/StatelessCheckerTest.java
index 25cc12b..d710a91 100644
--- a/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/StatelessCheckerTest.java
+++ b/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/StatelessCheckerTest.java
@@ -94,6 +94,6 @@ public class StatelessCheckerTest extends TestCase
public void testPositive()
{
tester.getApplication().getComponentPostOnBeforeRenderListeners().add(checker);
- tester.startComponent(new StatelessLabel("foo"));
+ tester.startComponentInPage(new StatelessLabel("foo"));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/f072c507/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.java
index 48c077f..93f5a09 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.java
@@ -94,22 +94,7 @@ public class PropertyColumn<T, S> extends AbstractColumn<T, S> implements IExpor
public void populateItem(final Item<ICellPopulator<T>> item, final String componentId,
final IModel<T> rowModel)
{
- item.add(new Label(componentId, createLabelModel(rowModel)));
- }
-
- /**
- * Factory method for generating a model that will generated the displayed value. Typically the
- * model is a property model using the {@link #propertyExpression} specified in the constructor.
- *
- * @param rowModel
- * @return model
- * @deprecated
- * since 6.2.0, scheduled for removal in 7.0.0. Please use {@link #getDataModel(org.apache.wicket.model.IModel)}
- * instead.
- */
- protected IModel<?> createLabelModel(final IModel<T> rowModel)
- {
- return getDataModel(rowModel);
+ item.add(new Label(componentId, getDataModel(rowModel)));
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/f072c507/wicket-util/src/main/java/org/apache/wicket/util/ClassProvider.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/ClassProvider.java b/wicket-util/src/main/java/org/apache/wicket/util/ClassProvider.java
deleted file mode 100644
index 4d5f44b..0000000
--- a/wicket-util/src/main/java/org/apache/wicket/util/ClassProvider.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.util;
-
-import java.lang.ref.WeakReference;
-
-/**
- * A {@link IProvider provider} which holds a reference to a {@link Class class} in a
- * {@link WeakReference} so that it can be collected by the GC when needed
- *
- * @param <T>
- * the type of the class
- * @deprecated Use org.apache.wicket.util.reference.ClassReference instead
- */
-@Deprecated
-public class ClassProvider<T> implements IProvider<Class<T>>
-{
- private final WeakReference<Class<T>> classRef;
-
- /**
- * Construct.
- *
- * @param clazz
- */
- public ClassProvider(final Class<T> clazz)
- {
- classRef = new WeakReference<Class<T>>(clazz);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Class<T> get()
- {
- return classRef.get();
- }
-
- /**
- * Creates a provider for the specified class
- *
- * @param <T>
- * type of value
- * @param clazz
- * the class to provide
- * @return provider
- */
- public static <T> ClassProvider<T> of(final Class<T> clazz)
- {
- return new ClassProvider<T>(clazz);
- }
-}