From 4c22a8c92b54ccfdef59abb00a005bd299266bff Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Tue, 4 Feb 2014 14:45:11 +0000 Subject: [PATCH] Renamed login forms provider classes --- .../java/org/keycloak/login/FormsLoader.java | 17 ----------- .../org/keycloak/login/LoginFormsLoader.java | 17 +++++++++++ .../{FormsPages.java => LoginFormsPages.java} | 2 +- ...sProvider.java => LoginFormsProvider.java} | 2 +- .../freemarker/FreeMarkerLoginForms.java | 28 +++++++++---------- .../FreeMarkerLoginFormsProvider.java | 4 +-- .../keycloak/login/freemarker/Templates.java | 4 +-- ... => org.keycloak.login.LoginFormsProvider} | 0 .../services/resources/flows/Flows.java | 4 +-- 9 files changed, 39 insertions(+), 39 deletions(-) delete mode 100644 forms/login-api/src/main/java/org/keycloak/login/FormsLoader.java create mode 100644 forms/login-api/src/main/java/org/keycloak/login/LoginFormsLoader.java rename forms/login-api/src/main/java/org/keycloak/login/{FormsPages.java => LoginFormsPages.java} (90%) rename forms/login-api/src/main/java/org/keycloak/login/{FormsProvider.java => LoginFormsProvider.java} (89%) rename forms/login-freemarker/src/main/resources/META-INF/services/{org.keycloak.login.FormsProvider => org.keycloak.login.LoginFormsProvider} (100%) diff --git a/forms/login-api/src/main/java/org/keycloak/login/FormsLoader.java b/forms/login-api/src/main/java/org/keycloak/login/FormsLoader.java deleted file mode 100644 index eef384b2168..00000000000 --- a/forms/login-api/src/main/java/org/keycloak/login/FormsLoader.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.keycloak.login; - -import java.util.ServiceLoader; - -/** - * @author Stian Thorgersen - */ -public class FormsLoader { - - private FormsLoader() { - } - - public static FormsProvider load() { - return ServiceLoader.load(FormsProvider.class).iterator().next(); - } - -} diff --git a/forms/login-api/src/main/java/org/keycloak/login/LoginFormsLoader.java b/forms/login-api/src/main/java/org/keycloak/login/LoginFormsLoader.java new file mode 100644 index 00000000000..817db88f1e9 --- /dev/null +++ b/forms/login-api/src/main/java/org/keycloak/login/LoginFormsLoader.java @@ -0,0 +1,17 @@ +package org.keycloak.login; + +import java.util.ServiceLoader; + +/** + * @author Stian Thorgersen + */ +public class LoginFormsLoader { + + private LoginFormsLoader() { + } + + public static LoginFormsProvider load() { + return ServiceLoader.load(LoginFormsProvider.class).iterator().next(); + } + +} diff --git a/forms/login-api/src/main/java/org/keycloak/login/FormsPages.java b/forms/login-api/src/main/java/org/keycloak/login/LoginFormsPages.java similarity index 90% rename from forms/login-api/src/main/java/org/keycloak/login/FormsPages.java rename to forms/login-api/src/main/java/org/keycloak/login/LoginFormsPages.java index ef033b5153b..f0d1300c89b 100644 --- a/forms/login-api/src/main/java/org/keycloak/login/FormsPages.java +++ b/forms/login-api/src/main/java/org/keycloak/login/LoginFormsPages.java @@ -3,7 +3,7 @@ package org.keycloak.login; /** * @author Stian Thorgersen */ -public enum FormsPages { +public enum LoginFormsPages { LOGIN, LOGIN_TOTP, LOGIN_CONFIG_TOTP, LOGIN_VERIFY_EMAIL, OAUTH_GRANT, LOGIN_RESET_PASSWORD, LOGIN_UPDATE_PASSWORD, LOGIN_USERNAME_REMINDER, REGISTER, ERROR, LOGIN_UPDATE_PROFILE; diff --git a/forms/login-api/src/main/java/org/keycloak/login/FormsProvider.java b/forms/login-api/src/main/java/org/keycloak/login/LoginFormsProvider.java similarity index 89% rename from forms/login-api/src/main/java/org/keycloak/login/FormsProvider.java rename to forms/login-api/src/main/java/org/keycloak/login/LoginFormsProvider.java index 1b606f93584..d8e61b4fde3 100644 --- a/forms/login-api/src/main/java/org/keycloak/login/FormsProvider.java +++ b/forms/login-api/src/main/java/org/keycloak/login/LoginFormsProvider.java @@ -8,7 +8,7 @@ import javax.ws.rs.core.UriInfo; /** * @author Stian Thorgersen */ -public interface FormsProvider { +public interface LoginFormsProvider { public LoginForms createForms(RealmModel realm, HttpRequest request, UriInfo uriInfo); diff --git a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginForms.java b/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginForms.java index 9edaa460ade..30b15faf2e2 100644 --- a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginForms.java +++ b/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginForms.java @@ -7,7 +7,7 @@ import org.keycloak.freemarker.FreeMarkerUtil; import org.keycloak.freemarker.Theme; import org.keycloak.freemarker.ThemeLoader; import org.keycloak.login.LoginForms; -import org.keycloak.login.FormsPages; +import org.keycloak.login.LoginFormsPages; import org.keycloak.login.freemarker.model.LoginBean; import org.keycloak.login.freemarker.model.MessageBean; import org.keycloak.login.freemarker.model.OAuthGrantBean; @@ -75,20 +75,20 @@ public class FreeMarkerLoginForms implements LoginForms { public Response createResponse(UserModel.RequiredAction action) { String actionMessage; - FormsPages page; + LoginFormsPages page; switch (action) { case CONFIGURE_TOTP: actionMessage = Messages.ACTION_WARN_TOTP; - page = FormsPages.LOGIN_CONFIG_TOTP; + page = LoginFormsPages.LOGIN_CONFIG_TOTP; break; case UPDATE_PROFILE: actionMessage = Messages.ACTION_WARN_PROFILE; - page = FormsPages.LOGIN_UPDATE_PROFILE; + page = LoginFormsPages.LOGIN_UPDATE_PROFILE; break; case UPDATE_PASSWORD: actionMessage = Messages.ACTION_WARN_PASSWD; - page = FormsPages.LOGIN_UPDATE_PASSWORD; + page = LoginFormsPages.LOGIN_UPDATE_PASSWORD; break; case VERIFY_EMAIL: try { @@ -98,7 +98,7 @@ public class FreeMarkerLoginForms implements LoginForms { } actionMessage = Messages.ACTION_WARN_EMAIL; - page = FormsPages.LOGIN_VERIFY_EMAIL; + page = LoginFormsPages.LOGIN_VERIFY_EMAIL; break; default: return Response.serverError().build(); @@ -111,7 +111,7 @@ public class FreeMarkerLoginForms implements LoginForms { return createResponse(page); } - private Response createResponse(FormsPages page) { + private Response createResponse(LoginFormsPages page) { MultivaluedMap queryParameterMap = uriInfo.getQueryParameters(); String requestURI = uriInfo.getBaseUri().getPath(); @@ -189,32 +189,32 @@ public class FreeMarkerLoginForms implements LoginForms { } public Response createLogin() { - return createResponse(FormsPages.LOGIN); + return createResponse(LoginFormsPages.LOGIN); } public Response createPasswordReset() { - return createResponse(FormsPages.LOGIN_RESET_PASSWORD); + return createResponse(LoginFormsPages.LOGIN_RESET_PASSWORD); } public Response createUsernameReminder() { - return createResponse(FormsPages.LOGIN_USERNAME_REMINDER); + return createResponse(LoginFormsPages.LOGIN_USERNAME_REMINDER); } public Response createLoginTotp() { - return createResponse(FormsPages.LOGIN_TOTP); + return createResponse(LoginFormsPages.LOGIN_TOTP); } public Response createRegistration() { - return createResponse(FormsPages.REGISTER); + return createResponse(LoginFormsPages.REGISTER); } public Response createErrorPage() { setStatus(Response.Status.INTERNAL_SERVER_ERROR); - return createResponse(FormsPages.ERROR); + return createResponse(LoginFormsPages.ERROR); } public Response createOAuthGrant() { - return createResponse(FormsPages.OAUTH_GRANT); + return createResponse(LoginFormsPages.OAUTH_GRANT); } public FreeMarkerLoginForms setError(String message) { diff --git a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginFormsProvider.java b/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginFormsProvider.java index 4d7ddd8fd34..b15cadae8dc 100644 --- a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginFormsProvider.java +++ b/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginFormsProvider.java @@ -2,7 +2,7 @@ package org.keycloak.login.freemarker; import org.jboss.resteasy.spi.HttpRequest; import org.keycloak.login.LoginForms; -import org.keycloak.login.FormsProvider; +import org.keycloak.login.LoginFormsProvider; import org.keycloak.models.RealmModel; import javax.ws.rs.core.UriInfo; @@ -10,7 +10,7 @@ import javax.ws.rs.core.UriInfo; /** * @author Stian Thorgersen */ -public class FreeMarkerLoginFormsProvider implements FormsProvider { +public class FreeMarkerLoginFormsProvider implements LoginFormsProvider { @Override public LoginForms createForms(RealmModel realm, HttpRequest request, UriInfo uriInfo) { diff --git a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/Templates.java b/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/Templates.java index 69a5e4b7d59..ad96e3864bb 100644 --- a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/Templates.java +++ b/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/Templates.java @@ -1,13 +1,13 @@ package org.keycloak.login.freemarker; -import org.keycloak.login.FormsPages; +import org.keycloak.login.LoginFormsPages; /** * @author Stian Thorgersen */ public class Templates { - public static String getTemplate(FormsPages page) { + public static String getTemplate(LoginFormsPages page) { switch (page) { case LOGIN: return "login.ftl"; diff --git a/forms/login-freemarker/src/main/resources/META-INF/services/org.keycloak.login.FormsProvider b/forms/login-freemarker/src/main/resources/META-INF/services/org.keycloak.login.LoginFormsProvider similarity index 100% rename from forms/login-freemarker/src/main/resources/META-INF/services/org.keycloak.login.FormsProvider rename to forms/login-freemarker/src/main/resources/META-INF/services/org.keycloak.login.LoginFormsProvider diff --git a/services/src/main/java/org/keycloak/services/resources/flows/Flows.java b/services/src/main/java/org/keycloak/services/resources/flows/Flows.java index dd2e26a4e89..5df9493629b 100755 --- a/services/src/main/java/org/keycloak/services/resources/flows/Flows.java +++ b/services/src/main/java/org/keycloak/services/resources/flows/Flows.java @@ -23,7 +23,7 @@ package org.keycloak.services.resources.flows; import org.jboss.resteasy.spi.HttpRequest; import org.keycloak.login.LoginForms; -import org.keycloak.login.FormsLoader; +import org.keycloak.login.LoginFormsLoader; import org.keycloak.models.RealmModel; import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.services.managers.TokenManager; @@ -39,7 +39,7 @@ public class Flows { } public static LoginForms forms(RealmModel realm, HttpRequest request, UriInfo uriInfo) { - return FormsLoader.load().createForms(realm, request, uriInfo); + return LoginFormsLoader.load().createForms(realm, request, uriInfo); } public static OAuthFlows oauth(RealmModel realm, HttpRequest request, UriInfo uriInfo, AuthenticationManager authManager,