[isis] branch spring6 updated: ISIS-3275: viewer compile fixes

[ahuber]

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 ca29e08a7a ISIS-3275: viewer compile fixes
ca29e08a7a is described below

commit ca29e08a7a10a0f869a84ead7d88bac69f3780f0
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Sun Nov 13 11:59:42 2022 +0100

    ISIS-3275: viewer compile fixes
---
 .../accmngt/SuccessFeedbackCookieManager.java      | 12 ++++----
 .../wicket/viewer/wicketapp/CryptFactoryTest.java  | 34 ++--------------------
 2 files changed, 9 insertions(+), 37 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 adeb51f234..2404615229 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,14 +20,10 @@ package org.apache.causeway.viewer.wicket.ui.pages.accmngt;
 
 import java.util.function.Consumer;
 
-import org.apache.wicket.util.cookies.CookieUtils;
+//import org.apache.wicket.util.cookies.CookieUtils; TODO[ISIS-3275] no 
jakarta API support
 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
@@ -46,6 +42,7 @@ 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));
@@ -53,7 +50,7 @@ public class SuccessFeedbackCookieManager {
             // if successFeedback is empty we interpret that as a cookie 
remove request
             drainSuccessFeedback(_Functions.noopConsumer());
         }
-
+        */
     }
 
     /**
@@ -62,12 +59,15 @@ 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);
         if (_Strings.isNotEmpty(successFeedback)) {
             
onSuccessFeedback.accept(_Strings.base64UrlDecode(successFeedback));
         }
         cookieUtils.remove(FEEDBACK_COOKIE_NAME);
+        */
     }
 
 }
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 dc71b2ebf6..60cc7c9cd8 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,41 +18,13 @@
  */
 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;
@@ -158,5 +130,5 @@ class CryptFactoryTest {
         return Arguments.of(
                 displayName, cryptFactory);
     }
-
+*/
 }