This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch csp
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/csp by this push:
new 7ee6bc0 [OPENMEETINGS-2151] openjpa is updated, LocalDate is used for
user bday
7ee6bc0 is described below
commit 7ee6bc0643d2fc3d0be4374adb11ae2da0960b07
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Tue Feb 18 22:44:06 2020 +0700
[OPENMEETINGS-2151] openjpa is updated, LocalDate is used for user bday
---
.../java/org/apache/openmeetings/db/dao/user/UserDao.java | 5 +++--
.../java/org/apache/openmeetings/db/entity/user/User.java | 9 +++++----
.../apache/openmeetings/web/common/AjaxOmDatePicker.java | 5 ++---
.../apache/openmeetings/web/common/GeneralUserForm.java | 15 +--------------
pom.xml | 2 +-
5 files changed, 12 insertions(+), 24 deletions(-)
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
index 9ee977c..dfda908 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
@@ -31,6 +31,7 @@ import static
org.apache.openmeetings.util.OpenmeetingsVariables.getMinLoginLeng
import java.io.File;
import java.security.NoSuchAlgorithmException;
+import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
@@ -105,7 +106,7 @@ public class UserDao implements
IGroupAdminDataProviderDao<User> {
user.setLanguageId(getDefaultLang());
user.setTimeZoneId(getTimeZone(currentUser).getID());
user.setForceTimeZoneCheck(false);
- user.setAge(new Date());
+ user.setAge(LocalDate.now());
user.setLastlogin(new Date());
Address address = new Address();
address.setCountry(Locale.getDefault().getCountry());
@@ -327,7 +328,7 @@ public class UserDao implements
IGroupAdminDataProviderDao<User> {
u.setDeleted(true);
u.setSipUser(new AsteriskSipUser());
u.setAddress(new Address());
- u.setAge(new Date());
+ u.setAge(LocalDate.now());
u.setExternalId(null);
final String purged = String.format("Purged %s",
randomUUID());
u.setFirstname(purged);
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
index 7a96d79..5e068e0 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
@@ -25,6 +25,7 @@ import static
org.apache.openmeetings.util.OpenmeetingsVariables.isSipEnabled;
import static org.apache.wicket.util.string.Strings.escapeMarkup;
import java.security.NoSuchAlgorithmException;
+import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashSet;
@@ -193,7 +194,7 @@ public class User extends HistoricalEntity {
@Column(name = "age")
@Element(data = true, required = false)
- private Date age;
+ private LocalDate age;
@Column(name = "firstname")
@Element(data = true, required = false)
@@ -347,12 +348,12 @@ public class User extends HistoricalEntity {
this.address = address;
}
- public Date getAge() {
+ public LocalDate getAge() {
return age;
}
- public void setAge(Date age) {
- this.age = age == null ? new Date() :age;
+ public void setAge(LocalDate age) {
+ this.age = age == null ? LocalDate.now() : age;
}
public String getFirstname() {
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AjaxOmDatePicker.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AjaxOmDatePicker.java
index 79c4b98..0fd162f 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AjaxOmDatePicker.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AjaxOmDatePicker.java
@@ -25,13 +25,12 @@ import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import
org.apache.wicket.extensions.markup.html.form.datetime.LocalDateTextField;
import org.apache.wicket.markup.html.form.FormComponent;
-import org.apache.wicket.model.IModel;
public class AjaxOmDatePicker extends AbstractOmDateTimePicker<LocalDate> {
private static final long serialVersionUID = 1L;
- public AjaxOmDatePicker(String id, IModel<LocalDate> model) {
- super(id, model, getDateFormat());
+ public AjaxOmDatePicker(String id) {
+ super(id, null, getDateFormat());
}
@Override
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
index fef002d..dd64688 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
@@ -35,10 +35,8 @@ import org.apache.openmeetings.db.entity.user.Group;
import org.apache.openmeetings.db.entity.user.GroupUser;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Salutation;
-import org.apache.openmeetings.util.CalendarHelper;
import org.apache.openmeetings.web.util.CountryDropDown;
import org.apache.openmeetings.web.util.RestrictiveChoiceProvider;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import
org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
@@ -49,7 +47,6 @@ import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.panel.IMarkupSourcingStrategy;
import org.apache.wicket.markup.html.panel.PanelMarkupSourcingStrategy;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.apache.wicket.util.string.Strings;
@@ -59,7 +56,6 @@ import org.wicketstuff.select2.Select2MultiChoice;
public class GeneralUserForm extends Form<User> {
private static final long serialVersionUID = 1L;
private final RequiredTextField<String> email = new
RequiredTextField<>("address.email");
- private LocalDate age;
private final List<GroupUser> grpUsers = new ArrayList<>();
private final boolean isAdminForm;
@SpringBean
@@ -100,15 +96,7 @@ public class GeneralUserForm extends Form<User> {
add(new DropDownChoice<>("timeZoneId", AVAILABLE_TIMEZONES));
add(new LanguageDropDown("languageId"));
add(new TextField<String>("address.phone"));
- final AjaxOmDatePicker bday = new AjaxOmDatePicker("age", new
PropertyModel<LocalDate>(this, "age")) {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onValueChanged(IPartialPageRequestHandler
target) {
- User u = GeneralUserForm.this.getModelObject();
- u.setAge(CalendarHelper.getDate(age,
u.getTimeZoneId()));
- }
- };
+ final AjaxOmDatePicker bday = new AjaxOmDatePicker("age");
bday.getConfig().withMaxDate(LocalDate.now());
add(bday);
add(new TextField<String>("address.street"));
@@ -167,7 +155,6 @@ public class GeneralUserForm extends Form<User> {
}
}
}
- age = CalendarHelper.getDate(u.getAge(), u.getTimeZoneId());
}
@Override
diff --git a/pom.xml b/pom.xml
index 9f3284e..9f9b83e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,7 @@
<h2.version>1.4.200</h2.version>
<commons-lang3.version>3.9</commons-lang3.version>
<javax.mail.version>1.6.2</javax.mail.version>
- <openjpa.version>3.1.0</openjpa.version>
+ <openjpa.version>3.1.1</openjpa.version>
<asterisk-java.version>2.0.2</asterisk-java.version>
<commons-dbcp.version>2.7.0</commons-dbcp.version>
<commons-pool2.version>2.8.0</commons-pool2.version>
