Replace MemoryStore by SQLStore

aerogear-attic · Oct 28, 2014 · c0fe3fe · c0fe3fe
1 parent 1347017
commit c0fe3fe
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 28 deletions.
diff --git a/...thz-test/src/main/java/org/jboss/aerogear/android/impl/authz/oauth2/AuthzServiceTest.java b/...thz-test/src/main/java/org/jboss/aerogear/android/impl/authz/oauth2/AuthzServiceTest.java
@@ -17,7 +17,11 @@
 package org.jboss.aerogear.android.impl.authz.oauth2;
 
 import com.google.gson.JsonObject;
-
+import org.jboss.aerogear.android.authorization.test.MainActivity;
+import org.jboss.aerogear.android.datamanager.Store;
+import org.jboss.aerogear.android.http.HeaderAndBody;
+import org.jboss.aerogear.android.http.HttpProvider;
+import org.jboss.aerogear.android.impl.datamanager.SQLStore;
 import org.jboss.aerogear.android.impl.helper.UnitTestUtils;
 import org.jboss.aerogear.android.impl.util.PatchedActivityInstrumentationTestCase;
 import org.mockito.invocation.InvocationOnMock;
@@ -28,11 +32,6 @@
 import java.util.HashMap;
 
 import static java.util.Calendar.HOUR;
-import org.jboss.aerogear.android.authorization.test.MainActivity;
-import org.jboss.aerogear.android.datamanager.Store;
-import org.jboss.aerogear.android.http.HeaderAndBody;
-import org.jboss.aerogear.android.http.HttpProvider;
-import org.jboss.aerogear.android.impl.datamanager.MemoryStore;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
@@ -53,7 +52,7 @@ public AuthzServiceTest() {
     @Override
     public void setUp() throws Exception {
         super.setUp();
-        mockStore = mock(MemoryStore.class);
+        mockStore = mock(SQLStore.class);
         mockProvider = mock(HttpProvider.class);
         service = new OAuth2AuthzService() {
 

diff --git a/...-authz/src/main/java/org/jboss/aerogear/android/impl/authz/oauth2/OAuth2AuthzService.java b/...-authz/src/main/java/org/jboss/aerogear/android/impl/authz/oauth2/OAuth2AuthzService.java
@@ -24,33 +24,28 @@
 import android.os.IBinder;
 import android.util.Log;
 import android.util.Pair;
-
 import com.google.common.base.Function;
 import com.google.common.base.Strings;
 import com.google.common.collect.Collections2;
 import com.google.common.net.HttpHeaders;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import org.jboss.aerogear.android.DataManager;
+import org.jboss.aerogear.android.datamanager.IdGenerator;
+import org.jboss.aerogear.android.http.HeaderAndBody;
+import org.jboss.aerogear.android.http.HttpException;
+import org.jboss.aerogear.android.http.HttpProvider;
+import org.jboss.aerogear.android.impl.datamanager.SQLStore;
+import org.jboss.aerogear.android.impl.datamanager.SQLStoreConfiguration;
+import org.jboss.aerogear.android.impl.http.HttpRestProvider;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import org.jboss.aerogear.android.datamanager.IdGenerator;
-
-import org.jboss.aerogear.android.http.HeaderAndBody;
-import org.jboss.aerogear.android.http.HttpException;
-import org.jboss.aerogear.android.http.HttpProvider;
-import org.jboss.aerogear.android.impl.datamanager.MemoryStore;
-import org.jboss.aerogear.android.impl.http.HttpRestProvider;
+import java.util.*;
 
 import static org.jboss.aerogear.android.impl.util.UrlUtils.appendToBaseURL;
 
@@ -63,15 +58,14 @@ public class OAuth2AuthzService extends Service {
 
     private final AuthzBinder binder = new AuthzBinder(this);
 
-    private MemoryStore<OAuth2AuthzSession> sessionStore;
+    private SQLStore<OAuth2AuthzSession> sessionStore;
 
     public OAuth2AuthzService() {
     }
 
     @Override
     public void onCreate() {
         super.onCreate();
-
     }
 
     /**
@@ -173,16 +167,18 @@ public boolean onUnbind(Intent intent) {
     }
 
     private void openSessionStore() {
-
-        sessionStore = new MemoryStore<OAuth2AuthzSession>(
-                new IdGenerator() {
-
+        DataManager.config("sessionStore", SQLStoreConfiguration.class)
+                .forClass(OAuth2AuthzSession.class)
+                .withContext(getApplicationContext())
+                .withIdGenerator(new IdGenerator() {
                     @Override
                     public Serializable generate() {
                         return UUID.randomUUID().toString();
                     }
-                });
+                }).store();
 
+        sessionStore = (SQLStore<OAuth2AuthzSession>) DataManager.getStore("sessionStore");
+        sessionStore.openSync();
     }
 
     private void exchangeAuthorizationCodeForAccessToken(OAuth2AuthzSession storedAccount, OAuth2Properties config) throws OAuth2AuthorizationException {