init

svenruppert · svenruppert · commit 918539f6abe9 · 2019-01-28T17:52:35.000+01:00
diff --git a/src/main/java/org/rapidpm/vaadin/BasicTestUIRunner.java b/src/main/java/org/rapidpm/vaadin/BasicTestUIRunner.java
@@ -16,20 +16,11 @@
 package org.rapidpm.vaadin;
 
 import org.apache.meecrowave.Meecrowave;
-import org.rapidpm.vaadin.imagecache.filesystem.BlobImageServiceFileSystem;
-import org.rapidpm.vaadin.imagecache.map.BlobImageServiceMap;
-import org.rapidpm.vaadin.imagecache.BlobService;
 
 public class BasicTestUIRunner {
   private BasicTestUIRunner() {
   }
 
-
-  public static final BlobService BLOB_SERVICE = new BlobImageServiceFileSystem();
-//  public static final BlobService BLOB_SERVICE = new BlobImageServiceMap();
-//  public static final BlobService BLOB_SERVICE = new BlobImageServiceWeakRef();
-//  public static final BlobService BLOB_SERVICE = new BlobImageServiceMapDB();
-
   public static void main(String[] args) {
 
     new Meecrowave(new Meecrowave.Builder() {
diff --git a/src/main/java/org/rapidpm/vaadin/VaadinApp.java b/src/main/java/org/rapidpm/vaadin/VaadinApp.java
@@ -15,14 +15,18 @@
  */
 package org.rapidpm.vaadin;
 
+import static org.rapidpm.frp.model.Result.ofNullable;
+import static org.rapidpm.vaadin.BlobImagePushService.register;
 import static org.rapidpm.vaadin.imagecache.ImageFunctions.nextImageName;
 import static org.rapidpm.vaadin.imagecache.ImageFunctions.streamResource;
-import static org.rapidpm.vaadin.BlobImagePushService.register;
 
 import java.util.function.Function;
 
 import org.rapidpm.dependencies.core.logger.HasLogger;
+import org.rapidpm.frp.model.Result;
+import org.rapidpm.vaadin.imagecache.BlobService;
 import com.vaadin.flow.component.Composite;
+import com.vaadin.flow.component.DetachEvent;
 import com.vaadin.flow.component.html.Div;
 import com.vaadin.flow.component.html.Image;
 import com.vaadin.flow.component.page.Push;
@@ -43,27 +47,29 @@ private Function<AbstractStreamResource, Image> createImage() {
 
   private Function<String, AbstractStreamResource> createImageResource() {
     return (imageID) -> streamResource()
-        .apply(BasicTestUIRunner.BLOB_SERVICE)
+        .apply(BlobService.INSTANCE)
         .apply(imageID)
         .setCacheTime(0);
   }
 
   private Image image;
-  private Registration registration;
+  private Result<Registration> registration;
 
   public VaadinApp() {
-    Div content = getContent();
-    content.setSizeFull();
-
     image = createImageResource()
         .andThen(createImage()).apply(nextImageName().get());
 
-    registration = register(imgID -> image.getUI()
-                                          .ifPresent(ui -> ui.access(() -> {
-                                            logger().info("DashboardComponent - imgID = " + imgID);
-                                            image.setSrc(createImageResource().apply(imgID));
-                                          })));
+    registration = ofNullable(register(imgID -> image.getUI()
+                                      .ifPresent(ui -> ui.access(() -> {
+                                        logger().info("VaadinApp - imgID = " + imgID);
+                                        image.setSrc(createImageResource().apply(imgID));
+                                      }))));
+    getContent().add(image);
+  }
 
-    content.add(image);
+  @Override
+  protected void onDetach(DetachEvent detachEvent) {
+    super.onDetach(detachEvent);
+    registration.ifPresent(Registration::remove);
   }
 }
diff --git a/src/main/java/org/rapidpm/vaadin/imagecache/BlobImageServiceFileFunctions.java b/src/main/java/org/rapidpm/vaadin/imagecache/BlobImageServiceFileFunctions.java
@@ -13,6 +13,4 @@ public interface BlobImageServiceFileFunctions {
   static CheckedFunction<String, byte[]> loadFile() {
     return (blobID) -> readAllBytes(new File(STORAGE_PREFIX + blobID).toPath());
   }
-
-
 }
diff --git a/src/main/java/org/rapidpm/vaadin/imagecache/BlobService.java b/src/main/java/org/rapidpm/vaadin/imagecache/BlobService.java
@@ -1,10 +1,22 @@
 package org.rapidpm.vaadin.imagecache;
 
 import org.rapidpm.frp.model.Result;
+import org.rapidpm.vaadin.imagecache.filesystem.BlobImageServiceFileSystem;
+import org.rapidpm.vaadin.imagecache.map.BlobImageServiceMap;
+import org.rapidpm.vaadin.imagecache.mapdb.BlobImageServiceMapDB;
+import org.rapidpm.vaadin.imagecache.weakref.BlobImageServiceWeakRef;
 
 /**
  *
  */
 public interface BlobService {
+
+  //do not do this in production !!!
+  BlobService INSTANCE = new BlobImageServiceFileSystem();
+//  BlobService INSTANCE = new BlobImageServiceMap();
+//  BlobService INSTANCE = new BlobImageServiceWeakRef();
+//  BlobService INSTANCE = new BlobImageServiceMapDB();
+
+
   Result<byte[]> loadBlob(String blobID);
 }
diff --git a/src/main/java/org/rapidpm/vaadin/imagecache/weakref/BlobImageServiceWeakRef.java b/src/main/java/org/rapidpm/vaadin/imagecache/weakref/BlobImageServiceWeakRef.java
@@ -44,6 +44,4 @@ public Result<byte[]> loadBlob(String blobID) {
           .get();
     }
   }
-
-
 }

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,4 @@ public interface BlobImageServiceFileFunctions {`
`13`	`13`	`static CheckedFunction<String, byte[]> loadFile() {`
`14`	`14`	`return (blobID) -> readAllBytes(new File(STORAGE_PREFIX + blobID).toPath());`
`15`	`15`	`}`
`16`		`-`
`17`		`-`
`18`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,4 @@ public Result<byte[]> loadBlob(String blobID) {`
`44`	`44`	`.get();`
`45`	`45`	`}`
`46`	`46`	`}`
`47`		`-`
`48`		`-`
`49`	`47`	`}`