Skip to content

Commit 1bbe101

Browse files
authored
Fix Java 1.6 support (#161)
1 parent 738b328 commit 1bbe101

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

cloudinary-core/src/main/java/com/cloudinary/EagerTransformation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public String generate(Iterable<Map> optionsList) {
4545

4646
@Override
4747
public String generate(Map options) {
48-
List<String> eager = new ArrayList<>();
48+
List<String> eager = new ArrayList<String>();
4949
eager.add(super.generate(options));
5050

5151
if (StringUtils.isNotBlank(format)){

cloudinary-core/src/main/java/com/cloudinary/Transformation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ public String generate(Map options) {
679679
components.add(variables);
680680
}
681681

682-
Map<String, String> params = new HashMap<>(64);
682+
Map<String, String> params = new HashMap<String, String>(64);
683683

684684
params.put("a", Expression.normalize(angle));
685685
params.put("ar", Expression.normalize(options.get("aspect_ratio")));
@@ -707,7 +707,7 @@ public String generate(Map options) {
707707
params.put(SIMPLE_PARAMS[i], ObjectUtils.asString(options.get(SIMPLE_PARAMS[i + 1])));
708708
}
709709

710-
params = new TreeMap<>(params);
710+
params = new TreeMap<String, String>(params);
711711

712712
for (Map.Entry<String, String> param : params.entrySet()) {
713713
if (StringUtils.isNotBlank(param.getValue())) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ public void testResourcesListingStartAt() throws Exception {
228228
public void testTransformationsWithCursor() throws Exception {
229229
String name = "testTransformation" + SDK_TEST_TAG + System.currentTimeMillis();
230230
api.createTransformation(name, "c_scale,w_100", null);
231-
final List<Map> transformations = new ArrayList<>();
231+
final List<Map> transformations = new ArrayList<Map>();
232232
String next_cursor = null;
233233
do {
234234
Map result = api.transformations(ObjectUtils.asMap("max_results", 500, "next_cursor", next_cursor));

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ abstract public class AbstractUploaderTest extends MockableTest {
2727
private static final String UPLOADER_TAG = SDK_TEST_TAG + "_uploader";
2828
public static final int SRC_TEST_IMAGE_W = 241;
2929
public static final int SRC_TEST_IMAGE_H = 51;
30-
private static Map<String, Set<String>> toDelete = new HashMap<>();
30+
private static Map<String, Set<String>> toDelete = new HashMap<String, Set<String>>();
3131

3232
@BeforeClass
3333
public static void setUpClass() throws IOException {
@@ -546,7 +546,7 @@ public void testResponsiveBreakpoints() throws Exception {
546546

547547
@Test
548548
public void testCreateArchive() throws Exception {
549-
List<String> toDelete = new ArrayList<>(2);
549+
List<String> toDelete = new ArrayList<String>(2);
550550
Map result = cloudinary.uploader().createArchive(new ArchiveParams().tags(new String[]{ARCHIVE_TAG}));
551551
toDelete.add(result.get("public_id").toString());
552552
assertEquals(2, result.get("file_count"));
@@ -658,7 +658,7 @@ public void testQualityAnalysis() throws IOException {
658658
private void addToDeleteList(String type, String id) {
659659
Set<String> ids = toDelete.get(type);
660660
if (ids == null) {
661-
ids = new HashSet<>();
661+
ids = new HashSet<String>();
662662
toDelete.put(type, ids);
663663
}
664664

java_shared.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'java'
22

3-
sourceCompatibility = 1.7
4-
targetCompatibility = 1.7
3+
sourceCompatibility = 1.6
4+
targetCompatibility = 1.6
55
tasks.withType(JavaCompile) {
66
options.encoding = 'UTF-8'
77
}

0 commit comments

Comments
 (0)