Skip to content

Force US locale for compatibility with English BP server #496

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

Merged
rpmoore merged 1 commit into from
Aug 21, 2017
Merged

Force US locale for compatibility with English BP server #496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ds3-sdk/src/main/java/com/spectralogic/ds3client/networking/NetworkClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ private String buildPath() {

private void addHeaders(final HttpRequest httpRequest) {
// Add common headers.
final String date = DateFormatter.dateToRfc882();
final String date = DateFormatter.dateToRfc822();
httpRequest.addHeader(HOST, NetUtils.buildHostField(NetworkClientImpl.this.connectionDetails));
httpRequest.addHeader(DATE, date);
httpRequest.addHeader(CONTENT_TYPE, this.ds3Request.getContentType());
Expand Down
11 changes: 6 additions & 5 deletions ds3-sdk/src/main/java/com/spectralogic/ds3client/utils/DateFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,20 @@

import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;

public final class DateFormatter {
final static private String RFC822FORMAT = "EEE, dd MMM yyyy HH:mm:ss Z";
/**
* Returns a RFC-882 formatted string with the current time.
* Returns a RFC-822 formatted string with the current time.
*/
public static String dateToRfc882() {
return dateToRfc882(new Date());
public static String dateToRfc822() {
return dateToRfc822(new Date());
}

public static String dateToRfc882(final Date date) {
final SimpleDateFormat sdf = new SimpleDateFormat(RFC822FORMAT);
public static String dateToRfc822(final Date date) {
final SimpleDateFormat sdf = new SimpleDateFormat(RFC822FORMAT, Locale.US);
sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
return sdf.format(date);
}
Expand Down
13 changes: 12 additions & 1 deletion ds3-sdk/src/test/java/com/spectralogic/ds3client/utils/DateFormatter_Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import org.junit.Test;

import java.util.Date;
import java.util.Locale;

import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
Expand All @@ -29,6 +30,16 @@ public class DateFormatter_Test {
public void formatDate() {
final Date date = new Date(1390414308132L);

assertThat(DateFormatter.dateToRfc882(date), is("Wed, 22 Jan 2014 18:11:48 +0000"));
assertThat(DateFormatter.dateToRfc822(date), is("Wed, 22 Jan 2014 18:11:48 +0000"));
}

@Test
public void formatDateMandarin() {
final Locale defaultLocale = Locale.getDefault();
Locale.setDefault(Locale.CHINESE);
final Date date = new Date(1390414308132L);

assertThat(DateFormatter.dateToRfc822(date), is("Wed, 22 Jan 2014 18:11:48 +0000"));
Locale.setDefault(defaultLocale);
}
}