Skip to content

Commit 709f4a9

Browse files
authored
Add lowercase support for headers in API responses
1 parent c233ce6 commit 709f4a9

File tree

6 files changed

+13
-5
lines changed

6 files changed

+13
-5
lines changed

cloudinary-core/src/test/java/com/cloudinary/TransformationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,4 +300,4 @@ public void testContextMetadataToUserVariables() {
300300

301301
assertEquals("$xpos_ctx:!x_pos!_to_f,$ypos_ctx:!y_pos!_to_f,c_crop,x_$xpos_mul_w,y_$ypos_mul_h", t.generate());
302302
}
303-
}
303+
}

cloudinary-http42/src/main/java/com/cloudinary/http42/api/Response.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public HttpResponse getRawHttpResponse() {
3232
}
3333

3434
private static final Pattern RATE_LIMIT_REGEX = Pattern
35-
.compile("X-Feature(\\w*)RateLimit(-Limit|-Reset|-Remaining)");
35+
.compile("X-FEATURE(\\w*)RATELIMIT(-LIMIT|-RESET|-REMAINING)", Pattern.CASE_INSENSITIVE);
3636
private static final String RFC1123_PATTERN = "EEE, dd MMM yyyyy HH:mm:ss z";
3737
private static final DateFormat RFC1123 = new SimpleDateFormat(RFC1123_PATTERN, Locale.ENGLISH);
3838

cloudinary-http43/src/main/java/com/cloudinary/http43/api/Response.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public HttpResponse getRawHttpResponse() {
3131
}
3232

3333
private static final Pattern RATE_LIMIT_REGEX = Pattern
34-
.compile("X-Feature(\\w*)RateLimit(-Limit|-Reset|-Remaining)");
34+
.compile("X-FEATURE(\\w*)RATELIMIT(-LIMIT|-RESET|-REMAINING)", Pattern.CASE_INSENSITIVE);
3535
private static final String RFC1123_PATTERN = "EEE, dd MMM yyyyy HH:mm:ss z";
3636
private static final DateFormat RFC1123 = new SimpleDateFormat(RFC1123_PATTERN, Locale.ENGLISH);
3737

cloudinary-http44/src/main/java/com/cloudinary/http44/api/Response.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public HttpResponse getRawHttpResponse() {
3131
}
3232

3333
private static final Pattern RATE_LIMIT_REGEX = Pattern
34-
.compile("X-Feature(\\w*)RateLimit(-Limit|-Reset|-Remaining)");
34+
.compile("X-FEATURE(\\w*)RATELIMIT(-LIMIT|-RESET|-REMAINING)", Pattern.CASE_INSENSITIVE);
3535
private static final String RFC1123_PATTERN = "EEE, dd MMM yyyyy HH:mm:ss z";
3636
private static final DateFormat RFC1123 = new SimpleDateFormat(RFC1123_PATTERN, Locale.ENGLISH);
3737

cloudinary-http45/src/main/java/com/cloudinary/http45/api/Response.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public HttpResponse getRawHttpResponse() {
3131
}
3232

3333
private static final Pattern RATE_LIMIT_REGEX = Pattern
34-
.compile("X-Feature(\\w*)RateLimit(-Limit|-Reset|-Remaining)");
34+
.compile("X-FEATURE(\\w*)RATELIMIT(-LIMIT|-RESET|-REMAINING)", Pattern.CASE_INSENSITIVE);
3535
private static final String RFC1123_PATTERN = "EEE, dd MMM yyyyy HH:mm:ss z";
3636
private static final DateFormat RFC1123 = new SimpleDateFormat(RFC1123_PATTERN, Locale.ENGLISH);
3737

cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractApiTest.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -557,6 +557,14 @@ public void testRateLimitWithNonEnglishLocale() throws Exception {
557557
Assert.assertNotNull(result.apiRateLimit().getReset());
558558
}
559559

560+
@Test
561+
public void testRateLimits() throws Exception {
562+
ApiResponse result = cloudinary.api().usage(new HashMap());
563+
Assert.assertNotEquals(0, result.apiRateLimit().getLimit());
564+
Assert.assertNotNull(result.apiRateLimit().getReset());
565+
Assert.assertNotEquals(0, result.apiRateLimit().getRemaining());
566+
}
567+
560568
@Test
561569
public void test19Ping() throws Exception {
562570
// should support ping API call

0 commit comments

Comments
 (0)