Revision f1a25720
Added by Katja Luther over 6 years ago
- ID f1a25720755daa96e8838a617a660dfced7b9f31
- Parent 23e50194
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/CdmBase.java | ||
|---|---|---|
| 13 | 13 |
import java.beans.PropertyChangeSupport; |
| 14 | 14 |
import java.io.Serializable; |
| 15 | 15 |
import java.lang.reflect.Method; |
| 16 |
import java.time.ZonedDateTime; |
|
| 16 | 17 |
import java.util.HashSet; |
| 17 | 18 |
import java.util.List; |
| 18 | 19 |
import java.util.Set; |
| ... | ... | |
| 49 | 50 |
import org.hibernate.search.annotations.FieldBridge; |
| 50 | 51 |
import org.hibernate.search.annotations.Index; |
| 51 | 52 |
import org.hibernate.search.annotations.Store; |
| 52 |
import org.joda.time.DateTime; |
|
| 53 | 53 |
|
| 54 | 54 |
import eu.etaxonomy.cdm.common.CdmUtils; |
| 55 | 55 |
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; |
| 56 |
import eu.etaxonomy.cdm.hibernate.search.DateTimeBridge; |
|
| 57 | 56 |
import eu.etaxonomy.cdm.hibernate.search.NotNullAwareIdBridge; |
| 58 | 57 |
import eu.etaxonomy.cdm.hibernate.search.UuidBridge; |
| 58 |
import eu.etaxonomy.cdm.hibernate.search.ZonedDateTimeBridge; |
|
| 59 | 59 |
import eu.etaxonomy.cdm.jaxb.DateTimeAdapter; |
| 60 | 60 |
import eu.etaxonomy.cdm.jaxb.UUIDAdapter; |
| 61 | 61 |
import eu.etaxonomy.cdm.model.NewEntityListener; |
| ... | ... | |
| 126 | 126 |
|
| 127 | 127 |
@XmlElement (name = "Created", type= String.class) |
| 128 | 128 |
@XmlJavaTypeAdapter(DateTimeAdapter.class) |
| 129 |
@Type(type="dateTimeUserType") |
|
| 129 |
// @Type(type="dateTimeUserType") |
|
| 130 |
@Type(type="org.hibernate.type.ZonedDateTimeType") |
|
| 130 | 131 |
@Basic(fetch = FetchType.LAZY) |
| 131 | 132 |
@Match(MatchMode.IGNORE) |
| 132 | 133 |
@Field(analyze = Analyze.NO) |
| 133 |
@FieldBridge(impl = DateTimeBridge.class) |
|
| 134 |
@FieldBridge(impl = ZonedDateTimeBridge.class)
|
|
| 134 | 135 |
@Audited |
| 135 |
private DateTime created; |
|
| 136 |
private ZonedDateTime created;
|
|
| 136 | 137 |
|
| 137 | 138 |
@XmlElement (name = "CreatedBy") |
| 138 | 139 |
@XmlIDREF |
| ... | ... | |
| 148 | 149 |
*/ |
| 149 | 150 |
public CdmBase() {
|
| 150 | 151 |
this.uuid = UUID.randomUUID(); |
| 151 |
this.created = new DateTime().withMillisOfSecond(0); |
|
| 152 |
this.created = ZonedDateTime.now(); |
|
| 153 |
this.created = this.created.withSecond(0); |
|
| 154 |
this.created = this.created.withNano(0); |
|
| 155 |
|
|
| 152 | 156 |
} |
| 153 | 157 |
|
| 154 | 158 |
public static void setNewEntityListener(NewEntityListener nel) {
|
| ... | ... | |
| 269 | 273 |
} |
| 270 | 274 |
|
| 271 | 275 |
@Override |
| 272 |
public DateTime getCreated() {
|
|
| 276 |
public ZonedDateTime getCreated() {
|
|
| 273 | 277 |
return created; |
| 274 | 278 |
} |
| 275 | 279 |
@Override |
| 276 |
public void setCreated(DateTime created) {
|
|
| 280 |
public void setCreated(ZonedDateTime created) {
|
|
| 277 | 281 |
if (created != null){
|
| 278 |
created = created.withMillisOfSecond(0); |
|
| 282 |
created = created.withNano(0); |
|
| 283 |
created = created.withSecond(0); |
|
| 279 | 284 |
//created.set(Calendar.MILLISECOND, 0); //old, can be deleted |
| 280 | 285 |
} |
| 281 | 286 |
this.created = created; |
| ... | ... | |
| 497 | 502 |
//TODO ? |
| 498 | 503 |
result.setId(0); |
| 499 | 504 |
result.setUuid(UUID.randomUUID()); |
| 500 |
result.setCreated(new DateTime());
|
|
| 505 |
result.setCreated(ZonedDateTime.now());
|
|
| 501 | 506 |
result.setCreatedBy(null); |
| 502 | 507 |
|
| 503 | 508 |
//no changes to: - |
Also available in: Unified diff
first implementation for change from joda time to java8 time