Extend JavaSerializationCodec with scalacache

Fix implicit not found message
cb372 · Apr 3, 2016 · 6963d8d · 6963d8d
1 parent ed20a0e
commit 6963d8d
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 28 deletions.
diff --git a/core/src/main/scala/scalacache/package.scala b/core/src/main/scala/scalacache/package.scala
@@ -2,11 +2,11 @@
 import com.typesafe.scalalogging.StrictLogging
 
 import scala.concurrent.duration.Duration
-import scala.concurrent.{ ExecutionContext, Await, Future }
+import scala.concurrent.{ Await, ExecutionContext, Future }
 import scala.util.Try
-import scalacache.serialization.Codec
+import scalacache.serialization.{ Codec, JavaSerializationCodec }
 
-package object scalacache extends StrictLogging {
+package object scalacache extends StrictLogging with JavaSerializationCodec {
 
   class TypedApi[V](implicit val scalaCache: ScalaCache, codec: Codec[V]) {
 
@@ -60,7 +60,7 @@ package object scalacache extends StrictLogging {
 
     private def getWithKey(key: String)(implicit flags: Flags): Future[Option[V]] = {
       if (flags.readsEnabled) {
-        scalaCache.cache.get(key)
+        scalaCache.cache.get[V](key)
       } else {
         logger.debug(s"Skipping cache GET because cache reads are disabled. Key: $key")
         Future.successful(None)

diff --git a/core/src/main/scala/scalacache/serialization/Codec.scala b/core/src/main/scala/scalacache/serialization/Codec.scala
@@ -7,7 +7,7 @@ import scala.language.implicitConversions
  * Represents a type class that needs to be implemented
  * for serialization/deserialization to work.
  */
-@implicitNotFound("Could not find any Codecs for type ${T}. Please provide one or import scalacache.serdes.JavaSerializationCodecs._")
+@implicitNotFound("Could not find any Codecs for type ${T}. Please provide one or import scalacache._")
 trait Codec[T] {
   def serialize(value: T): Array[Byte]
   def deserialize(data: Array[Byte]): T

diff --git a/core/src/main/scala/scalacache/serialization/JavaSerializationCodecs.scala b/core/src/main/scala/scalacache/serialization/JavaSerializationCodecs.scala
diff --git a/core/src/test/scala/common/LegacyCodecCheckSupport.scala b/core/src/test/scala/common/LegacyCodecCheckSupport.scala
@@ -3,11 +3,11 @@ package common
 import org.scalatest.concurrent.{ IntegrationPatience, ScalaFutures }
 import org.scalatest.{ Matchers, FlatSpec }
 
-import scalacache.Cache
+import scalacache._
 import scalacache.serialization.Codec
 
 object Snack {
-  val Jagabee = Snack("Jagabee")
+  val Jagabee: Snack = Snack("Jagabee")
 }
 
 case class Snack(name: String)

diff --git a/core/src/test/scala/issue42/Issue42Spec.scala b/core/src/test/scala/issue42/Issue42Spec.scala
@@ -3,7 +3,7 @@ package issue42
 import org.scalatest.{ FlatSpec, Matchers }
 
 import scala.util.Random
-import scalacache.serialization.JavaSerializationCodecs._
+import scalacache._
 
 class Issue42Spec extends FlatSpec with Matchers {
 

diff --git a/core/src/test/scala/sample/Sample.scala b/core/src/test/scala/sample/Sample.scala
@@ -1,7 +1,6 @@
 package sample
 
 import scalacache._
-import scalacache.serialization.JavaSerializationCodecs._
 import memoization._
 
 import scala.concurrent.Future

diff --git a/core/src/test/scala/scalacache/PackageObjectSpec.scala b/core/src/test/scala/scalacache/PackageObjectSpec.scala
@@ -2,6 +2,7 @@ package scalacache
 
 import org.scalatest.concurrent.{ Eventually, ScalaFutures }
 import org.scalatest.{ BeforeAndAfter, FlatSpec, Matchers }
+
 import scala.concurrent.Future
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.duration._

diff --git a/core/src/test/scala/scalacache/memoization/SquerylIntegrationSpec.scala b/core/src/test/scala/scalacache/memoization/SquerylIntegrationSpec.scala
@@ -8,8 +8,6 @@ import org.squeryl.annotations.Column
 import org.squeryl._
 import org.squeryl.PrimitiveTypeMode._
 
-import scalacache.serialization.JavaSerializationCodecs._
-
 import scalacache.{ MockCache, LoggingCache, ScalaCache }
 
 /**

diff --git a/core/src/test/scala/scalacache/mocks.scala b/core/src/test/scala/scalacache/mocks.scala
@@ -67,7 +67,7 @@ trait LoggingCache extends Cache {
 
   abstract override def get[V](key: String)(implicit codec: Codec[V]): Future[Option[V]] = {
     getCalledWithArgs.append(key)
-    super.get(key)
+    super.get[V](key)
   }
 
   abstract override def put[V](key: String, value: V, ttl: Option[Duration])(implicit codec: Codec[V]) = {

diff --git a/core/src/test/scala/scalacache/serialization/JavaSerializationCodecSpec.scala b/core/src/test/scala/scalacache/serialization/JavaSerializationCodecSpec.scala
@@ -1,7 +1,6 @@
 package scalacache.serialization
 
 import org.scalatest.{ Matchers, FlatSpec }
-import JavaSerializationCodecs._
 
 class JavaSerializationCodecSpec extends FlatSpec with Matchers {
 

diff --git a/lrumap/src/test/scala/scalacache/lrumap/LruMapCacheSpec.scala b/lrumap/src/test/scala/scalacache/lrumap/LruMapCacheSpec.scala
@@ -6,8 +6,7 @@ import com.twitter.util.LruMap
 import org.joda.time.{ DateTime, DateTimeUtils }
 import org.scalatest.concurrent.ScalaFutures
 import org.scalatest.{ BeforeAndAfter, FlatSpec, Matchers }
-import scalacache.serialization.JavaSerializationCodecs
-import JavaSerializationCodecs._
+import scalacache._
 
 class LruMapCacheSpec extends FlatSpec with Matchers with BeforeAndAfter with ScalaFutures {
   def newCache = new LruMap[String, Object](10)

diff --git a/redis/src/test/scala/scalacache/redis/Issue32Spec.scala b/redis/src/test/scala/scalacache/redis/Issue32Spec.scala
@@ -3,7 +3,6 @@ package scalacache.redis
 import org.scalatest.{ BeforeAndAfter, Matchers, FlatSpec }
 
 import scalacache._
-import scalacache.serialization.JavaSerializationCodecs._
 import memoization._
 import redis._
 

diff --git a/redis/src/test/scala/scalacache/redis/PlayIntegrationSpec.scala b/redis/src/test/scala/scalacache/redis/PlayIntegrationSpec.scala
@@ -8,7 +8,6 @@ import play.api.{ Application, GlobalSettings }
 
 import scalacache._
 import scalacache.memoization._
-import scalacache.serialization.JavaSerializationCodecs._
 
 class PlayIntegrationSpec extends FlatSpec with Matchers with OneAppPerTest {
 

diff --git a/redis/src/test/scala/scalacache/redis/RedisCacheSpecBase.scala b/redis/src/test/scala/scalacache/redis/RedisCacheSpecBase.scala
@@ -11,7 +11,6 @@ import scala.concurrent.Future
 import scala.concurrent.duration._
 import scala.language.postfixOps
 import scalacache.serialization.Codec
-import scalacache.serialization.JavaSerializationCodecs._
 import scalacache.Cache
 
 trait RedisCacheSpecBase

diff --git a/redis/src/test/scala/scalacache/redis/RedisSerializationSpec.scala b/redis/src/test/scala/scalacache/redis/RedisSerializationSpec.scala
@@ -1,7 +1,6 @@
 package scalacache.redis
 
 import org.scalatest.{ FlatSpec, Matchers }
-import scalacache.serialization.JavaSerializationCodecs._
 
 class RedisSerializationSpec extends FlatSpec with Matchers with RedisSerialization {