Skip to content

Commit 5eb95df

Browse files
aditimadan-Cloudinarynitzanj
authored andcommitted
Add support for google-storage URLs (gs://) in uploads (#154)
1 parent 98bc0d7 commit 5eb95df

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

cloudinary-core/src/main/java/com/cloudinary/utils/StringUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ public static String read(InputStream in) throws IOException {
209209
}
210210

211211
public static boolean isRemoteUrl(String file) {
212-
return file.matches("ftp:.*|https?:.*|s3:.*|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)");
212+
return file.matches("ftp:.*|https?:.*|s3:.*|gs:.*|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)");
213213
}
214214

215215
/**

cloudinary-http42/src/main/java/com/cloudinary/http42/UploaderStrategy.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
8585
}
8686
}
8787
}
88-
89-
if (file instanceof String && !((String) file).matches("ftp:.*|https?:.*|s3:.*|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)")) {
88+
if(file instanceof String && !(StringUtils.isRemoteUrl((String)file))){
9089
File _file = new File((String) file);
9190
if (!_file.isFile() && !_file.canRead()) {
9291
throw new IOException("File not found or unreadable: " + file);
9392
}
9493
file = _file;
9594
}
95+
9696
String filename = (String) options.get("filename");
9797
if (file instanceof File) {
9898
multipart.addPart("file", new FileBody((File) file, filename, "application/octet-stream", null));

cloudinary-http43/src/main/java/com/cloudinary/http43/UploaderStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
102102
}
103103
}
104104

105-
if (file instanceof String && !((String) file).matches("ftp:.*|https?:.*|s3:.*|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)")) {
105+
if(file instanceof String && !(StringUtils.isRemoteUrl((String)file))){
106106
File _file = new File((String) file);
107107
if (!_file.isFile() && !_file.canRead()) {
108108
throw new IOException("File not found or unreadable: " + file);

0 commit comments

Comments
 (0)