closes #221

justinhrobbins · Jan 13, 2016 · b2f0a84 · b2f0a84
1 parent 21d0d87
commit b2f0a84
Show file tree

Hide file tree

Showing 26 changed files with 216 additions and 210 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,9 +10,6 @@ gen/
 gwt-unitCache/
 deploy/
 classes/
-restygwt/
-gwt-joda-time/
-
 
 # Compiled source #
 ###################

diff --git a/FlashCards_Client/pom.xml b/FlashCards_Client/pom.xml
@@ -67,10 +67,6 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-joda</artifactId>
-        </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>

diff --git a/...hCards_Client/src/main/java/org/robbins/flashcards/client/jackson/CustomObjectMapper.java b/...hCards_Client/src/main/java/org/robbins/flashcards/client/jackson/CustomObjectMapper.java
@@ -3,14 +3,12 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.datatype.joda.JodaModule;
 
 public class CustomObjectMapper extends ObjectMapper {
 
     public CustomObjectMapper() {
 
         this.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
-        this.registerModule(new JodaModule());
     }
 
     public void setPrettyPrint(final boolean prettyPrint) {

diff --git a/FlashCards_Config/src/main/resources/default.properties b/FlashCards_Config/src/main/resources/default.properties
@@ -33,5 +33,5 @@ cassandra.native_transport_port=9042
 cassandra.keyspace=flashcardsapp
 
 # Akka properties
-jdbc.batchsize=1000
-akka.workerCount=20
+jdbc.batchsize=10000
+akka.workerCount=10
diff --git a/FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/resources/dozer-mappings.xml b/FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/resources/dozer-mappings.xml
@@ -7,7 +7,7 @@
         <custom-converters>
             <converter
                 type="org.robbins.flashcards.repository.util.dozer.DateTimeConverter">
-                <class-a>org.joda.time.DateTime</class-a>
+                <class-a>java.time.LocalDateTime</class-a>
                 <class-b>java.util.Date</class-b>
             </converter>
             <converter

diff --git a/FlashCards_Repository/FlashCards_Repository_Commons/pom.xml b/FlashCards_Repository/FlashCards_Repository_Commons/pom.xml
@@ -26,12 +26,6 @@
 			<version>${project.version}</version>
 		</dependency>
 
-		<!-- Joda-Time provides a quality replacement for the Java date and time classes. -->
-		<dependency>
-			<groupId>joda-time</groupId>
-			<artifactId>joda-time</artifactId>
-		</dependency>
-
 		<!-- Dozer for mapping @Entities to DTOs -->
 		<dependency>
 			<groupId>net.sf.dozer</groupId>

diff --git a/...Commons/src/main/java/org/robbins/flashcards/repository/util/dozer/DateTimeConverter.java b/...Commons/src/main/java/org/robbins/flashcards/repository/util/dozer/DateTimeConverter.java
@@ -1,10 +1,11 @@
 
 package org.robbins.flashcards.repository.util.dozer;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import org.dozer.CustomConverter;
-import org.joda.time.DateTime;
+import org.robbins.flashcards.util.DateUtils;
 import org.springframework.data.mapping.model.MappingException;
 
 public class DateTimeConverter implements CustomConverter {
@@ -22,9 +23,9 @@ public Object convert(final Object existingDestinationFieldValue,
         if (sourceFieldValue instanceof Date) {
             // Note that DateTime is immutable, so
             // we can't do much with the existingDestinationFieldValue.
-            return new DateTime(sourceFieldValue);
-        } else if (sourceFieldValue instanceof DateTime) {
-            return ((DateTime) sourceFieldValue).toDate();
+            return DateUtils.asLocalDateTime((Date)sourceFieldValue);
+        } else if (sourceFieldValue instanceof LocalDateTime) {
+            return DateUtils.asDate((LocalDateTime) sourceFieldValue);
         }
 
         throw new MappingException("Misconfigured/unsupported mapping");

diff --git a/...ory_Commons/src/main/java/org/robbins/flashcards/repository/util/dozer/UUIDConverter.java b/...ory_Commons/src/main/java/org/robbins/flashcards/repository/util/dozer/UUIDConverter.java
@@ -1,13 +1,11 @@
 
 package org.robbins.flashcards.repository.util.dozer;
 
+import java.util.UUID;
+
 import org.dozer.CustomConverter;
-import org.joda.time.DateTime;
 import org.springframework.data.mapping.model.MappingException;
 
-import java.util.Date;
-import java.util.UUID;
-
 public class UUIDConverter implements CustomConverter {
 
     @SuppressWarnings("rawtypes")

diff --git a/...ry/FlashCards_Repository_Commons/src/main/java/org/robbins/flashcards/util/DateUtils.java b/...ry/FlashCards_Repository_Commons/src/main/java/org/robbins/flashcards/util/DateUtils.java
@@ -0,0 +1,37 @@
+/*
+ * [y] hybris Platform
+ *
+ * Copyright (c) 2000-2016 hybris AG
+ * All rights reserved.
+ *
+ * This software is the confidential and proprietary information of hybris
+ * ("Confidential Information"). You shall not disclose such Confidential
+ * Information and shall use it only in accordance with the terms of the
+ * license agreement you entered into with hybris.
+ */
+package org.robbins.flashcards.util;
+
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Date;
+
+public class DateUtils
+{
+	public static Date asDate(LocalDate localDate) {
+		return Date.from(localDate.atStartOfDay().atZone(ZoneId.systemDefault()).toInstant());
+	}
+
+	public static Date asDate(LocalDateTime localDateTime) {
+		return Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
+	}
+
+	public static LocalDate asLocalDate(Date date) {
+		return Instant.ofEpochMilli(date.getTime()).atZone(ZoneId.systemDefault()).toLocalDate();
+	}
+
+	public static LocalDateTime asLocalDateTime(Date date) {
+		return Instant.ofEpochMilli(date.getTime()).atZone(ZoneId.systemDefault()).toLocalDateTime();
+	}
+}
diff --git a/...y_Jpa/src/main/java/org/robbins/flashcards/jpa/repository/AbstractCrudRepositoryImpl.java b/...y_Jpa/src/main/java/org/robbins/flashcards/jpa/repository/AbstractCrudRepositoryImpl.java
@@ -1,19 +1,19 @@
 
 package org.robbins.flashcards.jpa.repository;
 
-import org.apache.commons.lang3.NotImplementedException;
-import org.joda.time.DateTime;
-import org.robbins.flashcards.model.common.AbstractAuditable;
-import org.robbins.flashcards.repository.FlashCardsAppRepository;
-import org.robbins.flashcards.repository.auditing.AuditingAwareUser;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
 
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.transaction.Transactional;
 
-import java.io.Serializable;
-import java.util.List;
+import org.apache.commons.lang3.NotImplementedException;
+import org.robbins.flashcards.model.common.AbstractAuditable;
+import org.robbins.flashcards.repository.FlashCardsAppRepository;
+import org.robbins.flashcards.repository.auditing.AuditingAwareUser;
 
 public abstract class AbstractCrudRepositoryImpl<T extends AbstractAuditable<Long, ID>, ID extends Serializable>
         implements FlashCardsAppRepository<T, ID> {
@@ -38,12 +38,12 @@ public EntityManager getEm() {
     @Override
     public T save(final T entity) {
         entity.setLastModifiedBy(getAuditingUser());
-        entity.setLastModifiedDate(new DateTime());
+        entity.setLastModifiedDate(LocalDateTime.now());
 
         // is it a new entity?
         if (entity.getId() == null) {
             entity.setCreatedBy(getAuditingUser());
-            entity.setCreatedDate(new DateTime());
+            entity.setCreatedDate(LocalDateTime.now());
             getEm().persist(entity);
         } // must be an update
         else {

diff --git a/...tory_Jpa/src/main/java/org/robbins/flashcards/jpa/repository/FlashCardRepositoryImpl.java b/...tory_Jpa/src/main/java/org/robbins/flashcards/jpa/repository/FlashCardRepositoryImpl.java
@@ -1,13 +1,13 @@
 
 package org.robbins.flashcards.jpa.repository;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 import javax.persistence.Query;
 
-import org.joda.time.DateTime;
 import org.robbins.flashcards.jpa.repository.util.JpqlUtil;
 import org.robbins.flashcards.model.FlashCard;
 import org.robbins.flashcards.model.Tag;
@@ -33,9 +33,9 @@ public FlashCard save(final FlashCard flashCard) {
         flashCard.getTags().stream()
                 .filter(tag -> (tag.getId() == null)).forEach(tag -> {
             tag.setCreatedBy(getAuditingUser());
-            tag.setCreatedDate(new DateTime());
+            tag.setCreatedDate(LocalDateTime.now());
             tag.setLastModifiedBy(getAuditingUser());
-            tag.setLastModifiedDate(new DateTime());
+            tag.setLastModifiedDate(LocalDateTime.now());
         });
         return super.save(flashCard);
     }

diff --git a/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/pom.xml b/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/pom.xml
@@ -42,12 +42,6 @@
 			<version>${project.version}</version>
 		</dependency>
 
-		<!-- Joda-Time provides a quality replacement for the Java date and time classes. -->
-		<dependency>
-			<groupId>joda-time</groupId>
-			<artifactId>joda-time</artifactId>
-		</dependency>
-
 		<!-- JDBC Connection pooling -->
 		<dependency>
 			<groupId>c3p0</groupId>

diff --git a/...ry/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/model/User.java b/...ry/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/model/User.java
@@ -1,12 +1,15 @@
 
 package org.robbins.flashcards.model;
 
-import org.joda.time.DateTime;
-import org.robbins.flashcards.model.common.AbstractAuditable;
-
-import javax.persistence.*;
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
+
+import javax.persistence.AttributeOverride;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+import org.robbins.flashcards.model.common.AbstractAuditable;
 
 @Entity
 @Table(name = "user")
@@ -39,10 +42,8 @@ public class User extends AbstractAuditable<Long, Long> implements Serializable
     @Column(name = "Language")
     private String language;
 
-    // @JsonSerialize(using = CustomJsonDateSerializer.class)
-    @Temporal(TemporalType.TIMESTAMP)
     @Column(name = "LastLoginDate", nullable = true)
-    private Date lastLoginDate;
+    private LocalDateTime lastLoginDate;
 
     public User() {
     }
@@ -133,12 +134,12 @@ public void setLanguage(final String language) {
         this.language = language;
     }
 
-    public DateTime getLastLoginDate() {
-        return null == lastLoginDate ? null : new DateTime(lastLoginDate);
+    public LocalDateTime getLastLoginDate() {
+        return lastLoginDate;
     }
 
-    public void setLastLoginDate(final DateTime lastLoginDate) {
-        this.lastLoginDate = null == lastLoginDate ? null : lastLoginDate.toDate();
+    public void setLastLoginDate(final LocalDateTime lastLoginDate) {
+        this.lastLoginDate = lastLoginDate;
     }
 
     @Override