Work up to prod 17/01

webfx-stack-cloud-image-client/pom.xml

@@ -23,25 +23,25 @@
 
         <dependency>
             <groupId>dev.webfx</groupId>
-            <artifactId>webfx-platform-conf</artifactId>
+            <artifactId>webfx-platform-blob</artifactId>
             <version>0.1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>dev.webfx</groupId>
-            <artifactId>webfx-platform-console</artifactId>
+            <artifactId>webfx-platform-conf</artifactId>
             <version>0.1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>dev.webfx</groupId>
-            <artifactId>webfx-platform-fetch</artifactId>
+            <artifactId>webfx-platform-console</artifactId>
             <version>0.1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>dev.webfx</groupId>
-            <artifactId>webfx-platform-file</artifactId>
+            <artifactId>webfx-platform-fetch</artifactId>
             <version>0.1.0-SNAPSHOT</version>
         </dependency>
 

webfx-stack-cloud-image-client/src/main/java/dev/webfx/stack/cloud/image/impl/client/ClientImageService.java

@@ -1,13 +1,14 @@
 package dev.webfx.stack.cloud.image.impl.client;
 
 import dev.webfx.platform.async.Future;
+import dev.webfx.platform.async.Promise;
+import dev.webfx.platform.blob.Blob;
 import dev.webfx.platform.conf.ConfigLoader;
 import dev.webfx.platform.console.Console;
 import dev.webfx.platform.fetch.CorsMode;
 import dev.webfx.platform.fetch.Fetch;
 import dev.webfx.platform.fetch.FetchOptions;
 import dev.webfx.platform.fetch.FormData;
-import dev.webfx.platform.file.File;
 import dev.webfx.platform.util.http.HttpMethod;
 import dev.webfx.platform.util.http.HttpResponseStatus;
 import dev.webfx.stack.cloud.image.CloudImageService;
@@ -23,8 +24,11 @@ public class ClientImageService implements CloudImageService {
     private String uploadUrl;
     private String deleteUrl;
     private String urlPattern;
+    private final Future<Void> urlPatternFuture;
 
     public ClientImageService() {
+        Promise<Void> urlPatternPromise = Promise.promise();
+        urlPatternFuture = urlPatternPromise.future();
         ConfigLoader.onConfigLoaded(CONFIG_PATH, config -> {
             existsUrl = config.getString("existsUrl");
             uploadUrl = config.getString("uploadUrl");
@@ -33,45 +37,52 @@ public ClientImageService() {
             Fetch.fetchText(urlPatternUrl, new FetchOptions()
                     .setMethod(HttpMethod.GET)
                     .setMode(CorsMode.NO_CORS)
-            )
-                    .onFailure(Console::log)
-                    .onSuccess(text -> urlPattern = text);
+                )
+                .onFailure(Console::log)
+                .onSuccess(text -> urlPattern = text)
+                .onComplete(ar -> urlPatternPromise.complete());
         });
     }
 
+    // Helper method to ensure that we return the future only when urlPattern is loaded (because the client may need to
+    // call CloudImageService.url() method - which requires urlPattern to be loaded - after returning the future).
+    private <T> Future<T> whenUrlPatternLoaded(Future<T> future) {
+        return urlPatternFuture.compose(v -> future);
+    }
+
     public Future<Boolean> exists(String id) {
-        return Fetch.fetch(existsUrl, new FetchOptions()
-                .setMethod(HttpMethod.POST)
-                .setMode(CorsMode.NO_CORS)
-                .setBody(new FormData().append("id", id))
+        return whenUrlPatternLoaded(Fetch.fetch(existsUrl, new FetchOptions()
+            .setMethod(HttpMethod.POST)
+            .setMode(CorsMode.NO_CORS)
+            .setBody(new FormData().append("id", id))
         ).compose(response -> {
             if (response.ok())
                 return Future.succeededFuture(response.status() == HttpResponseStatus.OK_200); // OK_200 = exists, NO_CONTENT_204 = doesn't exist
             return Future.failedFuture("Failed to call " + existsUrl + ", status = " + response.statusText());
-        });
+        }));
     }
 
