JAMES-1718 AccessTokenRepository should not throw upon already stored…

… AccessToken
apache · Apr 15, 2016 · 231beb5 · 231beb5
1 parent 0cc164a
commit 231beb5
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 55 deletions.
diff --git a/...ssandra/src/main/java/org/apache/james/jmap/cassandra/access/CassandraAccessTokenDAO.java b/...ssandra/src/main/java/org/apache/james/jmap/cassandra/access/CassandraAccessTokenDAO.java
@@ -56,7 +56,6 @@ public CassandraAccessTokenDAO(Session session, long durationInMilliseconds) {
             .where(eq(CassandraAccessTokenTable.TOKEN, bindMarker(CassandraAccessTokenTable.TOKEN))));
 
         this.insertStatement = session.prepare(insertInto(CassandraAccessTokenTable.TABLE_NAME)
-            .ifNotExists()
             .value(CassandraAccessTokenTable.TOKEN, bindMarker(CassandraAccessTokenTable.TOKEN))
             .value(CassandraAccessTokenTable.USERNAME, bindMarker(CassandraAccessTokenTable.USERNAME))
             .using(ttl(bindMarker(TTL))));
@@ -66,21 +65,21 @@ public CassandraAccessTokenDAO(Session session, long durationInMilliseconds) {
             .where(eq(CassandraAccessTokenTable.TOKEN, bindMarker(CassandraAccessTokenTable.TOKEN))));
     }
 
-    public CompletableFuture<Boolean> addToken(String username, AccessToken accessToken) {
-        return cassandraAsyncExecutor.executeReturnApplied(insertStatement.bind()
-            .setUUID(CassandraAccessTokenTable.TOKEN, accessToken.getToken())
+    public CompletableFuture<Void> addToken(String username, AccessToken accessToken) {
+        return cassandraAsyncExecutor.executeVoid(insertStatement.bind()
+            .setUUID(CassandraAccessTokenTable.TOKEN, accessToken.asUUID())
             .setString(CassandraAccessTokenTable.USERNAME, username)
             .setInt(TTL, durationInSeconds));
     }
 
     public CompletableFuture<Void> removeToken(AccessToken accessToken) {
         return cassandraAsyncExecutor.executeVoid(removeStatement.bind()
-            .setUUID(CassandraAccessTokenTable.TOKEN, accessToken.getToken()));
+            .setUUID(CassandraAccessTokenTable.TOKEN, accessToken.asUUID()));
     }
 
     public CompletableFuture<Optional<String>> getUsernameFromToken(AccessToken accessToken) {
         return cassandraAsyncExecutor.executeSingleRow(selectStatement.bind()
-            .setUUID(CassandraAccessTokenTable.TOKEN, accessToken.getToken()))
+            .setUUID(CassandraAccessTokenTable.TOKEN, accessToken.asUUID()))
             .thenApply(optional -> optional.map(row -> row.getString(CassandraAccessTokenTable.USERNAME)));
     }
 }
diff --git a/.../src/main/java/org/apache/james/jmap/cassandra/access/CassandraAccessTokenRepository.java b/.../src/main/java/org/apache/james/jmap/cassandra/access/CassandraAccessTokenRepository.java
@@ -24,7 +24,6 @@
 
 import org.apache.james.jmap.api.access.AccessToken;
 import org.apache.james.jmap.api.access.AccessTokenRepository;
-import org.apache.james.jmap.api.access.exceptions.AccessTokenAlreadyStored;
 import org.apache.james.jmap.api.access.exceptions.InvalidAccessToken;
 
 import com.datastax.driver.core.Session;
