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/01/15 15:31:03 UTC
isis git commit: ISIS-987 Change
UserRegistrationService#registerUser() to accept UserDetails as a single
parameter
Repository: isis
Updated Branches:
refs/heads/ISIS-987-2-make-register-easier-to-extend d0d494ef6 -> 00616c40e
ISIS-987 Change UserRegistrationService#registerUser() to accept UserDetails as a single parameter
Implementations of the service may extend UserDetails if custom fields are needed
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/00616c40
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/00616c40
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/00616c40
Branch: refs/heads/ISIS-987-2-make-register-easier-to-extend
Commit: 00616c40ed530d63046292005e80aa8168acfd03
Parents: d0d494e
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Jan 15 16:29:32 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Jan 15 16:29:32 2015 +0200
----------------------------------------------------------------------
.../ui/pages/accmngt/register/RegisterPage.java | 1 +
.../pages/accmngt/register/RegisterPanel.java | 7 +--
.../ui/pages/accmngt/register/UserDetails.java | 49 --------------------
.../applib/services/userreg/UserDetails.java | 49 ++++++++++++++++++++
.../userreg/UserRegistrationService.java | 2 +-
5 files changed, 55 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/00616c40/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.java
index 6e0bc0e..781360a 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.java
@@ -21,6 +21,7 @@ package org.apache.isis.viewer.wicket.ui.pages.accmngt.register;
import javax.inject.Inject;
+import org.apache.isis.applib.services.userreg.UserDetails;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.errors.ExceptionModel;
import org.apache.isis.viewer.wicket.ui.pages.PageNavigationService;
http://git-wip-us.apache.org/repos/asf/isis/blob/00616c40/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
index 253f5f6..a6da854 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
@@ -1,5 +1,6 @@
package org.apache.isis.viewer.wicket.ui.pages.accmngt.register;
+import org.apache.isis.applib.services.userreg.UserDetails;
import org.apache.isis.applib.services.userreg.UserRegistrationService;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.transaction.TransactionalClosureAbstract;
@@ -95,7 +96,7 @@ public abstract class RegisterPanel extends GenericPanel<UserDetails> {
String email = getEmail();
- userDetails.setEmail(email);
+ userDetails.setEmailAddress(email);
}
@Override
@@ -111,7 +112,7 @@ public abstract class RegisterPanel extends GenericPanel<UserDetails> {
IsisContext.getTransactionManager().executeWithinTransaction(new TransactionalClosureAbstract() {
@Override
public void execute() {
- userRegistrationService.registerUser(userDetails.getUsername(), userDetails.getPassword(), userDetails.getEmail());
+ userRegistrationService.registerUser(userDetails);
removeAccountConfirmation();
}
});
@@ -143,7 +144,7 @@ public abstract class RegisterPanel extends GenericPanel<UserDetails> {
TextField<String> emailField = new TextField<>(ID_EMAIL, new Model<String>() {
@Override
public String getObject() {
- return userDetails.getEmail();
+ return userDetails.getEmailAddress();
}
});
return emailField;
http://git-wip-us.apache.org/repos/asf/isis/blob/00616c40/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/UserDetails.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/UserDetails.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/UserDetails.java
deleted file mode 100644
index c3c3da9..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/UserDetails.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.apache.isis.viewer.wicket.ui.pages.accmngt.register;
-
-import java.io.Serializable;
-
-/**
- * A model object for {@link org.apache.isis.viewer.wicket.ui.pages.accmngt.register.RegisterPanel}
- */
-public class UserDetails implements Serializable {
-
- private String username;
- private String password;
- private String confirmPassword;
- private String email;
-
- public String getUsername()
- {
- return username;
- }
-
- public void setUsername(final String username)
- {
- this.username = username;
- }
-
- public String getPassword()
- {
- return password;
- }
- public void setPassword(final String password)
- {
- this.password = password;
- }
-
- public String getConfirmPassword() {
- return confirmPassword;
- }
-
- public void setConfirmPassword(String confirmPassword) {
- this.confirmPassword = confirmPassword;
- }
-
- public String getEmail() {
- return email;
- }
-
- public void setEmail(String email) {
- this.email = email;
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/00616c40/core/applib/src/main/java/org/apache/isis/applib/services/userreg/UserDetails.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/userreg/UserDetails.java b/core/applib/src/main/java/org/apache/isis/applib/services/userreg/UserDetails.java
new file mode 100644
index 0000000..ce5b71a
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/userreg/UserDetails.java
@@ -0,0 +1,49 @@
+package org.apache.isis.applib.services.userreg;
+
+import java.io.Serializable;
+
+/**
+ * A model object for the signup page
+ */
+public class UserDetails implements Serializable {
+
+ private String username;
+ private String password;
+ private String confirmPassword;
+ private String emailAddress;
+
+ public String getUsername()
+ {
+ return username;
+ }
+
+ public void setUsername(final String username)
+ {
+ this.username = username;
+ }
+
+ public String getPassword()
+ {
+ return password;
+ }
+ public void setPassword(final String password)
+ {
+ this.password = password;
+ }
+
+ public String getConfirmPassword() {
+ return confirmPassword;
+ }
+
+ public void setConfirmPassword(String confirmPassword) {
+ this.confirmPassword = confirmPassword;
+ }
+
+ public String getEmailAddress() {
+ return emailAddress;
+ }
+
+ public void setEmailAddress(final String emailAddress) {
+ this.emailAddress = emailAddress;
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/00616c40/core/applib/src/main/java/org/apache/isis/applib/services/userreg/UserRegistrationService.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/userreg/UserRegistrationService.java b/core/applib/src/main/java/org/apache/isis/applib/services/userreg/UserRegistrationService.java
index 3c53212..e177c97 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/userreg/UserRegistrationService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/userreg/UserRegistrationService.java
@@ -26,7 +26,7 @@ public interface UserRegistrationService {
boolean usernameExists(String username);
@Programmatic
- void registerUser(String username, String password, String emailAddress);
+ void registerUser(UserDetails userDetails);
@Programmatic
boolean emailExists(String emailAddress);