Fixed Codacy warnings

Signed-off-by: Alexander Lehmann <a.lehm@gmx.de>
eclipse-ee4j · Apr 23, 2019 · 63e946a · 63e946a
1 parent 39db073
commit 63e946a
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 28 deletions.
diff --git a/...clipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/datetime/DateTime.java b/...clipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/datetime/DateTime.java
@@ -27,6 +27,7 @@
 import java.time.LocalTime;
 import java.time.OffsetDateTime;
 import java.time.OffsetTime;
+import java.time.ZoneOffset;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
@@ -53,8 +54,8 @@ public class DateTime implements Serializable {
 	private LocalDate localDate;
 	private LocalTime localTime;
 	private LocalDateTime localDateTime;
-	private OffsetDateTime offsetDateTime;
 	private OffsetTime offsetTime;
+	private OffsetDateTime offsetDateTime;
 	private Time time;
 	private Timestamp timestamp;
 	private Date utilDate;
@@ -63,21 +64,19 @@ public class DateTime implements Serializable {
 	private Map<Date, DateTime> uniSelfMap;
 
 	public DateTime() {
-	}
+		LocalTime localTime = LocalTime.of(0, 0);
+		LocalDateTime localDateTime = LocalDateTime.ofEpochSecond(0, 0, ZoneOffset.UTC);
 
-	public DateTime(java.sql.Date date, LocalDateTime localDateTime, Time time, Timestamp timestamp, Date utilDate,
-			Calendar calendar, LocalDate localDate, LocalTime localTime, OffsetTime offsetTime,
-			OffsetDateTime offsetDateTime) {
-		this.date = date;
-		this.localDate = localDate;
+		this.date = new java.sql.Date(0);
+		this.localDate = LocalDate.ofEpochDay(0);
 		this.localTime = localTime;
 		this.localDateTime = localDateTime;
-		this.offsetTime = offsetTime;
-		this.offsetDateTime = offsetDateTime;
-		this.time = time;
-		this.timestamp = timestamp;
-		this.utilDate = utilDate;
-		this.calendar = calendar;
+		this.offsetTime = OffsetTime.of(localTime, ZoneOffset.UTC);
+		this.offsetDateTime = OffsetDateTime.of(localDateTime, ZoneOffset.UTC);
+		this.time = new Time(0);
+		this.timestamp = new Timestamp(0);
+		this.utilDate = new Date(0);
+		this.calendar = Calendar.getInstance();
 
 		uniSelfMap = new HashMap<Date, DateTime>();
 		uniSelfMap.put(new Date(), this);

diff --git a/...k.jpa.test/src/org/eclipse/persistence/testing/models/jpa/datetime/DateTimePopulator.java b/...k.jpa.test/src/org/eclipse/persistence/testing/models/jpa/datetime/DateTimePopulator.java
@@ -18,7 +18,10 @@
 import java.sql.Time;
 
 import java.sql.Timestamp;
-
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.OffsetTime;
+import java.time.ZoneOffset;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
@@ -113,13 +116,18 @@ public DateTime example4() {
     @SuppressWarnings("deprecation")
     public DateTime buildAttributes(Calendar cal) {
         DateTime dateTime = new DateTime();
-        long time = cal.getTime().getTime();;
+        long time = cal.getTime().getTime();
 
         dateTime.setDate(new java.sql.Date(time));
         dateTime.setTime(new Time(cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE), cal.get(Calendar.SECOND)));
         dateTime.setTimestamp(new Timestamp(time));
         dateTime.setUtilDate(new Date(time));
         dateTime.setCalendar(cal);
+        dateTime.setLocalDate(LocalDate.of(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH)));
+        dateTime.setLocalTime(LocalTime.of(cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE)));
+        dateTime.setLocalDateTime(dateTime.getLocalDate().atTime(dateTime.getLocalTime()));
+        dateTime.setOffsetTime(OffsetTime.of(dateTime.getLocalTime(), ZoneOffset.UTC));
+        dateTime.setOffsetDateTime(dateTime.getOffsetTime().atDate(dateTime.getLocalDate()));
 
         return dateTime;
     }

diff --git a/...test/src/org/eclipse/persistence/testing/tests/jpa/datetime/NullBindingJUnitTestCase.java b/...test/src/org/eclipse/persistence/testing/tests/jpa/datetime/NullBindingJUnitTestCase.java
@@ -17,25 +17,22 @@
 //       - 375101: Date and Calendar should not require @Temporal.
 package org.eclipse.persistence.testing.tests.jpa.datetime;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.time.OffsetDateTime;
-import java.time.OffsetTime;
 import java.time.ZoneOffset;
 import java.util.Date;
 import java.util.Map;
 
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.eclipse.persistence.testing.framework.junit.JUnitTestCase;
 import org.eclipse.persistence.testing.models.jpa.datetime.DateTime;
 import org.eclipse.persistence.testing.models.jpa.datetime.DateTimeTableCreator;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 /**
  * <p>
  * <b>Purpose</b>: Test binding of null values to temporal type fields in
@@ -103,9 +100,7 @@ public void testCreateDateTime() {
 		beginTransaction(em);
 		LocalTime localTime = LocalTime.of(0, 0);
 		LocalDateTime localDateTime = LocalDateTime.ofEpochSecond(0, 0, ZoneOffset.UTC);
-		dt = new DateTime(new java.sql.Date(0), localDateTime, new java.sql.Time(0), new java.sql.Timestamp(0),
-				new java.util.Date(0), java.util.Calendar.getInstance(), LocalDate.ofEpochDay(0), localTime,
-				OffsetTime.of(localTime, ZoneOffset.UTC), OffsetDateTime.of(localDateTime, ZoneOffset.UTC));
+		dt = new DateTime();
 		em.persist(dt);
 
 		datetimeId = dt.getId();
@@ -158,7 +153,7 @@ public void testNullifyLocalDate() {
 			throw e;
 		}
 	}
-	
+
 	public void testNullifyLocalTime() {
 		EntityManager em = createEntityManager();
 		Query q;
@@ -180,7 +175,7 @@ public void testNullifyLocalTime() {
 			throw e;
 		}
 	}
-	
+
 	public void testNullifyLocalDateTime() {
 		EntityManager em = createEntityManager();
 		Query q;
@@ -224,7 +219,7 @@ public void testNullifyOffsetTime() {
 			throw e;
 		}
 	}
-	
+
 	public void testNullifyOffsetDateTime() {
 		EntityManager em = createEntityManager();
 		Query q;
@@ -246,7 +241,7 @@ public void testNullifyOffsetDateTime() {
 			throw e;
 		}
 	}
-	
+
 	/**
 	 */
 	public void testNullifyTime() {