[isis] 01/02: ISIS-2824: removes IsisModuleUserHolderForWicket

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch ISIS-2824
in repository https://gitbox.apache.org/repos/asf/isis.git

commit eee650ac2d561ddecf558f6a5b293d390384e325
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Jul 26 10:55:13 2021 +0100

    ISIS-2824: removes IsisModuleUserHolderForWicket
---
 .../viewer/IsisModuleViewerWicketViewer.java       |  2 -
 .../services/ImpersonatedUserHolderForWicket.java  | 85 ----------------------
 2 files changed, 87 deletions(-)

diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisModuleViewerWicketViewer.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisModuleViewerWicketViewer.java
index 9d5e4db..9997e8f 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisModuleViewerWicketViewer.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisModuleViewerWicketViewer.java
@@ -33,7 +33,6 @@ import org.apache.isis.viewer.wicket.viewer.services.BookmarkUiServiceWicket;
 import org.apache.isis.viewer.wicket.viewer.services.DeepLinkServiceWicket;
 import org.apache.isis.viewer.wicket.viewer.services.HintStoreUsingWicketSession;
 import org.apache.isis.viewer.wicket.viewer.services.ImageResourceCacheClassPath;
-import org.apache.isis.viewer.wicket.viewer.services.ImpersonatedUserHolderForWicket;
 import org.apache.isis.viewer.wicket.viewer.services.LocaleProviderWicket;
 import org.apache.isis.viewer.wicket.viewer.services.TranslationsResolverWicket;
 import org.apache.isis.viewer.wicket.viewer.services.WicketViewerSettingsDefault;
@@ -54,7 +53,6 @@ import org.apache.isis.viewer.wicket.viewer.webmodule.WebModuleWicket;
         ComponentFactoryRegistryDefault.class,
         DeepLinkServiceWicket.class,
         ImageResourceCacheClassPath.class,
-        ImpersonatedUserHolderForWicket.class,
         LocaleProviderWicket.class,
         HintStoreUsingWicketSession.class,
         ObjectMementoServiceWicket.class,
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/ImpersonatedUserHolderForWicket.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/ImpersonatedUserHolderForWicket.java
deleted file mode 100644
index 0a03dbd..0000000
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/ImpersonatedUserHolderForWicket.java
+++ /dev/null
@@ -1,85 +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.isis.viewer.wicket.viewer.services;
-
-import java.util.Optional;
-
-import javax.inject.Named;
-
-import org.apache.wicket.Session;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.springframework.stereotype.Component;
-
-import org.apache.isis.applib.annotation.PriorityPrecedence;
-import org.apache.isis.applib.services.user.ImpersonatedUserHolder;
-import org.apache.isis.applib.services.user.UserMemento;
-
-import lombok.val;
-
-/**
- * Implementation that supports impersonation, using the Wicket {@link Session}
- * to store the value.
- *
- * @since 2.0 {@index}
- */
-@Component
-@Named("isis.webapp.ImpersonatedUserHolderForWicket")
-@javax.annotation.Priority(PriorityPrecedence.MIDPOINT - 100)
-public class ImpersonatedUserHolderForWicket implements ImpersonatedUserHolder {
-
-    private static final String HTTP_SESSION_KEY_IMPERSONATED_USER =
-            ImpersonatedUserHolderForWicket.class.getName() + "#userMemento";
-
-    @Override
-    public boolean supportsImpersonation() {
-        return session().isPresent();
-    }
-
-    @Override
-    public void setUserMemento(final UserMemento userMemento) {
-        session()
-        .ifPresent(session->
-            session.setAttribute(HTTP_SESSION_KEY_IMPERSONATED_USER, userMemento));
-    }
-
-    @Override
-    public Optional<UserMemento> getUserMemento() {
-        return session()
-            .map(session->session.getAttribute(HTTP_SESSION_KEY_IMPERSONATED_USER))
-            .filter(UserMemento.class::isInstance)
-            .map(UserMemento.class::cast);
-    }
-
-    @Override
-    public void clearUserMemento() {
-        session()
-        .ifPresent(session->
-            session.removeAttribute(HTTP_SESSION_KEY_IMPERSONATED_USER));
-    }
-
-    private static Optional<Session> session() {
-        //XXX[ISIS-2816] guards against RequestCycle not available,
-        // when in the process of expiring the Session
-        val requestCycle = RequestCycle.get();
-        return requestCycle != null
-                ? Optional.of(Session.get())
-                : Optional.empty();
-    }
-
-}