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

fix(all): Don't return incorrect date format instance #3576

Merged
merged 2 commits into from
May 16, 2024
+11 −5
Merged

fix(all): Don't return incorrect date format instance #3576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff79c42
Don't return incorrect date format instance
mattcreaser May 15, 2024
0d8d73a
Merge branch 'main' into mattcreaser/date-unmarshaller-unix-instance
mattcreaser May 16, 2024
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
7 changes: 2 additions & 5 deletions aws-android-sdk-core/src/main/java/com/amazonaws/transform/SimpleTypeJsonUnmarshallers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ public static ByteJsonUnmarshaller getInstance() {
*/
public static class DateJsonUnmarshaller implements Unmarshaller<Date, JsonUnmarshallerContext> {
private static final int DATE_MULTIPLIER = 1000;
private final TimestampFormat format;
final TimestampFormat format;

private DateJsonUnmarshaller(TimestampFormat format) {
this.format = format;
Expand Down Expand Up @@ -286,10 +286,7 @@ public Date unmarshall(JsonUnmarshallerContext unmarshallerContext) throws Excep
* @return the instance.
*/
public static DateJsonUnmarshaller getInstance() {
if (instance == null) {
instance = new DateJsonUnmarshaller(TimestampFormat.UNIX_TIMESTAMP);
}
return instance;
return getInstance(TimestampFormat.UNIX_TIMESTAMP);
}

/**
Expand Down
9 changes: 9 additions & 0 deletions ...ndroid-sdk-core/src/test/java/com/amazonaws/transform/SimpleTypeJsonUnmarshallerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,15 @@ public void testDateRfc822JsonUnmarshaller() throws Exception {
assertEquals(unmarshalledDate.getTime(), date.getTime());
}

@Test
public void defaultFunctionAlwaysReturnsUnixTimestampUnmarshaller() {
SimpleTypeJsonUnmarshallers.DateJsonUnmarshaller first =
SimpleTypeJsonUnmarshallers.DateJsonUnmarshaller.getInstance(TimestampFormat.ISO_8601);
SimpleTypeJsonUnmarshallers.DateJsonUnmarshaller second =
SimpleTypeJsonUnmarshallers.DateJsonUnmarshaller.getInstance();
assertEquals(TimestampFormat.UNIX_TIMESTAMP, second.format);
}

@Test
public void testDoubleJsonUnmarshaller() throws Exception {
Double dub = new Double(5.5);
Expand Down