@@ -40,14 +39,12 @@ public CassandraAccessTokenRepository(Session session, @Named(TOKEN_EXPIRATION_I
     }
 
     @Override
-    public void addToken(String username, AccessToken accessToken) throws AccessTokenAlreadyStored {
+    public void addToken(String username, AccessToken accessToken) {
         Preconditions.checkNotNull(username);
         Preconditions.checkArgument(! username.isEmpty(), "Username should not be empty");
         Preconditions.checkNotNull(accessToken);
 
-        if (!cassandraAccessTokenDAO.addToken(username, accessToken).join()) {
-            throw new AccessTokenAlreadyStored(accessToken);
-        }
+        cassandraAccessTokenDAO.addToken(username, accessToken).join();
     }
 
     @Override

diff --git a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/access/AccessToken.java b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/access/AccessToken.java
@@ -48,7 +48,7 @@ public String serialize() {
         return token.toString();
     }
 
-    public UUID getToken() {
+    public UUID asUUID() {
         return token;
     }
 

diff --git a/.../data/data-jmap/src/main/java/org/apache/james/jmap/api/access/AccessTokenRepository.java b/.../data/data-jmap/src/main/java/org/apache/james/jmap/api/access/AccessTokenRepository.java
@@ -19,14 +19,13 @@
 
 package org.apache.james.jmap.api.access;
 
-import org.apache.james.jmap.api.access.exceptions.AccessTokenAlreadyStored;
 import org.apache.james.jmap.api.access.exceptions.InvalidAccessToken;
 
 public interface AccessTokenRepository {
 
     String TOKEN_EXPIRATION_IN_MS = "tokenExpirationInMs";
 
-    void addToken(String username, AccessToken accessToken) throws AccessTokenAlreadyStored;
+    void addToken(String username, AccessToken accessToken);
 
     void removeToken(AccessToken accessToken);
 

diff --git a/...p/src/main/java/org/apache/james/jmap/api/access/exceptions/AccessTokenAlreadyStored.java b/...p/src/main/java/org/apache/james/jmap/api/access/exceptions/AccessTokenAlreadyStored.java
diff --git a/...a-jmap/src/main/java/org/apache/james/jmap/memory/access/MemoryAccessTokenRepository.java b/...a-jmap/src/main/java/org/apache/james/jmap/memory/access/MemoryAccessTokenRepository.java
@@ -28,7 +28,6 @@
 import org.apache.commons.collections4.map.PassiveExpiringMap;
 import org.apache.james.jmap.api.access.AccessToken;
 import org.apache.james.jmap.api.access.AccessTokenRepository;
-import org.apache.james.jmap.api.access.exceptions.AccessTokenAlreadyStored;
 import org.apache.james.jmap.api.access.exceptions.InvalidAccessToken;
 
 import com.google.common.base.Preconditions;
@@ -44,14 +43,12 @@ public MemoryAccessTokenRepository(@Named(TOKEN_EXPIRATION_IN_MS) long durationI
     }
 
     @Override
-    public void addToken(String username, AccessToken accessToken) throws AccessTokenAlreadyStored{
+    public void addToken(String username, AccessToken accessToken) {
         Preconditions.checkNotNull(username);
         Preconditions.checkArgument(! username.isEmpty(), "Username should not be empty");
         Preconditions.checkNotNull(accessToken);
         synchronized (tokensExpirationDates) {
-            if (tokensExpirationDates.putIfAbsent(accessToken, username) != null) {
-                throw new AccessTokenAlreadyStored(accessToken);
-            }
+            tokensExpirationDates.put(accessToken, username);
         }
     }
 

diff --git a/...map/src/test/java/org/apache/james/jmap/api/access/AbstractAccessTokenRepositoryTest.java b/...map/src/test/java/org/apache/james/jmap/api/access/AbstractAccessTokenRepositoryTest.java
@@ -22,7 +22,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.apache.james.jmap.api.access.exceptions.AccessTokenAlreadyStored;
 import org.apache.james.jmap.api.access.exceptions.InvalidAccessToken;
 import org.junit.Before;
 import org.junit.Test;
@@ -60,12 +59,6 @@ public void removedTokensMustBeInvalid() throws Exception {
         assertThatThrownBy(() -> accessTokenRepository.getUsernameFromToken(TOKEN)).isInstanceOf(InvalidAccessToken.class);
     }
 
-    @Test
-    public void addTokenMustThrowWhenTokenIsAlreadyStored() throws Exception {
-        accessTokenRepository.addToken(USERNAME, TOKEN);
-        assertThatThrownBy(() -> accessTokenRepository.addToken(USERNAME, TOKEN)).isInstanceOf(AccessTokenAlreadyStored.class);
-    }
-
     @Test
     public void outDatedTokenMustBeInvalid() throws Exception {
         accessTokenRepository.addToken(USERNAME, TOKEN);