You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/12/01 13:42:49 UTC
[isis] branch spring6 updated: ISIS-3275: reinstate wicket provisioning and tests
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/spring6 by this push:
new 69f2426aca ISIS-3275: reinstate wicket provisioning and tests
69f2426aca is described below
commit 69f2426aca9bdb70c44db51476758d738361a249
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Dec 1 14:42:41 2022 +0100
ISIS-3275: reinstate wicket provisioning and tests
---
.../accmngt/SuccessFeedbackCookieManager.java | 10 +++----
.../wicket/ui/pages/login/SignInPanelAbstract.java | 5 +---
.../accmngt/SuccessFeedbackCookieUtilTest.java | 25 ++++++++++++----
.../wicket/viewer/webmodule/WebModuleWicket.java | 16 +++++-----
.../wicket/viewer/wicketapp/CryptFactoryTest.java | 34 ++++++++++++++++++++--
5 files changed, 64 insertions(+), 26 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/SuccessFeedbackCookieManager.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/SuccessFeedbackCookieManager.java
index 2404615229..6ac59c247f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/SuccessFeedbackCookieManager.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/SuccessFeedbackCookieManager.java
@@ -20,10 +20,14 @@ package org.apache.causeway.viewer.wicket.ui.pages.accmngt;
import java.util.function.Consumer;
-//import org.apache.wicket.util.cookies.CookieUtils; TODO[ISIS-3275] no jakarta API support
+import org.apache.wicket.util.cookies.CookieUtils;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.functions._Functions;
+
import lombok.NonNull;
+import lombok.val;
import lombok.experimental.UtilityClass;
@UtilityClass
@@ -42,7 +46,6 @@ public class SuccessFeedbackCookieManager {
* messages.
*/
public static void storeSuccessFeedback(final @Nullable String successFeedback) {
- /* TODO[ISIS-3275] no jakarta API support
val cookieUtils = new CookieUtils();
if (_Strings.isNotEmpty(successFeedback)) {
cookieUtils.save(FEEDBACK_COOKIE_NAME, _Strings.base64UrlEncode(successFeedback));
@@ -50,7 +53,6 @@ public class SuccessFeedbackCookieManager {
// if successFeedback is empty we interpret that as a cookie remove request
drainSuccessFeedback(_Functions.noopConsumer());
}
- */
}
/**
@@ -59,7 +61,6 @@ public class SuccessFeedbackCookieManager {
* messages.
*/
public static void drainSuccessFeedback(final @NonNull Consumer<String> onSuccessFeedback) {
- /* TODO[ISIS-3275] no jakarta API support
val cookieUtils = new CookieUtils();
final String successFeedback = cookieUtils.load(FEEDBACK_COOKIE_NAME);
@@ -67,7 +68,6 @@ public class SuccessFeedbackCookieManager {
onSuccessFeedback.accept(_Strings.base64UrlDecode(successFeedback));
}
cookieUtils.remove(FEEDBACK_COOKIE_NAME);
- */
}
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/SignInPanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/SignInPanelAbstract.java
index b8e50cdb19..bd83520988 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/SignInPanelAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/SignInPanelAbstract.java
@@ -239,13 +239,10 @@ implements HasMetaModelContext {
}
private String recoverTimezone() {
- /* TODO[ISIS-3275] no support for jakarta API
-
val cookie = new CookieUtils().getCookie(timezoneCookieName());
return cookie!=null
? cookie.getValue()
- : null;*/
- return null;
+ : null;
}
private String timezoneCookieName() {
diff --git a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/pages/accmngt/SuccessFeedbackCookieUtilTest.java b/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/pages/accmngt/SuccessFeedbackCookieUtilTest.java
index e5096d8ac0..1327e5ee7a 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/pages/accmngt/SuccessFeedbackCookieUtilTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/pages/accmngt/SuccessFeedbackCookieUtilTest.java
@@ -18,10 +18,29 @@
*/
package org.apache.causeway.viewer.wicket.ui.test.pages.accmngt;
+import java.util.concurrent.atomic.AtomicReference;
+
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+
+import org.apache.wicket.ThreadContext;
import org.apache.wicket.mock.MockWebResponse;
import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
+import org.apache.wicket.request.IExceptionMapper;
+import org.apache.wicket.request.IRequestMapper;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.cycle.RequestCycleContext;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import jakarta.servlet.http.HttpServletRequest;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.causeway.viewer.wicket.ui.pages.accmngt.SuccessFeedbackCookieManager;
+
+import lombok.val;
class SuccessFeedbackCookieUtilTest {
@@ -29,8 +48,6 @@ class SuccessFeedbackCookieUtilTest {
private MockWebResponse mockWebResponse;
private HttpServletRequest mockHttpServletRequest;
- /* TODO[ISIS-3275] no jakarta API support
-
@BeforeEach
void setUp() throws Exception {
@@ -68,6 +85,4 @@ class SuccessFeedbackCookieUtilTest {
assertEquals(message, resultRef.get());
}
- */
-
}
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/webmodule/WebModuleWicket.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/webmodule/WebModuleWicket.java
index e686c13efe..9c9bc78565 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/webmodule/WebModuleWicket.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/webmodule/WebModuleWicket.java
@@ -20,6 +20,13 @@ package org.apache.causeway.viewer.wicket.viewer.webmodule;
import static java.util.Objects.requireNonNull;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.ServletException;
+
+import org.apache.wicket.protocol.http.WicketFilter;
//import org.apache.wicket.protocol.http.WicketFilter;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
@@ -32,11 +39,6 @@ import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.webapp.modules.WebModuleAbstract;
import org.apache.causeway.core.webapp.modules.WebModuleContext;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.ServletContextListener;
-import jakarta.servlet.ServletException;
import lombok.Getter;
/**
@@ -95,8 +97,6 @@ public final class WebModuleWicket extends WebModuleAbstract {
@Override
public Can<ServletContextListener> init(final ServletContext ctx) throws ServletException {
- /* TODO[ISIS-3275] no jakarta API support
-
registerFilter(ctx, WICKET_FILTER_NAME, WicketFilter.class)
.ifPresent(filterReg -> {
filterReg.setInitParameter("applicationClassName", wicketApp);
@@ -108,8 +108,6 @@ public final class WebModuleWicket extends WebModuleAbstract {
urlPattern);
});
- */
-
return Can.empty(); // registers no listeners
}
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/CryptFactoryTest.java b/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/CryptFactoryTest.java
index 60cc7c9cd8..dc71b2ebf6 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/CryptFactoryTest.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/CryptFactoryTest.java
@@ -18,13 +18,41 @@
*/
package org.apache.causeway.viewer.wicket.viewer.wicketapp;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+
+import org.apache.wicket.ThreadContext;
+import org.apache.wicket.authentication.strategy.DefaultAuthenticationStrategy;
+import org.apache.wicket.mock.MockWebResponse;
+import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
+import org.apache.wicket.request.IExceptionMapper;
+import org.apache.wicket.request.IRequestMapper;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.cycle.RequestCycleContext;
+import org.apache.wicket.util.crypt.ICrypt;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.Mockito.mock;
+
+import lombok.val;
+
/**
* Requires resource {@code javax/servlet/http/LocalStrings.properties} for Cookie testing.
*/
class CryptFactoryTest {
- /* TODO[ISIS-3275] no jakarta API support
-
private ServletWebRequest servletWebRequest;
private MockWebResponse mockWebResponse;
private HttpServletRequest mockHttpServletRequest;
@@ -130,5 +158,5 @@ class CryptFactoryTest {
return Arguments.of(
displayName, cryptFactory);
}
-*/
+
}