Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add helpers to convert core Date class with java.util.Date class #3911

Merged
merged 4 commits into from
Nov 28, 2018
Merged

Add helpers to convert core Date class with java.util.Date class #3911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7210c93
#3157 add methods toDate, fromDate
Nov 5, 2018
c9c3825
resolved test case Date.getYear()
Nov 6, 2018
e72954e
update as per feedback
Nov 22, 2018
ccbfff2
Update javadoc string
chingor13 Nov 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 38 additions & 3 deletions google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Date.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@

package com.google.cloud;

import com.google.api.core.BetaApi;
import com.google.common.base.Preconditions;

import java.io.Serializable;
import java.util.Calendar;
import java.util.Objects;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import com.google.api.core.BetaApi;
import com.google.common.base.Preconditions;

/**
* Represents a Date without time, such as 2017-03-17. Date is timezone independent.
*/
Expand Down Expand Up @@ -69,6 +70,40 @@ public static Date parseDate(String date) {
return new Date(year, month, dayOfMonth);
}

/**
* Convert a Google Date to a Java Util Date.
*
* @param date the date of the Google Date.
* @return java.util.Date
*/
public static java.util.Date toJavaUtilDate(Date date) {
Calendar cal = Calendar.getInstance();
cal.set(Calendar.HOUR_OF_DAY, 0);
cal.set(Calendar.MINUTE, 0);
cal.set(Calendar.SECOND, 0);
cal.set(Calendar.MILLISECOND, 0);
// Calender.MONTH starts from 0 while G C date starts from 1
cal.set(date.year, date.month - 1, date.dayOfMonth);
return cal.getTime();
}

/**
* Convert a Java Util Date to a Google Date.
*
* @param date the date of the java.util.Date
* @return Google Java Date
*/
public static Date fromJavaUtilDate(java.util.Date date) {
Calendar cal = Calendar.getInstance();
cal.setTime(date);
cal.set(Calendar.HOUR_OF_DAY, 0);
cal.set(Calendar.MINUTE, 0);
cal.set(Calendar.SECOND, 0);
cal.set(Calendar.MILLISECOND, 0);
// Calender.MONTH starts from 0 while G C date starts from 1
return new Date(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH) + 1, cal.get(Calendar.DAY_OF_MONTH));
}

/** Returns the year. */
public int getYear() {
return year;
Expand Down
25 changes: 24 additions & 1 deletion google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/DateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,21 @@
import static com.google.common.testing.SerializableTester.reserializeAndAssert;
import static com.google.common.truth.Truth.assertThat;

import com.google.common.testing.EqualsTester;
import java.text.ParseException;
import java.text.SimpleDateFormat;

import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

import com.google.common.testing.EqualsTester;

/** Unit tests for {@link Date}. */
@RunWith(JUnit4.class)
public class DateTest {

private static final SimpleDateFormat SIMPLE_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd");

@Test
public void parseDate() {
Date date = Date.parseDate("2016-09-18");
Expand Down Expand Up @@ -71,6 +77,23 @@ public void serialization() {
reserializeAndAssert(Date.fromYearMonthDay(2017, 4, 20));
}

@Test
public void testToJavaUtilDate() throws ParseException {
Date gcDate = Date.parseDate("2016-09-18");
java.util.Date juDate1 = SIMPLE_DATE_FORMAT.parse("2016-09-18");
java.util.Date juDate2 = Date.toJavaUtilDate(gcDate);
assertThat(juDate1).isEqualTo(juDate2);
}

@Test
public void testFromJavaUtilDate() throws ParseException {
java.util.Date juDate = SIMPLE_DATE_FORMAT.parse("2016-09-18");
Date gcDate = Date.fromJavaUtilDate(juDate);
assertThat(gcDate.getYear()).isEqualTo(2016);
assertThat(gcDate.getMonth()).isEqualTo(9);
assertThat(gcDate.getDayOfMonth()).isEqualTo(18);
}

private void assertDescending(Date... dates) {
for (int i = 0; i < dates.length - 1; i++) {
assertThat(dates[i]).isEquivalentAccordingToCompareTo(dates[i]);
Expand Down