You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by mg...@apache.org on 2015/03/25 11:50:44 UTC
isis git commit: ISIS-1114 Allow to use EmailVerificationUrlService
for custom pages too
Repository: isis
Updated Branches:
refs/heads/master efb559e34 -> e48e806dc
ISIS-1114 Allow to use EmailVerificationUrlService for custom pages too
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e48e806d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e48e806d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e48e806d
Branch: refs/heads/master
Commit: e48e806dcd9bda311ffc3938d7d2f78bd2f399e5
Parents: efb559e
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Mar 25 12:50:16 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Mar 25 12:50:16 2015 +0200
----------------------------------------------------------------------
.../ui/pages/EmailVerificationUrlService.java | 13 ++++++++++++-
.../EmailVerificationUrlServiceDefault.java | 18 +++++++++++++++---
2 files changed, 27 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e48e806d/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/EmailVerificationUrlService.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/EmailVerificationUrlService.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/EmailVerificationUrlService.java
index 26ceffd..71c3b2c 100644
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/EmailVerificationUrlService.java
+++ b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/EmailVerificationUrlService.java
@@ -19,6 +19,7 @@
package org.apache.isis.viewer.wicket.ui.pages;
import java.io.Serializable;
+import org.apache.wicket.Page;
import org.apache.isis.viewer.wicket.model.models.PageType;
/**
@@ -30,7 +31,7 @@ import org.apache.isis.viewer.wicket.model.models.PageType;
public interface EmailVerificationUrlService extends Serializable {
/**
- * Creates a url to the passed <em>pageClass</em> by encrypting the given
+ * Creates a url to the passed <em>pageType</em> by encrypting the given
* <em>datum</em> as a first indexed parameter
*
* @param pageType The type of the page to link to
@@ -38,4 +39,14 @@ public interface EmailVerificationUrlService extends Serializable {
* @return The full url to the page with the encrypted data
*/
String createVerificationUrl(PageType pageType, String datum);
+
+ /**
+ * Creates a url to the passed <em>pageClass</em> by encrypting the given
+ * <em>datum</em> as a first indexed parameter
+ *
+ * @param pageClass The class of the page to link to
+ * @param datum The data to encrypt in the url
+ * @return The full url to the page with the encrypted data
+ */
+ String createVerificationUrl(final Class<? extends Page> pageClass, final String datum);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e48e806d/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailVerificationUrlServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailVerificationUrlServiceDefault.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailVerificationUrlServiceDefault.java
index da4885d..2b1f474 100644
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailVerificationUrlServiceDefault.java
+++ b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailVerificationUrlServiceDefault.java
@@ -47,7 +47,7 @@ public class EmailVerificationUrlServiceDefault implements EmailVerificationUrlS
}
/**
- * Creates a url to the passed <em>pageClass</em> by encrypting the given
+ * Creates a url to the configured page for the given <em>pageType</em> by encrypting the given
* <em>datum</em> as a first indexed parameter
*
* @param pageType The type of the page to link to
@@ -56,6 +56,20 @@ public class EmailVerificationUrlServiceDefault implements EmailVerificationUrlS
*/
@Override
public String createVerificationUrl(final PageType pageType, final String datum) {
+ final Class<? extends Page> pageClass = pageClassRegistry.getPageClass(pageType);
+ return createVerificationUrl(pageClass, datum);
+ }
+
+ /**
+ * Creates a url to the passed <em>pageClass</em> by encrypting the given
+ * <em>datum</em> as a first indexed parameter
+ *
+ * @param pageClass The class of the page to link to
+ * @param datum The data to encrypt in the url
+ * @return The full url to the page with the encrypted data
+ */
+ @Override
+ public String createVerificationUrl(final Class<? extends Page> pageClass, final String datum) {
String uuid = UUID.randomUUID().toString();
uuid = uuid.replace("-", "");
@@ -65,8 +79,6 @@ public class EmailVerificationUrlServiceDefault implements EmailVerificationUrlS
final PageParameters parameters = new PageParameters();
parameters.set(0, uuid);
- final Class<? extends Page> pageClass = pageClassRegistry.getPageClass(pageType);
-
final String fullUrl = fullUrlFor(pageClass, parameters);
return fullUrl;
}