deprecated pac4j 1.x fix jooby-project#1001

jknack · jknack · commit 4718e4c33219 · 2018-02-04T20:27:16.000-03:00
diff --git a/modules/jooby-pac4j/src/main/java/org/jooby/pac4j/Auth.java b/modules/jooby-pac4j/src/main/java/org/jooby/pac4j/Auth.java
@@ -213,8 +213,23 @@
 import com.google.inject.multibindings.OptionalBinder;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
-import org.jooby.*;
-import org.jooby.internal.pac4j.*;
+import static java.util.Objects.requireNonNull;
+import org.jooby.Env;
+import org.jooby.Jooby;
+import org.jooby.Route;
+import org.jooby.Router;
+import org.jooby.Session;
+import org.jooby.internal.pac4j.AuthCallback;
+import org.jooby.internal.pac4j.AuthContext;
+import org.jooby.internal.pac4j.AuthFilter;
+import org.jooby.internal.pac4j.AuthLogout;
+import org.jooby.internal.pac4j.AuthorizerFilter;
+import org.jooby.internal.pac4j.BasicAuth;
+import org.jooby.internal.pac4j.ClientType;
+import org.jooby.internal.pac4j.ClientsProvider;
+import org.jooby.internal.pac4j.ConfigProvider;
+import org.jooby.internal.pac4j.FormAuth;
+import org.jooby.internal.pac4j.FormFilter;
 import org.jooby.scope.Providers;
 import org.jooby.scope.RequestScoped;
 import org.pac4j.core.authorization.authorizer.Authorizer;
@@ -234,13 +249,16 @@
 import org.pac4j.http.credentials.authenticator.test.SimpleTestUsernamePasswordAuthenticator;
 
 import java.net.URI;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import static java.util.Objects.*;
-
 /**
  * <h1>pac4j module</h1>
  * <p>
@@ -447,6 +465,7 @@
  * @author edgar
  * @since 0.6.0
  */
+@Deprecated
 public class Auth implements Jooby.Module {
 
   /**
diff --git a/modules/jooby-pac4j/src/main/java/org/jooby/pac4j/AuthSessionStore.java b/modules/jooby-pac4j/src/main/java/org/jooby/pac4j/AuthSessionStore.java
@@ -204,23 +204,22 @@
 package org.jooby.pac4j;
 
 import static java.util.Objects.requireNonNull;
-
-import java.util.Optional;
-
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import org.jooby.Session;
 import org.jooby.internal.pac4j.AuthSerializer;
 import org.pac4j.core.profile.CommonProfile;
 
+import javax.inject.Inject;
+import javax.inject.Provider;
+import java.util.Optional;
+
 /**
  * An {@link AuthStore} on top of the {@link Session}. This is the default {@link AuthStore}.
  *
  * @author edgar
  * @since 0.6.0
  * @param <U> User profile to work with.
  */
+@Deprecated
 public class AuthSessionStore<U extends CommonProfile> implements AuthStore<U> {
 
   public final static String USER_PROFILE = "pac4jUserProfile";
diff --git a/modules/jooby-pac4j/src/main/java/org/jooby/pac4j/AuthStore.java b/modules/jooby-pac4j/src/main/java/org/jooby/pac4j/AuthStore.java
@@ -203,16 +203,17 @@
  */
 package org.jooby.pac4j;
 
-import java.util.Optional;
-
 import org.pac4j.core.profile.CommonProfile;
 
+import java.util.Optional;
+
 /**
  * Contract for saving and restoring {@link CommonProfile}.
  *
  * @author edgar
  * @param <U> User profile to work with.
  */
+@Deprecated
 public interface AuthStore<U extends CommonProfile> {
 
   /**
