Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id CC0DF200B65 for ; Wed, 17 Aug 2016 23:48:11 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CAEA9160ABB; Wed, 17 Aug 2016 21:48:11 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4FE0E160AD0 for ; Wed, 17 Aug 2016 23:48:10 +0200 (CEST) Received: (qmail 96699 invoked by uid 500); 17 Aug 2016 21:48:09 -0000 Mailing-List: contact commits-help@usergrid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@usergrid.apache.org Delivered-To: mailing list commits@usergrid.apache.org Received: (qmail 96177 invoked by uid 99); 17 Aug 2016 21:48:09 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Aug 2016 21:48:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E7F87E97DD; Wed, 17 Aug 2016 21:48:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mrusso@apache.org To: commits@usergrid.apache.org Date: Wed, 17 Aug 2016 21:48:30 -0000 Message-Id: In-Reply-To: <22bcec7524da4f019fb99508d0673caa@git.apache.org> References: <22bcec7524da4f019fb99508d0673caa@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [23/38] usergrid git commit: Remove Astyanax dependencies for Scoped Cache serialization. archived-at: Wed, 17 Aug 2016 21:48:11 -0000 Remove Astyanax dependencies for Scoped Cache serialization. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/f9a29e80 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/f9a29e80 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/f9a29e80 Branch: refs/heads/master Commit: f9a29e803cab3940d5e3521b16201cd95067c460 Parents: 4475158 Author: Michael Russo Authored: Sun May 1 16:57:45 2016 +0800 Committer: Michael Russo Committed: Sun May 1 16:57:45 2016 +0800 ---------------------------------------------------------------------- .../cache/impl/ScopedCacheSerializationImpl.java | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/f9a29e80/stack/corepersistence/cache/src/main/java/org/apache/usergrid/persistence/cache/impl/ScopedCacheSerializationImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/cache/src/main/java/org/apache/usergrid/persistence/cache/impl/ScopedCacheSerializationImpl.java b/stack/corepersistence/cache/src/main/java/org/apache/usergrid/persistence/cache/impl/ScopedCacheSerializationImpl.java index ffa5f1f..f8dcccc 100644 --- a/stack/corepersistence/cache/src/main/java/org/apache/usergrid/persistence/cache/impl/ScopedCacheSerializationImpl.java +++ b/stack/corepersistence/cache/src/main/java/org/apache/usergrid/persistence/cache/impl/ScopedCacheSerializationImpl.java @@ -22,27 +22,12 @@ import com.datastax.driver.core.querybuilder.QueryBuilder; import com.datastax.driver.core.querybuilder.Using; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.PropertyAccessor; -import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; import com.google.common.hash.Funnel; -import com.google.common.hash.PrimitiveSink; import com.google.inject.Inject; -import com.netflix.astyanax.Keyspace; -import com.netflix.astyanax.MutationBatch; -import com.netflix.astyanax.Serializer; -import com.netflix.astyanax.connectionpool.OperationResult; -import com.netflix.astyanax.connectionpool.exceptions.ConnectionException; -import com.netflix.astyanax.connectionpool.exceptions.NotFoundException; -import com.netflix.astyanax.model.Column; -import com.netflix.astyanax.model.CompositeBuilder; -import com.netflix.astyanax.model.CompositeParser; -import com.netflix.astyanax.serializers.ObjectSerializer; -import com.netflix.astyanax.serializers.StringSerializer; -import org.apache.cassandra.db.marshal.BytesType; import org.apache.usergrid.persistence.cache.CacheScope; import org.apache.usergrid.persistence.core.astyanax.*; import org.apache.usergrid.persistence.core.datastax.CQLUtils; @@ -55,7 +40,6 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.nio.ByteBuffer; import java.util.*; -import java.util.concurrent.Callable; /** @@ -258,7 +242,7 @@ public class ScopedCacheSerializationImpl implements ScopedCacheSerializati } - + @Override public void invalidate(CacheScope scope) {