Fix Java 1.6 support (#161)

cloudinary · Feb 12, 2019 · 1bbe101 · 1bbe101
1 parent 738b328
commit 1bbe101
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/cloudinary-core/src/main/java/com/cloudinary/EagerTransformation.java b/cloudinary-core/src/main/java/com/cloudinary/EagerTransformation.java
@@ -45,7 +45,7 @@ public String generate(Iterable<Map> optionsList) {
 
     @Override
     public String generate(Map options) {
-        List<String> eager = new ArrayList<>();
+        List<String> eager = new ArrayList<String>();
         eager.add(super.generate(options));
 
         if (StringUtils.isNotBlank(format)){

diff --git a/cloudinary-core/src/main/java/com/cloudinary/Transformation.java b/cloudinary-core/src/main/java/com/cloudinary/Transformation.java
@@ -679,7 +679,7 @@ public String generate(Map options) {
             components.add(variables);
         }
 
-        Map<String, String> params = new HashMap<>(64);
+        Map<String, String> params = new HashMap<String, String>(64);
 
         params.put("a", Expression.normalize(angle));
         params.put("ar", Expression.normalize(options.get("aspect_ratio")));
@@ -707,7 +707,7 @@ public String generate(Map options) {
             params.put(SIMPLE_PARAMS[i], ObjectUtils.asString(options.get(SIMPLE_PARAMS[i + 1])));
         }
 
-        params = new TreeMap<>(params);
+        params = new TreeMap<String, String>(params);
 
         for (Map.Entry<String, String> param : params.entrySet()) {
             if (StringUtils.isNotBlank(param.getValue())) {

diff --git a/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractApiTest.java b/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractApiTest.java
@@ -228,7 +228,7 @@ public void testResourcesListingStartAt() throws Exception {
     public void testTransformationsWithCursor() throws Exception {
         String name = "testTransformation" + SDK_TEST_TAG + System.currentTimeMillis();
         api.createTransformation(name, "c_scale,w_100", null);
-        final List<Map> transformations = new ArrayList<>();
+        final List<Map> transformations = new ArrayList<Map>();
         String next_cursor = null;
         do {
             Map result = api.transformations(ObjectUtils.asMap("max_results", 500, "next_cursor", next_cursor));

diff --git a/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractUploaderTest.java b/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractUploaderTest.java
@@ -27,7 +27,7 @@ abstract public class AbstractUploaderTest extends MockableTest {
     private static final String UPLOADER_TAG = SDK_TEST_TAG + "_uploader";
     public static final int SRC_TEST_IMAGE_W = 241;
     public static final int SRC_TEST_IMAGE_H = 51;
-    private static Map<String, Set<String>> toDelete = new HashMap<>();
+    private static Map<String, Set<String>> toDelete = new HashMap<String, Set<String>>();
 
     @BeforeClass
     public static void setUpClass() throws IOException {
@@ -546,7 +546,7 @@ public void testResponsiveBreakpoints() throws Exception {
 
     @Test
     public void testCreateArchive() throws Exception {
-        List<String> toDelete = new ArrayList<>(2);
+        List<String> toDelete = new ArrayList<String>(2);
         Map result = cloudinary.uploader().createArchive(new ArchiveParams().tags(new String[]{ARCHIVE_TAG}));
         toDelete.add(result.get("public_id").toString());
         assertEquals(2, result.get("file_count"));
@@ -658,7 +658,7 @@ public void testQualityAnalysis() throws IOException {
     private void addToDeleteList(String type, String id) {
         Set<String> ids = toDelete.get(type);
         if (ids == null) {
-            ids = new HashSet<>();
+            ids = new HashSet<String>();
             toDelete.put(type, ids);
         }
 

diff --git a/java_shared.gradle b/java_shared.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'java'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
 }