From 2f12fe0e80531333ed85f0112b18e36083e06b05 Mon Sep 17 00:00:00 2001
From: Thibaud Giovannetti <tspoke@hotmail.fr>
Date: Wed, 13 Sep 2017 17:52:55 +0200
Subject: [PATCH] Fix final method - add helper to wrap response to Optional

---
 .../store2store/store/StoreService.java       | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/store2store/src/main/java/com/playmoweb/store2store/store/StoreService.java b/store2store/src/main/java/com/playmoweb/store2store/store/StoreService.java
index 8d8fad4..5f94f1a 100644
--- a/store2store/src/main/java/com/playmoweb/store2store/store/StoreService.java
+++ b/store2store/src/main/java/com/playmoweb/store2store/store/StoreService.java
@@ -78,7 +78,7 @@ public boolean hasSyncedStore(){
     }
 
     @Override
-    public final Flowable<Optional<List<T>>> getAll(final Filter filter, final SortingMode sortingMode) {
+    public Flowable<Optional<List<T>>> getAll(final Filter filter, final SortingMode sortingMode) {
         List<Flowable<Optional<List<T>>>> flowables = new ArrayList<>();
         Flowable<Optional<List<T>>> flowStorage = dao.getAll(filter, sortingMode);
 
@@ -591,4 +591,23 @@ public Flowable<Integer> apply(Optional<T> reinsertedItem) throws Exception {
         flowables.add(flowStorage);
         return Flowable.concat(flowables);
     }
+
+    /**
+     * Wrap an object into an flowable optional
+     */
+    public <S> Flowable<Optional<S>> wrapOptional(S obj){
+        return Flowable.just(Optional.wrap(obj));
+    }
+
+    /**
+     * Wrap a flowable object into an flowable optional
+     */
+    public <S> Flowable<Optional<S>> wrapOptional(Flowable<S> obj){
+        return obj.flatMap(new Function<S, Flowable<Optional<S>>>() {
+            @Override
+            public Flowable<Optional<S>> apply(S s) throws Exception {
+                return wrapOptional(s);
+            }
+        });
+    }
 }