-    public Future<Void> upload(File file, String id, boolean overwrite) {
-        return Fetch.fetch(uploadUrl, new FetchOptions()
-                .setMethod(HttpMethod.POST)
-                .setMode(CorsMode.NO_CORS)
-                .setBody(new FormData()
-                        .append("id", id)
-                        .append("overwrite", overwrite)
-                        .append("file", file, id)
-                )
-        ).map(response -> null);
+    public Future<Void> upload(Blob blob, String id, boolean overwrite) {
+        return whenUrlPatternLoaded(Fetch.fetch(uploadUrl, new FetchOptions()
+            .setMethod(HttpMethod.POST)
+            .setMode(CorsMode.NO_CORS)
+            .setBody(new FormData()
+                .append("id", id)
+                .append("overwrite", overwrite)
+                .append("file", blob, id)
+            )
+        ).map(response -> null));
     }
 
     public Future<Void> delete(String id, boolean invalidate) {
-        return Fetch.fetch(deleteUrl, new FetchOptions()
-                .setMethod(HttpMethod.POST)
-                .setMode(CorsMode.NO_CORS)
-                .setBody(new FormData()
-                    .append("id", id)
-                    .append("invalidate", invalidate)
-                )
-        ).map(response -> null);
+        return whenUrlPatternLoaded(Fetch.fetch(deleteUrl, new FetchOptions()
+            .setMethod(HttpMethod.POST)
+            .setMode(CorsMode.NO_CORS)
+            .setBody(new FormData()
+                .append("id", id)
+                .append("invalidate", invalidate)
+            )
+        ).map(response -> null));
     }
 
     @Override

webfx-stack-cloud-image-client/src/main/java/module-info.java

@@ -4,10 +4,10 @@
 
     // Direct dependencies modules
     requires webfx.platform.async;
+    requires webfx.platform.blob;
     requires webfx.platform.conf;
     requires webfx.platform.console;
     requires webfx.platform.fetch;
-    requires webfx.platform.file;
     requires webfx.platform.util.http;
     requires webfx.stack.cloud.image;
 

webfx-stack-cloud-image-cloudinary/pom.xml

@@ -15,12 +15,24 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>dev.webfx</groupId>
+            <artifactId>webfx-platform-ast</artifactId>
+            <version>0.1.0-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>dev.webfx</groupId>
             <artifactId>webfx-platform-async</artifactId>
             <version>0.1.0-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>dev.webfx</groupId>
+            <artifactId>webfx-platform-blob</artifactId>
+            <version>0.1.0-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>dev.webfx</groupId>
             <artifactId>webfx-platform-conf</artifactId>
@@ -29,13 +41,13 @@
 
         <dependency>
             <groupId>dev.webfx</groupId>
-            <artifactId>webfx-platform-fetch</artifactId>
+            <artifactId>webfx-platform-console</artifactId>
             <version>0.1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>dev.webfx</groupId>
-            <artifactId>webfx-platform-file</artifactId>
+            <artifactId>webfx-platform-fetch</artifactId>
             <version>0.1.0-SNAPSHOT</version>
         </dependency>
 

webfx-stack-cloud-image-cloudinary/src/main/java/dev/webfx/stack/cloud/image/impl/cloudinary/Cloudinary.java

@@ -1,23 +1,30 @@
 package dev.webfx.stack.cloud.image.impl.cloudinary;
 
+import dev.webfx.platform.ast.AST;
+import dev.webfx.platform.ast.ReadOnlyAstObject;
 import dev.webfx.platform.async.Future;
+import dev.webfx.platform.blob.Blob;
 import dev.webfx.platform.conf.ConfigLoader;
+import dev.webfx.platform.console.Console;
 import dev.webfx.platform.fetch.*;
-import dev.webfx.platform.file.File;
-import dev.webfx.platform.util.http.HttpHeaders;
-import dev.webfx.platform.util.http.HttpMethod;
 import dev.webfx.platform.util.Strings;
 import dev.webfx.platform.util.collection.Collections;
+import dev.webfx.platform.util.http.HttpHeaders;
+import dev.webfx.platform.util.http.HttpMethod;
 import dev.webfx.stack.cloud.image.impl.fetchbased.FetchBasedCloudImageService;
 import dev.webfx.stack.hash.sha1.Sha1;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author Bruno Salmon
  */
 public class Cloudinary extends FetchBasedCloudImageService {
 
+    private static final boolean LOG_JSON_REPLY = true;
     private static final String CONFIG_PATH = "webfx.stack.cloud.image.cloudinary";
 
     private String cloudName;
@@ -43,17 +50,18 @@ public Future<Boolean> exists(String id) {
                 .map(Response::ok);
     }
 
-    public Future<Void> upload(File file, String id, boolean overwrite) {
+    public Future<Void> upload(Blob blob, String id, boolean overwrite) {
         return fetchJsonObject(
                 "https://api.cloudinary.com/v1_1/" + cloudName + "/image/upload",
                 HttpMethod.POST,
                 new FetchOptions().setBody(
                         signFormData(new FormData()
                             .append("public_id", id)
                             .append("overwrite", overwrite)
-                        ).append("file", file, id)
+                            .append("invalidate", true) // Otherwise the new image might not be displayed immediately after upload
+                        ).append("file", blob, id)
                 )
-        ).map(json -> null);
+        ).map(json -> logJsonReply("upload", json));
     }
 
     public Future<Void> delete(String id, boolean invalidate) {
@@ -66,7 +74,14 @@ public Future<Void> delete(String id, boolean invalidate) {
                                 .append("invalidate", invalidate)
                         )
                 )
-        ).map(json -> null);
+        ).map(json -> logJsonReply("delete", json));
+    }
+
+    private static Void logJsonReply(String operation, ReadOnlyAstObject jsonReply) {
+        if (LOG_JSON_REPLY) {
+            Console.log("[CLOUDINARY] - " + operation + " - json reply = " + AST.formatObject(jsonReply, "json"));
+        }
+        return null;
     }
 
     @Override

