Reintroduce caching into models

app/Global.scala

@@ -23,6 +23,7 @@ import collins.util.security.AuthenticationAccessor
 import collins.util.security.AuthenticationProvider
 import collins.util.security.AuthenticationProviderConfig
 
+import collins.models.cache.Cache
 import collins.logging.LoggingHelper
 import collins.util.config.Registry
 import collins.solr.SolrHelper
@@ -39,14 +40,15 @@ object Global extends GlobalSettings with AuthenticationAccessor with CryptoAcce
 
   override def onStart(app: Application) {
     Registry.setupRegistry(app)
+    Cache.setupCache()
     setAuthentication(AuthenticationProvider.get(AuthenticationProviderConfig.authType))
     setCryptoKey(CryptoConfig.key)
     LoggingHelper.setupLogging(app)
     SolrHelper.setupSolr()
     MetricsReporter.setupMetrics()
     Callback.setupCallbacks()
   }
-  
+
   override def onStop(app: Application) {
     DB.shutdown()
     Registry.terminateRegistry()

app/collins/cache/CacheConfig.scala

@@ -0,0 +1,21 @@
+package collins.cache
+
+import com.google.common.cache.CacheBuilderSpec
+
+import collins.util.config.Configurable
+
+object CacheConfig extends Configurable {
+
+  override val namespace = "cache"
+  override val referenceConfigFilename = "cache_reference.conf"
+
+  def enabled = getBoolean("enabled", true)
+  def specification = getString("specification", "maximumSize=10000,expireAfterWrite=10s,recordStats")
+
+  override protected def validateConfig() {
+    if (enabled) {
+      logger.debug("Validating domain model cache specification")
+      CacheBuilderSpec.parse(specification)
+    }
+  }
+}

app/collins/cache/GuavaCacheFactory.scala

@@ -3,6 +3,7 @@ package collins.cache
 import com.google.common.cache.CacheBuilder
 import com.google.common.cache.CacheLoader
 import com.google.common.cache.LoadingCache
+import com.google.common.cache.{ Cache => BasicCache }
 
 /**
  * Creates an instance of Guava cache with the provided specification and cache loader.
@@ -11,4 +12,6 @@ object GuavaCacheFactory {
   def create[K <: AnyRef, V <: AnyRef](specification: String, loader: => CacheLoader[K, V]): LoadingCache[K, V] =
     CacheBuilder.from(specification)
       .build(loader)
+
+  def create[K <: AnyRef, V <: AnyRef](specification: String): BasicCache[K, V] = CacheBuilder.from(specification).build()
 }

app/collins/callbacks/CallbackMatcher.scala

@@ -46,7 +46,7 @@ case class CallbackMatcher(conditional: MatchConditional, fn: PropertyChangeEven
     val states = conditional.states.toSet
     val value = Option(fn(pce))
     value.filter(_.isInstanceOf[AssetView]).map(_.asInstanceOf[AssetView]).map { v =>
-      State.findById(v.state).map { state =>
+      State.findById(v.stateId).map { state =>
         states.map(_.toUpperCase).contains(state.name.toUpperCase)
       }.getOrElse(false)
     }.getOrElse(true)

app/collins/controllers/Admin.scala

@@ -1,5 +1,7 @@
 package collins.controllers
 
+import collins.models.cache.Cache
+
 import collins.solr.Solr
 import collins.util.Stats
 
@@ -15,7 +17,16 @@ object Admin extends SecureWebController {
     Ok(html.admin.logs())
   }(Permissions.AssetLogApi.GetAll)
 
-  def populateSolr = SecureAction {implicit req => 
+  def cache = SecureAction { implicit req =>
+    Ok(html.admin.cache(Cache.stats))
+  }(Permissions.Admin.Cache)
+
+  def clearCache = SecureAction { implicit req =>
+    Cache.clear()
+    Redirect(routes.Admin.cache)
+  }(Permissions.Admin.ClearCache)
+
+  def populateSolr = SecureAction { implicit req =>
     Solr.populate()
     Redirect(collins.app.routes.Resources.index).flashing("error" -> "Repopulating Solr index in the background.  May take a few minutes to complete")
   }(Permissions.Admin.ClearCache)

app/collins/controllers/IpmiApi.scala

@@ -34,7 +34,7 @@ trait IpmiApi {
         val g = IpAddress.toLong(gateway.get)
         val n = IpAddress.toLong(netmask.get)
         val p = IpmiInfo.encryptPassword(password.get)
-        IpmiInfo(asset.getId, username.get, p, g, a, n)
+        IpmiInfo(asset.id, username.get, p, g, a, n)
       }
     }
   }

app/collins/controllers/Permissions.scala

@@ -32,6 +32,7 @@ object Permissions {
   object Admin extends PermSpec("controllers.Admin") {
     def Spec = spec(AdminSpec)
     def Stats = spec("stats", Spec)
+    def Cache = spec("cache", Spec)
     def ClearCache = spec("clearCache", Stats)
   }
 

app/collins/controllers/actions/asset/ProvisionUtil.scala

@@ -233,13 +233,13 @@ trait Provisions extends ProvisionUtil with AssetAction { self: SecureAction =>
     val slId = SoftLayer.softLayerId(asset).get
     if (attribs.nonEmpty) {
       val lifeCycle = new AssetLifecycle(userOption(), tattler)
-      lifeCycle.updateAssetAttributes(Asset.findById(asset.getId).get, attribs)
+      lifeCycle.updateAssetAttributes(Asset.findById(asset.id).get, attribs)
     }
 
     BackgroundProcessor.send(ActivationProcessor(slId)(request)) { res =>
       processProvisionAction(res) {
         case true =>
-          val newAsset = Asset.findById(asset.getId).get
+          val newAsset = Asset.findById(asset.id).get
           Asset.partialUpdate(newAsset, None, AStatus.New.map(_.id))
           setAsset(newAsset)
           tattle("Asset successfully activated", false)
@@ -271,9 +271,9 @@ trait Provisions extends ProvisionUtil with AssetAction { self: SecureAction =>
         if (attribs.nonEmpty) {
           val lifeCycle = new AssetLifecycle(userOption(), tattler)
           lifeCycle.updateAssetAttributes(
-            Asset.findById(asset.getId).get, attribs
+            Asset.findById(asset.id).get, attribs
           )
-          setAsset(Asset.findById(asset.getId))
+          setAsset(Asset.findById(asset.id))
         }
         BackgroundProcessor.send(ProvisionerRun(pRequest)) { res =>
           processProvisionAction(res) { result =>

app/collins/controllers/actions/asset/UpdateStatusAction.scala

@@ -107,8 +107,8 @@ case class UpdateStatusAction(
   protected def checkStateConflict(
     asset: Asset, statusOpt: Option[AssetStatus], stateOpt: Option[State]
   ): Tuple2[Option[AssetStatus],Option[State]] = {
-    val status = statusOpt.getOrElse(asset.getStatus())
-    val state = stateOpt.getOrElse(State.findById(asset.state).getOrElse(State.empty))
+    val status = statusOpt.getOrElse(asset.status)
+    val state = stateOpt.getOrElse(asset.state.getOrElse(State.empty))
     if (state.status == State.ANY_STATUS || state.status == status.id) {
       (None, None)
     } else {

app/collins/controllers/actions/ipaddress/FindAssetByPoolAction.scala

@@ -26,7 +26,7 @@ case class FindAssetsByPoolAction(
   override def validate(): Validation =
     Right(ActionDataHolder(convertPoolName(pool)))
 
-  override def execute(rd: RequestDataHolder) = Future { 
+  override def execute(rd: RequestDataHolder) = Future {
     rd match {
       case ActionDataHolder(cleanPool) =>
         IpAddresses.findInPool(cleanPool) match {
@@ -35,7 +35,7 @@ case class FindAssetsByPoolAction(
               RequestDataHolder.error404("No such pool or no assets in pool")
             )
           case list =>
-            val jsList = list.map(e => Asset.findById(e.asset_id).get.toJsValue).toList
+            val jsList = list.map(e => Asset.findById(e.assetId).get.toJsValue).toList
             ResponseData(Status.Ok, JsObject(Seq("ASSETS" -> JsArray(jsList))))
         }
     }

app/collins/controllers/actions/ipaddress/UpdateAction.scala

@@ -42,7 +42,7 @@ case class UpdateAction(
     }.getOrElse {
       if (address.isDefined && gateway.isDefined && netmask.isDefined) {
         val p = convertPoolName(pool.getOrElse(IpAddressConfig.DefaultPoolName))
-        IpAddresses(asset.getId, gateway.get, address.get, netmask.get, p)
+        IpAddresses(asset.id, gateway.get, address.get, netmask.get, p)
       } else {
         throw new Exception("If creating a new IP the address, gateway and netmask must be specified")
       }

app/collins/controllers/actions/logs/SolrFindAction.scala

@@ -51,7 +51,7 @@ case class SolrFindAction(
   }
 
   protected def getLogs(adh: ActionDataHolder): Page[AssetLog] = {
-    (new AssetLogSearchQuery(adh.query, adh.params)).getPage.fold(
+    (new AssetLogSearchQuery(adh.query, adh.params)).getPage(AssetLog.findByIds(_)).fold(
       err => throw new Exception(err),
       res => res
     )

app/collins/graphs/MetricsCacheLoader.scala

@@ -4,6 +4,7 @@ import play.api.Logger
 
 import com.google.common.cache.CacheLoader
 
+import collins.models.Asset
 import collins.models.shared.PageParams
 import collins.models.shared.SortDirection
 import collins.solr.AssetDocType
@@ -43,7 +44,7 @@ case class MetricsCacheLoader() extends CacheLoader[MetricsQuery, Set[String]] {
         },
         expr => {
           val cq = AssetSearchQuery(expr, PageParams(0, 1, SortDirection.SortAsc, "TAG"))
-          cq.getPage().fold(
+          cq.getPage(Asset.findByTags(_)).fold(
             err => {
               logger.warn("Error executing CQL query: %s".format(err))
               false