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/12/21 13:42:52 UTC
[wicket] branch WICKET-6915-upgrade-to-fileupload2 updated (c4c2fc1 -> c07d829)
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a change to branch WICKET-6915-upgrade-to-fileupload2
in repository https://gitbox.apache.org/repos/asf/wicket.git.
discard c4c2fc1 WICKET-6915 Remove unused import of javax.servlet.http.HttpServletRequest
discard 1f321ec WICKET-6915 Upgrade to commons-fileupload:2.0-SNAPSHOT
add 395778f WICKET-6913 Interceptor must be public
add 1255320 Update Mockito to 3.12.1
add 8d030d2 WICKET-6916 replace proxies with StandardMBean
add 6238623 Small logging improvements to JMX Initializer
add d9275ce WICKET-6913 move package private
add 7fb9fa5 WICKET-6913 use pipe
add 8939f13 WICKET-6911 refacture into factories
add d48d4a9 Update Mockito to 3.12.4
add e7aeb82 WICKET-6913 Add generic type to IProxyFactory#createProxy()
add d1b17b5 INFRA-22281 Test build on ci2.a.o (Buildbot 3.x)
add 32c8b9e INFRA-22281 Test build on ci2.a.o (Buildbot 3.x)
add 5373dc6 INFRA-22046 Test deploying to https://nightlies.apache.org with rsync from GitHub Actions
add 39f04b7 Revert "INFRA-22046 Test deploying to https://nightlies.apache.org with rsync from GitHub Actions"
add d09cc01 Bump SLF4J to 2.0.0-alpha5
add 7ae1c65 INFRA-22281 Test build on ci2.a.o (Buildbot 3.x)
add f45b97f WICKET-6918 Update the version to 10.0.0
add ecafdee WICKET-6919 Improve EnclosureContainer's javadoc to explain that it should not be used with <wicket:enclosure>
add f9539f6 WICKET-6920 Improve the examples to use the browser's light/dark mode
add 4942df6 WICKET-6920 Improve the examples to use the browser's light/dark mode
add 8366eb3 Bump JUnit to 5.8.0
add e8066ac Use the ROOT locale when parsing the date in WicketFilterTest
add cd29762 Optimize imports
add 9bfb779 WICKET-6921 Avoid updating hidden forms (#478)
add 6a7e4c3 Update JUnit, maven-javadoc-plugin and maven-war-plugin
add c490584 Remove useless javadoc
add b6e313c Bump japicmp to 0.15.4
add 1176afb Bump Mockito to 4.0.0
add 7d60d97 WICKET-6924 Allow image/avif in SecurePackageResourceGuard
add 475f5e8 WICKET-6925 Deprecate AbstractWrapModel
add cf3715a WICKET-6925 Remove AbstractWrapModel
add 740237b Bump Jetty to 11.0.7 and Spring to 5.3.11
add 9d74a88 WICKET-6927 Get rid of java.security.AccessController
add 7c68a15 JDK 17 is stable since a month
add 2e4ddf5 INFRA-22281 Trigger build
add 7f9e289 INFRA-22281 Trigger build
add fcec670 Change wrong 'to determinate' into correct 'to determine' (#480)
add f707376 WICKET-6930: This commit adds: 1) allow to skip sending empty WS messages 2) pass page class as a kind of context that can be used to send a web socket to different pages + example of updating a component in a given page (not dependent on page ID)
add d95a3c5 WICKET-6933 use separate key for the default instance
add 191de98 Remove 'final' modifier from a static field
add 128125f Simplify the test for Strings#stripJSessionId()
add 210cbe5 [WICKET-6935] several minor datatable improvements
add 858bb2a WICKET-6936 allow alternative read and write
add 79f74d5 Fix spelling in user guide
add 517a546 Update ASM, Assertj, ByteBuddy, Logback, Metrics, Mockito and Spring
add 17fa392 WICKET-6937 Update the keystore used by the quickstart application
add 920aa6c WICKET-6937 maven-resources-plugin should not filter the keystore file
add e10bc82 WICKET-6937 Few more updates of keystore file name
add 15e4c01 WICKET-6937 Fix a comment
add 3ea6ff9 WICKET-6937 Use JKS keystore
add 232ef21 Update Maven plugins if there are non-Milestone releases
add 51cf3c7 Specify version for Maven plugins where it was missing
add 33ae089 Update Node.js to 16 and NPM to 8
add 2fb3386 Update some dependencies
add 316753f Update Asciidoctor dependencies used for generating the user guide
add 3200a7c WICKET-6904 Make Apache Wicket fully supporting Java9+ module system
add 53e0518 Fix typos in javadoc
add 9e0e424 Update JUnit to 5.8.2
add 0ad7549 Bump maven-bundle-plugin to 5.1.3
add 65ea4ce Fix the setup of WebSocket support in StartExamples
add 40e4e25 Do not resolve the WebSocket IKey twice
add 0fdb24b Minor non-functional improvements/cleanups
new 47d87a2 WICKET-6915 Upgrade to commons-fileupload:2.0-SNAPSHOT
new c07d829 WICKET-6915 Remove unused import of javax.servlet.http.HttpServletRequest
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (c4c2fc1)
\
N -- N -- N refs/heads/WICKET-6915-upgrade-to-fileupload2 (c07d829)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
archetypes/quickstart/pom.xml | 1 +
.../archetype-resources/src/test/java/Start.java | 4 +-
.../src/test/jetty/jetty-ssl.xml | 21 +
.../src/test/resources/keystore | Bin 1481 -> 3954 bytes
pom.xml | 57 +-
testing/wicket-arquillian/pom.xml | 2 -
testing/wicket-common-tests/pom.xml | 52 +-
testing/wicket-js-tests/package-lock.json | 5794 +++++++++++++++++++-
testing/wicket-js-tests/pom.xml | 6 +-
testing/wicket-threadtest/pom.xml | 1 -
.../AuthenticatedWebApplication.java | 9 -
.../authentication/AuthenticatedWebSession.java | 2 +-
.../authentication/panel/SignInPanel.java | 5 +-
wicket-bean-validation/pom.xml | 11 +
wicket-core/pom.xml | 1 +
.../apache/wicket/DefaultPageManagerProvider.java | 25 +-
.../src/main/java/org/apache/wicket/Page.java | 3 +-
.../org/apache/wicket/ajax/json/JSONFunction.java | 2 +-
.../authentication/IAuthenticationStrategy.java | 2 +-
.../core/request/handler/IPageRequestHandler.java | 2 +-
.../apache/wicket/csp/CSPRequestCycleListener.java | 2 +-
.../wicket/csp/ContentSecurityPolicySettings.java | 5 +-
.../org/apache/wicket/feedback/FeedbackDelay.java | 2 +-
.../wicket/markup/head/AbstractCspHeaderItem.java | 2 +-
.../markup/html/SecurePackageResourceGuard.java | 1 +
.../markup/html/basic/EnclosureContainer.java | 12 +-
.../html/panel/DefaultMarkupSourcingStrategy.java | 2 +-
.../org/apache/wicket/model/AbstractWrapModel.java | 56 -
.../java/org/apache/wicket/model/IWrapModel.java | 25 +-
.../java/org/apache/wicket/page/IPageManager.java | 2 +-
.../org/apache/wicket/page/PartialPageUpdate.java | 8 +
.../org/apache/wicket/pageStore/FilePageStore.java | 114 +-
.../wicket/pageStore/InSessionPageStore.java | 5 +-
.../http/MultipartFormComponentListener.java | 20 +-
.../wicket/protocol/http/WebApplication.java | 7 -
wicket-core/src/main/resources/META-INF/wicket.xsd | 2 +-
.../apache/wicket/pageStore/FilePageStoreTest.java | 1 -
.../http/MultipartFormComponentListenerPage.html | 5 +-
.../http/MultipartFormComponentListenerPage.java | 9 +
.../http/MultipartFormComponentListenerTest.java | 12 +-
.../wicket/protocol/http/WicketFilterTest.java | 13 +-
wicket-examples/pom.xml | 3 +
.../examples/ajax/builtin/AutoCompletePage.java | 3 +-
.../apache/wicket/examples/websocket/HomePage.html | 1 +
.../examples/websocket/JSR356Application.java | 12 +-
.../wicket/examples/websocket/JSR356Session.java | 66 +
.../websocket/WebSocketBehaviorDemoPage.java | 2 -
.../WebSocketMultiTabResourceDemoPage.java | 2 -
.../WebSocketPushUpdateProgressDemoPage.html} | 8 +-
...va => WebSocketPushUpdateProgressDemoPage.java} | 8 +-
.../websocket/WebSocketResourceDemoPage.java | 2 -
.../websocket/progress/ProgressBarTogglePanel.html | 14 +-
.../websocket/progress/ProgressBarTogglePanel.java | 111 +
.../websocket/progress/ProgressUpdater.java | 177 +
.../resources/org/apache/wicket/examples/style.css | 7 +-
.../org/apache/wicket/examples/StartExamples.java | 11 +-
.../ajax/markup/html/AjaxEditableChoiceLabel.java | 5 +-
.../autocomplete/AbstractAutoCompleteRenderer.java | 4 +-
.../html/autocomplete/AutoCompleteTextField.java | 2 +-
.../autocomplete/StringAutoCompleteRenderer.java | 2 +-
.../data/table/AjaxFallbackDefaultDataTable.java | 11 +-
.../repeater/data/table/NavigationToolbar.java | 17 +-
.../html/repeater/data/table/NavigatorLabel.java | 8 +-
wicket-ioc/src/main/java/module-info.java | 1 -
.../org/apache/wicket/proxy/IProxyFactory.java | 21 +-
.../apache/wicket/proxy/IProxyTargetLocator.java | 2 +-
.../apache/wicket/proxy/LazyInitProxyFactory.java | 395 +-
.../proxy/bytebuddy/ByteBuddyInterceptor.java | 112 +
.../proxy/bytebuddy/ByteBuddyProxyFactory.java | 213 +
.../apache/wicket/proxy/jdk/JdkProxyFactory.java | 198 +
.../wicket/proxy/objenesis/IInstantiator.java | 45 +-
.../objenesis/ObjenesisByteBuddyInterceptor.java | 39 -
.../proxy/objenesis/ObjenesisInstantiator.java | 74 +-
.../proxy/objenesis/ObjenesisProxyFactory.java | 35 -
.../proxy/objenesis/ObjenesisProxyReplacement.java | 55 -
.../wicket/proxy/LazyInitProxyFactoryTest.java | 107 +-
.../PackagePrivateConcreteObject.java | 4 +-
.../proxy/packageprivate/PackagePrivateTest.java | 109 +
.../{IInterface.java => NoDefaultConstructor.java} | 15 +-
wicket-jmx/pom.xml | 8 -
wicket-jmx/src/main/java/module-info.java | 1 -
.../java/org/apache/wicket/jmx/Initializer.java | 172 +-
.../ws/api/AbstractWebSocketConnection.java | 2 +-
.../ws/api/AbstractWebSocketProcessor.java | 36 +-
.../protocol/ws/api/BaseWebSocketBehavior.java | 14 +-
.../protocol/ws/api/WebSocketPushBroadcaster.java | 68 +
.../protocol/ws/api/WebSocketRequestHandler.java | 17 +-
.../api/registry/{IKey.java => AbstractKey.java} | 21 +-
.../wicket/protocol/ws/api/registry/IKey.java | 8 +-
.../api/registry/IWebSocketConnectionRegistry.java | 26 +-
.../wicket/protocol/ws/api/registry/PageIdKey.java | 13 +-
.../protocol/ws/api/registry/ResourceNameKey.java | 8 +-
.../ws/api/registry/ResourceNameTokenKey.java | 9 +-
.../SimpleWebSocketConnectionRegistry.java | 32 +-
.../ws/api/res/js/wicket-websocket-jquery.js | 4 +
.../ws/api/res/js/wicket-websocket-setup.js.tmpl | 2 +-
.../ws/util/tester/TestWebSocketProcessor.java | 17 +-
.../util/tester/WebSocketTesterBehaviorTest.java | 2 +-
.../wicket-native-websocket-javax/pom.xml | 11 +
.../ws/javax/JavaxWebSocketConnection.java | 2 +-
.../wicket/protocol/ws/javax/WicketEndpoint.java | 1 -
.../ws/javax/WicketServerEndpointConfig.java | 2 +-
wicket-request/pom.xml | 6 +-
wicket-spring/pom.xml | 4 -
wicket-user-guide/pom.xml | 23 +-
.../src/main/asciidoc/forms2/forms2_9.adoc | 2 +-
.../src/main/asciidoc/i18n/i18n_5.adoc | 2 +-
wicket-user-guide/src/main/asciidoc/jee/jee_4.adoc | 7 +
.../main/asciidoc/keepControl/keepControl_1.adoc | 6 +-
.../main/asciidoc/modelsforms/modelsforms_7.adoc | 2 +-
wicket-util/pom.xml | 4 -
.../org/apache/wicket/util/string/Strings.java | 23 +-
.../org/apache/wicket/util/string/StringsTest.java | 33 -
wicket-velocity/pom.xml | 4 -
114 files changed, 7609 insertions(+), 1189 deletions(-)
delete mode 100644 wicket-core/src/main/java/org/apache/wicket/model/AbstractWrapModel.java
create mode 100644 wicket-examples/src/main/java/org/apache/wicket/examples/websocket/JSR356Session.java
copy wicket-examples/src/main/java/org/apache/wicket/examples/{frames/TopFrame.html => websocket/WebSocketPushUpdateProgressDemoPage.html} (68%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/websocket/{HomePage.java => WebSocketPushUpdateProgressDemoPage.java} (70%)
copy wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.html => wicket-examples/src/main/java/org/apache/wicket/examples/websocket/progress/ProgressBarTogglePanel.html (83%)
create mode 100644 wicket-examples/src/main/java/org/apache/wicket/examples/websocket/progress/ProgressBarTogglePanel.java
create mode 100644 wicket-examples/src/main/java/org/apache/wicket/examples/websocket/progress/ProgressUpdater.java
copy wicket-core/src/test/java/org/apache/wicket/MyPage2.java => wicket-ioc/src/main/java/org/apache/wicket/proxy/IProxyFactory.java (72%)
create mode 100644 wicket-ioc/src/main/java/org/apache/wicket/proxy/bytebuddy/ByteBuddyInterceptor.java
create mode 100644 wicket-ioc/src/main/java/org/apache/wicket/proxy/bytebuddy/ByteBuddyProxyFactory.java
create mode 100644 wicket-ioc/src/main/java/org/apache/wicket/proxy/jdk/JdkProxyFactory.java
copy wicket-core/src/test/java/org/apache/wicket/markup/html/form/PrimitiveTypeRequiredTest.java => wicket-ioc/src/main/java/org/apache/wicket/proxy/objenesis/IInstantiator.java (53%)
delete mode 100644 wicket-ioc/src/main/java/org/apache/wicket/proxy/objenesis/ObjenesisByteBuddyInterceptor.java
copy wicket-cdi/src/main/java/org/apache/wicket/cdi/AbstractInjector.java => wicket-ioc/src/main/java/org/apache/wicket/proxy/objenesis/ObjenesisInstantiator.java (64%)
delete mode 100644 wicket-ioc/src/main/java/org/apache/wicket/proxy/objenesis/ObjenesisProxyFactory.java
delete mode 100644 wicket-ioc/src/main/java/org/apache/wicket/proxy/objenesis/ObjenesisProxyReplacement.java
rename wicket-ioc/src/test/java/org/apache/wicket/proxy/{ => packageprivate}/PackagePrivateConcreteObject.java (91%)
create mode 100644 wicket-ioc/src/test/java/org/apache/wicket/proxy/packageprivate/PackagePrivateTest.java
copy wicket-ioc/src/test/java/org/apache/wicket/proxy/util/{IInterface.java => NoDefaultConstructor.java} (84%)
copy wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/registry/{IKey.java => AbstractKey.java} (78%)
[wicket] 01/02: WICKET-6915 Upgrade to commons-fileupload:2.0-SNAPSHOT
Posted by mg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch WICKET-6915-upgrade-to-fileupload2
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 47d87a247322282325b6bbe613d940dcd29c90a5
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Fri Aug 20 11:59:47 2021 +0300
WICKET-6915 Upgrade to commons-fileupload:2.0-SNAPSHOT
---
pom.xml | 24 +++++-----
wicket-core/src/main/java/module-info.java | 2 +-
.../org/apache/wicket/markup/html/form/Form.java | 13 ++---
.../wicket/markup/html/form/upload/FileUpload.java | 3 +-
.../markup/html/form/upload/FileUploadField.java | 2 +-
.../html/form/upload/MultiFileUploadField.java | 2 +-
.../wicket/protocol/http/IMultipartWebRequest.java | 2 +-
.../protocol/http/mock/MockHttpServletRequest.java | 2 +-
.../http/servlet/MultipartServletWebRequest.java | 4 +-
.../servlet/MultipartServletWebRequestImpl.java | 55 +++++++++-------------
.../protocol/http/servlet/ServletPartFileItem.java | 6 +--
.../protocol/http/servlet/ServletWebRequest.java | 8 ++--
.../markup/html/form/upload/FileUploadTest.java | 9 ++--
.../examples/ajax/builtin/FileUploadPage.java | 2 +-
wicket-extensions/src/main/java/module-info.java | 2 +-
.../extensions/ajax/AjaxFileDropBehavior.java | 4 +-
.../html/form/upload/UploadStatusResource.java | 2 +-
wicket-util/pom.xml | 9 ++--
wicket-util/src/main/java/module-info.java | 2 +-
19 files changed, 67 insertions(+), 86 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5dec096..15190fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@
<cdi-unit.version>4.1.0</cdi-unit.version>
<commons-collections.version>3.2.2</commons-collections.version>
<commons-collections4.version>4.4</commons-collections4.version>
- <commons-fileupload.version>1.4</commons-fileupload.version>
+ <commons-fileupload.version>2.0-SNAPSHOT</commons-fileupload.version>
<commons-io.version>2.11.0</commons-io.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
<guice.version>5.0.1</guice.version>
@@ -282,17 +282,6 @@
<version>${commons-collections.version}</version>
</dependency>
<dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>${commons-fileupload.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
@@ -330,6 +319,17 @@
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2</artifactId>
+ <version>${commons-fileupload.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>
diff --git a/wicket-core/src/main/java/module-info.java b/wicket-core/src/main/java/module-info.java
index 9c6dc2a..cfeed62 100644
--- a/wicket-core/src/main/java/module-info.java
+++ b/wicket-core/src/main/java/module-info.java
@@ -23,7 +23,7 @@ module org.apache.wicket.core {
requires org.apache.wicket.request;
requires org.apache.commons.io;
requires org.apache.commons.collections4;
- requires commons.fileupload;
+ requires commons.fileupload2;
requires org.slf4j;
requires jakarta.servlet;
requires org.danekja.jdk.serializable.functional;
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
index 249083c..bf5dbbe 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
@@ -25,9 +25,9 @@ import java.util.Locale;
import java.util.Map;
import jakarta.servlet.http.HttpServletRequest;
-
-import org.apache.commons.fileupload.FileUploadBase;
-import org.apache.commons.fileupload.FileUploadException;
+import org.apache.commons.fileupload2.FileUploadException;
+import org.apache.commons.fileupload2.pub.FileSizeLimitExceededException;
+import org.apache.commons.fileupload2.pub.SizeLimitExceededException;
import org.apache.wicket.Component;
import org.apache.wicket.IGenericComponent;
import org.apache.wicket.IRequestListener;
@@ -1496,12 +1496,12 @@ public class Form<T> extends WebMarkupContainer
protected void onFileUploadException(final FileUploadException e,
final Map<String, Object> model)
{
- if (e instanceof FileUploadBase.SizeLimitExceededException)
+ if (e instanceof SizeLimitExceededException)
{
String msg = getString(UPLOAD_TOO_LARGE_RESOURCE_KEY, Model.ofMap(model));
error(msg);
}
- else if (e instanceof FileUploadBase.FileSizeLimitExceededException)
+ else if (e instanceof FileSizeLimitExceededException)
{
String msg = getString(UPLOAD_SINGLE_FILE_TOO_LARGE_RESOURCE_KEY, Model.ofMap(model));
error(msg);
@@ -1515,9 +1515,6 @@ public class Form<T> extends WebMarkupContainer
}
}
- /**
- * @see org.apache.wicket.Component#internalOnModelChanged()
- */
@Override
protected void internalOnModelChanged()
{
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java
index 4e662f4..39b6a7b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java
@@ -24,8 +24,7 @@ import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.wicket.util.io.IClusterable;
+import org.apache.commons.fileupload2.FileItem;
import org.apache.wicket.Session;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.request.cycle.RequestCycle;
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java
index 5a8f288..93f392d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java
@@ -20,7 +20,7 @@ package org.apache.wicket.markup.html.form.upload;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload2.FileItem;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.model.IModel;
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
index 252b39c..353ef54 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
@@ -23,7 +23,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload2.FileItem;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/IMultipartWebRequest.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/IMultipartWebRequest.java
index a25c92c..36f9f50 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/IMultipartWebRequest.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/IMultipartWebRequest.java
@@ -19,7 +19,7 @@ package org.apache.wicket.protocol.http;
import java.util.List;
import java.util.Map;
-import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload2.FileItem;
/**
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java
index bb32ee1..8d315e3 100755
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java
@@ -57,7 +57,7 @@ import jakarta.servlet.http.HttpSession;
import jakarta.servlet.http.HttpUpgradeHandler;
import jakarta.servlet.http.Part;
-import org.apache.commons.fileupload.FileUploadBase;
+import org.apache.commons.fileupload2.FileUploadBase;
import org.apache.wicket.Application;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.mock.MockRequestParameters;
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.java
index 29bc91b..4c2d5dd 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.java
@@ -21,8 +21,8 @@ import java.util.Map;
import jakarta.servlet.http.HttpServletRequest;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileUploadException;
+import org.apache.commons.fileupload2.FileItem;
+import org.apache.commons.fileupload2.FileUploadException;
import org.apache.wicket.protocol.http.IMultipartWebRequest;
import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.Url;
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java
index cc27c4e..294faf1 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java
@@ -18,7 +18,6 @@ package org.apache.wicket.protocol.http.servlet;
import java.io.IOException;
import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -26,16 +25,16 @@ import java.util.List;
import java.util.Map;
import jakarta.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.Part;
-
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileItemFactory;
-import org.apache.commons.fileupload.FileUploadBase;
-import org.apache.commons.fileupload.FileUploadException;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.apache.commons.fileupload.servlet.ServletRequestContext;
+import org.apache.commons.fileupload2.FileItem;
+import org.apache.commons.fileupload2.FileItemFactory;
+import org.apache.commons.fileupload2.FileUploadBase;
+import org.apache.commons.fileupload2.FileUploadException;
+import org.apache.commons.fileupload2.disk.DiskFileItemFactory;
+import org.apache.commons.fileupload2.jaksrvlt.JakSrvltFileUpload;
+import org.apache.commons.fileupload2.jaksrvlt.JakSrvltRequestContext;
+import org.apache.commons.fileupload2.pub.FileSizeLimitExceededException;
import org.apache.commons.io.FileCleaningTracker;
import org.apache.wicket.Application;
import org.apache.wicket.WicketRuntimeException;
@@ -91,7 +90,7 @@ public class MultipartServletWebRequestImpl extends MultipartServletWebRequest
* Thrown if something goes wrong with upload
*/
public MultipartServletWebRequestImpl(HttpServletRequest request, String filterPrefix,
- Bytes maxSize, String upload) throws FileUploadException
+ Bytes maxSize, String upload) throws FileUploadException
{
this(request, filterPrefix, maxSize, upload, new DiskFileItemFactory()
{
@@ -135,12 +134,11 @@ public class MultipartServletWebRequestImpl extends MultipartServletWebRequest
files = new HashMap<>();
// Check that request is multipart
- // FIXME Wicket 10 This needs a new release of Commons FileUpload (https://issues.apache.org/jira/browse/FILEUPLOAD-309)
- final boolean isMultipart = ServletFileUpload.isMultipartContent(request);
+ final boolean isMultipart = JakSrvltFileUpload.isMultipartContent(request);
if (!isMultipart)
{
throw new IllegalStateException(
- "ServletRequest does not contain multipart content. One possible solution is to explicitly call Form.setMultipart(true), Wicket tries its best to auto-detect multipart forms but there are certain situation where it cannot.");
+ "ServletRequest does not contain multipart content. One possible solution is to explicitly call Form.setMultipart(true), Wicket tries its best to auto-detect multipart forms but there are certain situations where it cannot.");
}
setMaxSize(maxSize);
@@ -149,7 +147,7 @@ public class MultipartServletWebRequestImpl extends MultipartServletWebRequest
@Override
public void parseFileParts() throws FileUploadException
{
- HttpServletRequest request = new javax.servlet.http.HttpServletRequest.Impl(getContainerRequest());
+ HttpServletRequest request = getContainerRequest();
// The encoding that will be used to decode the string parameters
// It should NOT be null at this point, but it may be
@@ -170,7 +168,7 @@ public class MultipartServletWebRequestImpl extends MultipartServletWebRequest
if (wantUploadProgressUpdates())
{
- ServletRequestContext ctx = new ServletRequestContext(request)
+ JakSrvltRequestContext ctx = new JakSrvltRequestContext(request)
{
@Override
public InputStream getInputStream() throws IOException
@@ -194,7 +192,7 @@ public class MultipartServletWebRequestImpl extends MultipartServletWebRequest
{
// try to parse the file uploads by using Apache Commons FileUpload APIs
// because they are feature richer (e.g. progress updates, cleaner)
- items = fileUpload.parseRequest(new ServletRequestContext(request));
+ items = fileUpload.parseRequest(new JakSrvltRequestContext(request));
if (items.isEmpty())
{
// fallback to Servlet 3.0 APIs
@@ -217,7 +215,7 @@ public class MultipartServletWebRequestImpl extends MultipartServletWebRequest
{
value = item.getString(encoding);
}
- catch (UnsupportedEncodingException e)
+ catch (IOException e)
{
throw new WicketRuntimeException(e);
}
@@ -284,7 +282,7 @@ public class MultipartServletWebRequestImpl extends MultipartServletWebRequest
*/
protected FileUploadBase newFileUpload(String encoding) {
// Configure the factory here, if desired.
- ServletFileUpload fileUpload = new ServletFileUpload(fileItemFactory);
+ JakSrvltFileUpload fileUpload = new JakSrvltFileUpload(fileItemFactory);
// set encoding specifically when we found it
if (encoding != null)
@@ -375,7 +373,7 @@ public class MultipartServletWebRequestImpl extends MultipartServletWebRequest
}
/**
- * Subclasses that want to receive upload notifications should return true. By default it takes
+ * Subclasses that want to receive upload notifications should return true. By default, it takes
* the value from {@link org.apache.wicket.settings.ApplicationSettings#isUploadProgressUpdatesEnabled()}.
*
* @return true if upload status update event should be invoked
@@ -394,7 +392,7 @@ public class MultipartServletWebRequestImpl extends MultipartServletWebRequest
{
UploadInfo info = new UploadInfo(totalBytes);
- setUploadInfo(new javax.servlet.http.HttpServletRequest.Impl(getContainerRequest()), upload, info);
+ setUploadInfo(getContainerRequest(), upload, info);
}
/**
@@ -405,7 +403,7 @@ public class MultipartServletWebRequestImpl extends MultipartServletWebRequest
*/
protected void onUploadUpdate(int bytesUploaded, int total)
{
- HttpServletRequest request = new javax.servlet.http.HttpServletRequest.Impl(getContainerRequest());
+ HttpServletRequest request = getContainerRequest();
UploadInfo info = getUploadInfo(request, upload);
if (info == null)
{
@@ -422,7 +420,7 @@ public class MultipartServletWebRequestImpl extends MultipartServletWebRequest
*/
protected void onUploadCompleted()
{
- clearUploadInfo(new javax.servlet.http.HttpServletRequest.Impl(getContainerRequest()), upload);
+ clearUploadInfo(getContainerRequest(), upload);
}
/**
@@ -446,9 +444,6 @@ public class MultipartServletWebRequestImpl extends MultipartServletWebRequest
this.in = in;
}
- /**
- * @see java.io.InputStream#read()
- */
@Override
public int read() throws IOException
{
@@ -458,9 +453,6 @@ public class MultipartServletWebRequestImpl extends MultipartServletWebRequest
return read;
}
- /**
- * @see java.io.InputStream#read(byte[])
- */
@Override
public int read(byte[] b) throws IOException
{
@@ -470,9 +462,6 @@ public class MultipartServletWebRequestImpl extends MultipartServletWebRequest
return read;
}
- /**
- * @see java.io.InputStream#read(byte[], int, int)
- */
@Override
public int read(byte[] b, int off, int len) throws IOException
{
@@ -502,7 +491,7 @@ public class MultipartServletWebRequestImpl extends MultipartServletWebRequest
if (fileMaxSize != null && fileItem.getSize() > fileMaxSize.bytes())
{
String fieldName = entry.getKey();
- FileUploadException fslex = new FileUploadBase.FileSizeLimitExceededException("The field '" +
+ FileUploadException fslex = new FileSizeLimitExceededException("The field '" +
fieldName + "' exceeds its maximum permitted size of '" +
maxSize + "' characters.", fileItem.getSize(), fileMaxSize.bytes());
throw fslex;
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletPartFileItem.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletPartFileItem.java
index 93c2ea3..69fc05e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletPartFileItem.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletPartFileItem.java
@@ -25,9 +25,9 @@ import java.util.Collection;
import jakarta.servlet.http.Part;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileItemHeaders;
-import org.apache.commons.fileupload.util.FileItemHeadersImpl;
+import org.apache.commons.fileupload2.FileItem;
+import org.apache.commons.fileupload2.FileItemHeaders;
+import org.apache.commons.fileupload2.util.FileItemHeadersImpl;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.request.resource.AbstractResource;
import org.apache.wicket.util.io.IOUtils;
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
index 85e600e..3a87b87 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
@@ -30,8 +30,8 @@ import java.util.Set;
import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-import org.apache.commons.fileupload.FileItemFactory;
-import org.apache.commons.fileupload.FileUploadException;
+import org.apache.commons.fileupload2.FileItemFactory;
+import org.apache.commons.fileupload2.FileUploadException;
import org.apache.wicket.protocol.http.RequestUtils;
import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.IWritableRequestParameters;
@@ -428,7 +428,7 @@ public class ServletWebRequest extends WebRequest
public MultipartServletWebRequest newMultipartWebRequest(Bytes maxSize, String upload)
throws FileUploadException
{
- return new MultipartServletWebRequestImpl(new javax.servlet.http.HttpServletRequest.Impl(getContainerRequest()), filterPrefix, maxSize, upload);
+ return new MultipartServletWebRequestImpl(getContainerRequest(), filterPrefix, maxSize, upload);
}
/**
@@ -445,7 +445,7 @@ public class ServletWebRequest extends WebRequest
public MultipartServletWebRequest newMultipartWebRequest(Bytes maxSize, String upload,
FileItemFactory factory) throws FileUploadException
{
- return new MultipartServletWebRequestImpl(new javax.servlet.http.HttpServletRequest.Impl(getContainerRequest()), filterPrefix, maxSize, upload, factory);
+ return new MultipartServletWebRequestImpl(getContainerRequest(), filterPrefix, maxSize, upload, factory);
}
@Override
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadTest.java
index 9df7275..5ce3791 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadTest.java
@@ -27,8 +27,8 @@ import java.io.InputStream;
import java.lang.reflect.Field;
import java.util.List;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.fileupload2.FileItem;
+import org.apache.commons.fileupload2.disk.DiskFileItemFactory;
import org.apache.commons.io.FileCleaningTracker;
import org.apache.wicket.util.file.File;
import org.apache.wicket.util.file.FileCleaner;
@@ -36,7 +36,6 @@ import org.apache.wicket.util.file.FileCleanerTrackerAdapter;
import org.apache.wicket.util.file.IFileCleaner;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
/**
@@ -44,9 +43,7 @@ import org.junit.jupiter.api.Test;
*
* @author Frank Bille (billen)
*/
-// FIXME Wicket 10
-@Disabled
-public class FileUploadTest extends WicketTestCase
+class FileUploadTest extends WicketTestCase
{
/**
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.java
index a84b45b..33cb635 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.java
@@ -21,7 +21,7 @@ import java.util.Iterator;
import java.util.List;
import org.apache.commons.collections4.iterators.EmptyIterator;
-import org.apache.commons.fileupload.FileUploadException;
+import org.apache.commons.fileupload2.FileUploadException;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
diff --git a/wicket-extensions/src/main/java/module-info.java b/wicket-extensions/src/main/java/module-info.java
index 287d7a3..54479d7 100644
--- a/wicket-extensions/src/main/java/module-info.java
+++ b/wicket-extensions/src/main/java/module-info.java
@@ -21,7 +21,7 @@ module org.apache.wicket.extensions {
requires org.slf4j;
requires com.fasterxml.jackson.databind;
requires com.github.openjson;
- requires commons.fileupload;
+ requires commons.fileupload2;
requires org.apache.wicket.util;
requires org.apache.wicket.request;
requires org.apache.wicket.core;
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/AjaxFileDropBehavior.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/AjaxFileDropBehavior.java
index b2f29c9..6554c44 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/AjaxFileDropBehavior.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/AjaxFileDropBehavior.java
@@ -19,8 +19,8 @@ package org.apache.wicket.extensions.ajax;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileUploadException;
+import org.apache.commons.fileupload2.FileItem;
+import org.apache.commons.fileupload2.FileUploadException;
import org.apache.wicket.Component;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.ajax.AjaxEventBehavior;
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource.java
index bdd878a..13dbd2b 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource.java
@@ -91,7 +91,7 @@ class UploadStatusResource extends AbstractResource
final HttpServletRequest req = (HttpServletRequest)attributes.getRequest()
.getContainerRequest();
- UploadInfo info = MultipartServletWebRequestImpl.getUploadInfo(new javax.servlet.http.HttpServletRequest.Impl(req), upload);
+ UploadInfo info = MultipartServletWebRequestImpl.getUploadInfo(req, upload);
String status;
if ((info == null) || (info.getTotalBytes() < 1))
diff --git a/wicket-util/pom.xml b/wicket-util/pom.xml
index 8073a20..bdfbf85 100755
--- a/wicket-util/pom.xml
+++ b/wicket-util/pom.xml
@@ -29,11 +29,6 @@
<dependencies>
<dependency>
- <groupId>commons-fileupload</groupId>
-<!-- <groupId>com.jwebmp.jpms.commons</groupId>-->
- <artifactId>commons-fileupload</artifactId>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
@@ -42,6 +37,10 @@
<artifactId>commons-collections4</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>compile</scope>
diff --git a/wicket-util/src/main/java/module-info.java b/wicket-util/src/main/java/module-info.java
index e6729ec..697a540 100644
--- a/wicket-util/src/main/java/module-info.java
+++ b/wicket-util/src/main/java/module-info.java
@@ -23,7 +23,7 @@ module org.apache.wicket.util {
requires java.desktop;
requires org.apache.commons.io;
requires org.apache.commons.collections4;
- requires commons.fileupload;
+ requires commons.fileupload2;
requires org.slf4j;
requires jakarta.servlet;
requires org.junit.jupiter.api;
[wicket] 02/02: WICKET-6915 Remove unused import of javax.servlet.http.HttpServletRequest
Posted by mg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch WICKET-6915-upgrade-to-fileupload2
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit c07d829b959bcaea86feeb1c6adf9e60ebd333af
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Fri Aug 20 13:59:40 2021 +0300
WICKET-6915 Remove unused import of javax.servlet.http.HttpServletRequest
Update a comment in module-info.java
---
wicket-util/src/main/java/javax/servlet/ServletContext.java | 2 --
wicket-util/src/main/java/module-info.java | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/wicket-util/src/main/java/javax/servlet/ServletContext.java b/wicket-util/src/main/java/javax/servlet/ServletContext.java
index 97d45f1..ad755b2 100644
--- a/wicket-util/src/main/java/javax/servlet/ServletContext.java
+++ b/wicket-util/src/main/java/javax/servlet/ServletContext.java
@@ -24,8 +24,6 @@ import java.util.EventListener;
import java.util.Map;
import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
-
import jakarta.servlet.Filter;
import jakarta.servlet.FilterRegistration;
import jakarta.servlet.RequestDispatcher;
diff --git a/wicket-util/src/main/java/module-info.java b/wicket-util/src/main/java/module-info.java
index 697a540..678d5d8 100644
--- a/wicket-util/src/main/java/module-info.java
+++ b/wicket-util/src/main/java/module-info.java
@@ -54,7 +54,7 @@ module org.apache.wicket.util {
exports org.apache.wicket.util.watch;
exports org.apache.wicket.util.xml;
- // temporary hack until CDI-Unit, commons-fileupload and Spring provide Jakarta EE based releases
+ // temporary hack until CDI-Unit and Spring provide Jakarta EE based releases
exports javax.servlet;
exports javax.servlet.http;
}