webfx-stack-cloud-image-cloudinary/src/main/java/module-info.java

@@ -3,10 +3,12 @@
 module webfx.stack.cloud.image.cloudinary {
 
     // Direct dependencies modules
+    requires webfx.platform.ast;
     requires webfx.platform.async;
+    requires webfx.platform.blob;
     requires webfx.platform.conf;
+    requires webfx.platform.console;
     requires webfx.platform.fetch;
-    requires webfx.platform.file;
     requires webfx.platform.util;
     requires webfx.platform.util.http;
     requires webfx.stack.cloud.image;

webfx-stack-cloud-image/pom.xml

@@ -29,19 +29,19 @@
 
         <dependency>
             <groupId>dev.webfx</groupId>
-            <artifactId>webfx-platform-fetch</artifactId>
+            <artifactId>webfx-platform-blob</artifactId>
             <version>0.1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>dev.webfx</groupId>
-            <artifactId>webfx-platform-fetch-ast-json</artifactId>
+            <artifactId>webfx-platform-fetch</artifactId>
             <version>0.1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>dev.webfx</groupId>
-            <artifactId>webfx-platform-file</artifactId>
+            <artifactId>webfx-platform-fetch-ast-json</artifactId>
             <version>0.1.0-SNAPSHOT</version>
         </dependency>
 

webfx-stack-cloud-image/src/main/java/dev/webfx/stack/cloud/image/CloudImageService.java

@@ -1,8 +1,7 @@
 package dev.webfx.stack.cloud.image;
 
-import dev.webfx.platform.ast.ReadOnlyAstObject;
 import dev.webfx.platform.async.Future;
-import dev.webfx.platform.file.File;
+import dev.webfx.platform.blob.Blob;
 
 /**
  * @author Bruno Salmon
@@ -11,12 +10,15 @@ public interface CloudImageService {
 
     Future<Boolean> exists(String id);
 
-    Future<Void> upload(File file, String id, boolean overwrite);
+    Future<Void> upload(Blob blob, String id, boolean overwrite);
 
     Future<Void> delete(String id, boolean invalidate);
 
     default String url(String source, int width, int height) {
-        String url = urlPattern().replace(":source", source);
+        String urlPattern = urlPattern();
+        if (urlPattern == null)
+            throw new IllegalStateException("[CloudImageService] urlPattern is null");
+        String url = urlPattern.replace(":source", source);
         if (width > 0)
             url = url.replace(":width", "" + width);
         else
@@ -25,6 +27,9 @@ default String url(String source, int width, int height) {
             url = url.replace(":height", "" + height);
         else
             url = url.replace("/h_:height", ""); // temporary
+
+        //We add a random parameter to prevent the cache to display an old image
+        url = url + "?t=" + System.currentTimeMillis();
         return url;
     }
 

webfx-stack-cloud-image/src/main/java/module-info.java

@@ -5,9 +5,9 @@
     // Direct dependencies modules
     requires transitive webfx.platform.ast;
     requires webfx.platform.async;
+    requires webfx.platform.blob;
     requires webfx.platform.fetch;
     requires webfx.platform.fetch.ast.json;
-    requires webfx.platform.file;
     requires webfx.platform.util.http;
 
     // Exported packages

webfx-stack-i18n-controls/src/main/java/dev/webfx/stack/i18n/controls/I18nControls.java

@@ -89,4 +89,8 @@ public static CheckBox newCheckBox(Object i18nKey, Object... args) {
         return bindI18nProperties(new CheckBox(), i18nKey, args);
     }
 
+    public static ToggleButton newToggleButton(Object i18nKey, Object... args) {
+        return bindI18nProperties(new ToggleButton(), i18nKey, args);
+    }
+
 }

webfx-stack-i18n/src/main/java/dev/webfx/stack/i18n/spi/impl/I18nProviderImpl.java

@@ -235,8 +235,12 @@ public <TK extends Enum<?> & TokenKey> Object interpretBracketsAndDefaultInToken
                     // the original language (ex: FR).
                     Object resolvedValue = getDictionaryTokenValueImpl(new I18nSubKey(sToken.substring(i1 + 1, i2), i18nKey), tokenKey, originalDictionary, false, originalDictionary, false, skipMessageLoading);
                     // If the bracket token has been resolved, we return it with the parts before and after the brackets
-                    if (resolvedValue != null)
-                        tokenValue = (i1 == 0 ? "" : sToken.substring(0, i1)) + resolvedValue + sToken.substring(i2 + 1);
+                    if (resolvedValue != null) {
+                        if (i1 == 0 && i2 == sToken.length() - 1) // except if there are no parts before and after the brackets
+                            tokenValue = resolvedValue; // in which case we return the resolved object as is (possibly not a String)
+                        else
+                            tokenValue = (i1 == 0 ? "" : sToken.substring(0, i1)) + resolvedValue + sToken.substring(i2 + 1);
+                    }
                 }
             }
         }
@@ -338,7 +342,7 @@ public void scheduleMessageLoading(Object i18nKey, boolean inDefaultLanguage) {
             // (presumably in the same animation frame) we do the actual load of these keys.
             dictionaryLoadingScheduled = UiScheduler.scheduleDeferred(() -> {
                 // Making a copy of the keys before clearing it for the next possible schedule
-                Set<Object> loadingKeys = new HashSet<>(keysToLoad);
+                Set<Object> loadingKeys = new HashSet<>(keysToLoad); // ConcurrentModificationException observed
                 keysToLoad.clear();
                 // Extracting the message keys to load from them (in case they are different)
                 Set<Object> messageKeysToLoad = loadingKeys.stream()

webfx-stack-orm-entity-binding/pom.xml

@@ -21,6 +21,12 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-graphics</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>dev.webfx</groupId>
             <artifactId>webfx-platform-javatime-emul-j2cl</artifactId>