Skip to content

Commit 232a2e5

Browse files
authored
Remove deprecated functions
1 parent 238b549 commit 232a2e5

File tree

9 files changed

+5
-70
lines changed

9 files changed

+5
-70
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -401,9 +401,4 @@ private String buildUrl(String base, Map<String, Object> params) throws Unsuppor
401401
}
402402
return urlBuilder.toString();
403403
}
404-
405-
@Deprecated
406-
public static Map asMap(Object... values) {
407-
return ObjectUtils.asMap(values);
408-
}
409404
}

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -263,11 +263,6 @@ public Map explicit(String publicId, Map options) throws IOException {
263263
return callApi("explicit", params, options, null);
264264
}
265265

266-
@Deprecated
267-
public Map generate_sprite(String tag, Map options) throws IOException {
268-
return generateSprite(tag, options);
269-
}
270-
271266
public Map generateSprite(String tag, Map options) throws IOException {
272267
if (options == null)
273268
options = Collections.singletonMap("tag", tag);

cloudinary-core/src/main/java/com/cloudinary/transformation/AbstractLayerBuilder.java

Lines changed: 0 additions & 7 deletions
This file was deleted.

cloudinary-core/src/main/java/com/cloudinary/transformation/Condition.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -65,27 +65,10 @@ public Condition initialDuration(String operator, Object value) {
6565
return predicate("idu", operator, value);
6666
}
6767

68-
69-
/**
70-
* @deprecated Use {@link #faceCount(String, Object)} instead
71-
*/
72-
@Deprecated
73-
public Condition faces(String operator, Object value) {
74-
return faceCount(operator, value);
75-
}
76-
7768
public Condition faceCount(String operator, Object value) {
7869
return predicate("fc", operator, value);
7970
}
8071

81-
/**
82-
* @deprecated Use {@link #pageCount(String, Object)} instead
83-
*/
84-
@Deprecated
85-
public Condition pages(String operator, Object value) {
86-
return pageCount(operator, value);
87-
}
88-
8972
public Condition pageCount(String operator, Object value) {
9073
return predicate("pc", operator, value);
9174
}

cloudinary-core/src/main/java/com/cloudinary/transformation/LayerBuilder.java

Lines changed: 0 additions & 7 deletions
This file was deleted.

cloudinary-core/src/main/java/com/cloudinary/transformation/SubtitlesLayerBuilder.java

Lines changed: 0 additions & 7 deletions
This file was deleted.

cloudinary-core/src/main/java/com/cloudinary/transformation/TextLayerBuilder.java

Lines changed: 0 additions & 7 deletions
This file was deleted.

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ public void testSecureDistibution() {
146146
public void testSecureAkamai() {
147147
// should default to akamai if secure is given with private_cdn and no
148148
// secure_distribution
149+
cloudinary.config.secure = true;
149150
cloudinary.config.privateCdn = true;
150151
String result = cloudinary.url().generate("test");
151152
assertEquals("https://test123-res.cloudinary.com/image/upload/test", result);
@@ -155,6 +156,7 @@ public void testSecureAkamai() {
155156
public void testSecureNonAkamai() {
156157
// should not add cloud_name if private_cdn and secure non akamai
157158
// secure_distribution
159+
cloudinary.config.secure = true;
158160
cloudinary.config.privateCdn = true;
159161
cloudinary.config.secureDistribution = "something.cloudfront.net";
160162
String result = cloudinary.url().generate("test");
@@ -1209,10 +1211,9 @@ public void videoTagWithAuthTokenTest() {
12091211
.type("upload")
12101212
.authToken(new AuthToken("123456").duration(300))
12111213
.signed(true)
1212-
// .videoTag("sample", Cloudinary.asMap(
1213-
// "controls", true,
1214-
// "loop", true)
1215-
.videoTag("sample", asMap("controls", true,
1214+
.secure(true)
1215+
.videoTag("sample", ObjectUtils.asMap(
1216+
"controls", true,
12161217
"loop", true)
12171218
);
12181219
assert(actualTag.contains("cld_token"));

cloudinary-taglib/src/main/java/com/cloudinary/taglib/CloudinaryImageTag.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,4 @@ public String getExtraClasses() {
7272
public void setExtraClasses(String extraClasses) {
7373
this.extraClasses = extraClasses;
7474
}
75-
76-
@Deprecated
77-
public void setPublicId(String src) {
78-
this.src = src;
79-
}
80-
81-
@Deprecated
82-
public String getPublicId() {
83-
return src;
84-
}
85-
8675
}

0 commit comments

Comments
 (0)