Changes to serialization/deserialization and companion objects

In the new setting, jacks gets confused when the case classes
that need to be serialized/deserialized have a companion object.
This commit changes the companion objects into separate objects,
and adapts the code references to them.

Also included are fixes to tests and it tests.

Author: Antonio Cunei

build/src/main/scala/com/typesafe/dbuild/build/Comparison.scala

@@ -15,6 +15,7 @@ import java.util.jar.JarFile
 import java.util.jar.JarEntry
 import java.io.FileInputStream
 import org.apache.oro.text.regex
+import com.typesafe.dbuild.model.SeqStringH._
 
 class Comparison(options: GeneralOptions, log: Logger) extends OptionTask(log) {
   def id = "Comparison"

build/src/main/scala/com/typesafe/dbuild/build/Notifications.scala

@@ -11,6 +11,9 @@ import RecipientType._
 import com.typesafe.dbuild.deploy.Creds.loadCreds
 import com.typesafe.dbuild.model.TemplateFormatter
 import dispatch.classic.{ Logger => _, _ }
+import com.typesafe.dbuild.model.SeqNotificationH._
+import com.typesafe.dbuild.model.SeqSelectorElementH._
+import com.typesafe.dbuild.model.SeqStringH._
 
 //
 // Ideally, the ConsoleNotification should become the mechanism by which the entire log of the

build/src/main/scala/com/typesafe/dbuild/build/OptionTask.scala

@@ -7,6 +7,7 @@ import Logger.prepareLogMsg
 import com.typesafe.dbuild.model._
 import java.io.File
 import com.typesafe.dbuild.repo.core.{ LocalRepoHelper, Repository }
+import com.typesafe.dbuild.model.SeqStringH._
 
 /**
  * Defines a task that will run before or after the build, defined somewhere

build/src/main/scala/com/typesafe/dbuild/build/SbtBuildMain.scala

@@ -23,6 +23,8 @@ import java.util.TimeZone
 import collection.JavaConverters._
 import scala.collection.JavaConversions._
 import com.typesafe.config.ConfigRenderOptions
+import com.typesafe.dbuild.model.SeqDBCH._
+import com.typesafe.dbuild.model.SeqStringH._
 
 /**
  * These options are created by SbtBuildMain, and are propagated to most stages of building, as

build/src/main/scala/com/typesafe/dbuild/build/SimpleBuildActor.scala

@@ -21,6 +21,7 @@ import java.io.File
 import com.typesafe.dbuild.repo.core.GlobalDirs
 import org.apache.maven.execution.BuildFailure
 import Logger.prepareLogMsg
+import com.typesafe.dbuild.model.SeqDBCH._
 
 case class RunDBuild(conf: DBuildConfiguration, confName: String,
   buildTarget: Option[String], logger: Logger, options: BuildRunOptions)
@@ -157,7 +158,7 @@ class SimpleBuildActor(extractor: ActorRef, builder: ActorRef, repository: Repos
                 case Right(o) => o
               }
 
-              nest(RepeatableDBuildConfig.fromExtractionOutcome(extractionOutcome)) { fullBuild =>
+              nest(RepeatableDBuildConfigH.fromExtractionOutcome(extractionOutcome)) { fullBuild =>
                 // what we call "RepeatableDBuildConfig" is actually only the portion of data that
                 // affect the build. Further options that do /not/ affect the build, but control dbuild in
                 // other ways (notifications, resolvers, etc), are in the GeneralOptions.

metadata/src/main/scala/com/typesafe/dbuild/model/Config.scala

@@ -13,6 +13,13 @@ import collection.JavaConverters._
 import com.typesafe.dbuild.deploy.DeployTarget
 import com.typesafe.dbuild.hashing
 
+import SeqBooleanH._
+import SeqDBCH._
+import SeqDepsModifiersH._
+import SeqNotificationH._
+import SeqSelectorElementH._
+import SeqSeqStringH._
+import SeqStringH._
 /**
  * Metadata about a build.  This is extracted from a config file and contains enough information
  * to further extract information about a build.
@@ -347,7 +354,7 @@ case class SeqString(override val s: Seq[String]) extends Flex[String](s) {
 }
 class SeqStringDeserializer extends SeqFlexDeserializer[String, SeqString]
 class SeqStringSerializer extends SeqFlexSerializer[String]
-object SeqString {
+object SeqStringH {
   implicit def SeqToSeqString(s: Seq[String]): SeqString = SeqString(s)
   implicit def SeqStringToSeq(a: SeqString): Seq[String] = a.s
 }
@@ -362,7 +369,7 @@ case class SeqBoolean(override val s: Seq[Boolean]) extends Flex[Boolean](s) {
 }
 class SeqBooleanDeserializer extends SeqFlexDeserializer[Boolean, SeqBoolean]
 class SeqBooleanSerializer extends SeqFlexSerializer[Boolean]
-object SeqBoolean {
+object SeqBooleanH {
   implicit def SeqToSeqBoolean(s: Seq[Boolean]): SeqBoolean = SeqBoolean(s)
   implicit def SeqBooleanToSeq(a: SeqBoolean): Seq[Boolean] = a.s
 }
@@ -376,7 +383,7 @@ object SeqBoolean {
 case class SeqDBC(override val s: Seq[DBuildConfig]) extends Flex[DBuildConfig](s)
 class SeqDBCDeserializer extends SeqFlexDeserializer[DBuildConfig, SeqDBC]
 class SeqDBCSerializer extends SeqFlexSerializer[DBuildConfig]
-object SeqDBC {
+object SeqDBCH {
   implicit def SeqToSeqDBC(s: Seq[DBuildConfig]): SeqDBC = SeqDBC(s)
   implicit def SeqDBCToSeq(a: SeqDBC): Seq[DBuildConfig] = a.s
 }
@@ -389,7 +396,7 @@ object SeqDBC {
 case class SeqDepsModifiers(override val s: Seq[DepsModifiers]) extends Flex[DepsModifiers](s)
 class SeqDMDeserializer extends SeqFlexDeserializer[DepsModifiers, SeqDepsModifiers]
 class SeqDMSerializer extends SeqFlexSerializer[DepsModifiers]
-object SeqDepsModifiers {
+object SeqDepsModifiersH {
   implicit def SeqToSeqDM(s: Seq[DepsModifiers]): SeqDepsModifiers = SeqDepsModifiers(s)
   implicit def SeqDMToSeq(a: SeqDepsModifiers): Seq[DepsModifiers] = a.s
   implicit def OptToSeqDM(o: Option[DepsModifiers]): SeqDepsModifiers = SeqDepsModifiers(o.toSeq)
@@ -407,7 +414,7 @@ case class SeqSeqString(override val s: Seq[SeqString]) extends Flex[SeqString](
   // turn the SeqSeqString into a Seq[Seq[String]]
   def expand = s map {_.s}
 }
-object SeqSeqString {
+object SeqSeqStringH {
   implicit def SeqToSeqSeqString(s: Seq[SeqString]): SeqSeqString = SeqSeqString(s)
   implicit def SeqSeqStringToSeq(a: SeqSeqString): Seq[SeqString] = a.s
 }
@@ -779,7 +786,7 @@ case class SeqSelectorElement(override val s: Seq[SelectorElement]) extends Flex
 }
 class SeqElementDeserializer extends SeqFlexDeserializer[SelectorElement, SeqSelectorElement]
 class SeqElementSerializer extends SeqFlexSerializer[SelectorElement]
-object SeqSelectorElement {
+object SeqSelectorElementH {
   implicit def SeqToSeqSelectorElement(s: Seq[SelectorElement]): SeqSelectorElement = SeqSelectorElement(s)
   implicit def SeqSelectorElementToSeq(a: SeqSelectorElement): Seq[SelectorElement] = a.s
 }
@@ -793,7 +800,7 @@ object SeqSelectorElement {
 case class SeqNotification(override val s: Seq[Notification]) extends Flex[Notification](s)
 class SeqNotificationDeserializer extends SeqFlexDeserializer[Notification, SeqNotification]
 class SeqNotificationSerializer extends SeqFlexSerializer[Notification]
-object SeqNotification {
+object SeqNotificationH {
   implicit def SeqToSeqNotification(s: Seq[Notification]): SeqNotification = SeqNotification(s)
   implicit def SeqNotificationToSeq(a: SeqNotification): Seq[Notification] = a.s
 }
@@ -976,7 +983,7 @@ class NotificationKindSerializer extends JsonSerializer[NotificationKind] {
 
 class NotificationDeserializer extends JsonDeserializer[Notification] {
   override def deserialize(p: JsonParser, ctx: DeserializationContext): Notification = {
-    val notificationKinds = NotificationKind.kinds
+    val notificationKinds = NotificationKindH.kinds
 
     val tf = ctx.getConfig.getTypeFactory()
     val d = ctx.findContextualValueDeserializer(tf.constructType(classOf[NotificationShadow]), null)
@@ -1133,7 +1140,7 @@ case class Smtp(
 
 case class ConsoleNotification() extends NotificationKind
 
-object NotificationKind {
+object NotificationKindH {
   val kinds: Map[String, java.lang.Class[_ <: NotificationKind]] = Map(
     "console" -> classOf[ConsoleNotification],
     "flowdock" -> classOf[FlowdockNotification],

metadata/src/main/scala/com/typesafe/dbuild/model/Extracted.scala

@@ -1,6 +1,10 @@
 package com.typesafe.dbuild.model
 import com.fasterxml.jackson.annotation.{ JsonCreator, JsonProperty }
 
+// Note: all of the case classes in this file are serialized/deserialized
+// by using the "jacks" library. For that library to work correctly, there
+// must not be any companion objects defined for those case classes.
+
 /**
  * A project dep is an extracted *external* build dependency.  I.e. this is a
  * maven/ivy artifact that exists and is built external to a local build.
@@ -70,7 +74,7 @@ case class ExtractedBuildMeta(@JsonProperty("proj-info") projInfo: Seq /*Levels*
         "%s -> (%s, %s, %s)" format (index, version, projects.mkString("\n\t", "\n\t", "\n"), subproj.mkString("\n  ", ", ", "\n"))
     })
 }
-object ExtractedBuildMeta {
+object ExtractedBuildMetaH {
   def apply(version: String, projects: Seq[Project], subproj: Seq[String] = Seq.empty): ExtractedBuildMeta =
     ExtractedBuildMeta(Seq /*Levels*/ (ProjMeta(version, projects, subproj)))
-}
+}

metadata/src/main/scala/com/typesafe/dbuild/model/RepeatableBuild.scala

@@ -3,6 +3,7 @@ package com.typesafe.dbuild.model
 import Utils.{ writeValue, canSeeSpace }
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.typesafe.dbuild.hashing
+import com.typesafe.dbuild.model.SeqStringH._
 
 /**
  * Information on how to build a project.  Consists of both dbuild
@@ -66,7 +67,7 @@ case class RepeatableDepInfo(
   // the two Seqs should probably be converted into a Seq[(String,String)].
 )
 
-object RepeatableDBuildConfig {
+object RepeatableDBuildConfigH {
   def fromExtractionOutcome(outcome: ExtractionOK) = RepeatableDBuildConfig(outcome.pces)
 }
 /**

metadata/src/test/scala/com/typesafe/dbuild/model/RepeatableBuildSpec.scala

@@ -2,6 +2,7 @@ package com.typesafe.dbuild.model
 
 import org.specs2.mutable.Specification
 import Utils.{writeValue,readValue}
+import SeqDepsModifiersH._
 
 import com.lambdaworks.jacks._
 import JacksOption._

proj/src/main/scala/com/typesafe/dbuild/project/dependencies/Extractor.scala

@@ -17,6 +17,8 @@ import com.typesafe.dbuild.project.cleanup.Recycling.{ updateTimeStamp, markSucc
 import com.typesafe.dbuild.model.ExtractionOK
 import org.apache.ivy.core.module.id.ModuleRevisionId
 import com.typesafe.dbuild.model.ProjectRef
+import com.typesafe.dbuild.model.SeqDepsModifiersH._
+import com.typesafe.dbuild.model.SeqStringH._
 
 /** This is used to extract dependencies from projects. */
 class Extractor(

support/src/it/scala/com/typesafe/dbuild/support/sbt/SbtExtractionSpec.scala

@@ -5,7 +5,8 @@ package sbt
 import com.typesafe.dbuild.logging.{ConsoleLogger, Logger}
 import com.typesafe.dbuild.model.{ProjectRef, SbtExtraConfig, ProjectBuildConfig, ExtractionConfig}
 import org.specs2.mutable.Specification
-
+import com.typesafe.dbuild.model.SeqSeqStringH._
+import com.typesafe.dbuild.model.SeqStringH._
 
 // TDOO - Because this requires the sbt plugin to be published, we have to publsh locally
 // before we can run integration tests.
@@ -82,4 +83,4 @@ object SbtExtractionSpec extends Specification {
       }
     }
   }
-}
+}

support/src/it/scala/com/typesafe/dbuild/support/sbt/SbtTestHarness.scala

@@ -11,7 +11,10 @@ object SbtTestHarness {
                              url: URL,
                              ivyPattern: String = defaultIvyPatterns,
                              artifactPattern: String = defaultIvyPatterns,
-                             mavenCompatible: Boolean = false) extends xsbti.IvyRepository
+                             mavenCompatible: Boolean = false,
+                             descriptorOptional: Boolean = false,
+                             skipConsistencyCheck:Boolean = false
+                            ) extends xsbti.IvyRepository
   private case class MvnRepo(id: String, url: URL) extends xsbti.MavenRepository
   // TODO - we should pull in whatever local ~/.sbt/repositories specifies, or what the current sbt project is using,
   // so we dont' have super slow integration tests.

support/src/main/scala/com/typesafe/dbuild/support/aether/AetherBuildSystem.scala

@@ -437,9 +437,9 @@ class AetherBuildSystem(repos: List[xsbti.Repository], workingDir: File) extends
         if (a.getClassifier != "jar" && a.getClassifier != "") Some(a.getClassifier) else None)
     }
 
-    ExtractedBuildMeta(modRevId.getRevision, Seq.empty, Seq.empty)
+    ExtractedBuildMetaH(modRevId.getRevision, Seq.empty, Seq.empty)
     // (version: String, projects: Seq[Project], subproj: Seq[String] = Seq.empty)
-    val q = ExtractedBuildMeta(modRevId.getRevision, Seq(Project(fixName(modRevId.getName()), modRevId.getOrganisation(),
+    val q = ExtractedBuildMetaH(modRevId.getRevision, Seq(Project(fixName(modRevId.getName()), modRevId.getOrganisation(),
       //  artifacts: Seq[ProjectRef],
       arts map artToProjectRef,
       //  dependencies: Seq[ProjectRef])

support/src/main/scala/com/typesafe/dbuild/support/assemble/AssembleBuildSystem.scala

@@ -27,7 +27,7 @@ import org.apache.ivy.util.ChecksumHelper
 import com.typesafe.dbuild.support.NameFixer.fixName
 import org.apache.ivy
 import com.typesafe.dbuild.project.build.BuildDirs.localRepos
-
+import com.typesafe.dbuild.model.SeqDBCH._
 /**
  * The "assemble" build system accepts a list of nested projects, with the same format
  * as the "build" section of a normal dbuild configuration file.
@@ -145,7 +145,7 @@ object AssembleBuildSystem extends BuildSystemCore {
     // postprocessing of the subproject names
     val adapted = adaptSubProjects(projectsAndSubprojects)
 
-    val newMeta = ExtractedBuildMeta("0.0.0",
+    val newMeta = ExtractedBuildMetaH("0.0.0",
       allConfigAndExtracted.flatMap(_.extracted.projects.map { p =>
         // remove all dependencies that are not already provided by this
         // assembled project (we pretend the resulting assembled set has

support/src/main/scala/com/typesafe/dbuild/support/ivy/IvyBuildSystem.scala

@@ -56,7 +56,7 @@ class IvyBuildSystem(repos: List[xsbti.Repository], workingDir: File) extends Bu
       log.warn("**** Warning: no artifacts found in project " + config.name)
       val module = config.uri.substring(4)
       val modRevId = ModuleRevisionId.parse(module)
-      ExtractedBuildMeta(modRevId.getRevision, Seq.empty, Seq.empty)
+      ExtractedBuildMetaH(modRevId.getRevision, Seq.empty, Seq.empty)
     } else {
       val modRevId = artifactReports(0).getArtifact.getModuleRevisionId
       val module = modRevId.getModuleId()
@@ -82,7 +82,7 @@ class IvyBuildSystem(repos: List[xsbti.Repository], workingDir: File) extends Bu
       val deps = loaded.flatMap { _.getAllArtifacts.toSeq }.distinct
       if (deps.nonEmpty) log.info("Dependencies of project " + config.name + ":")
       deps foreach { d => log.info("  " + d) }
-      val q = ExtractedBuildMeta(modRevId.getRevision, Seq(Project(fixName(first.getName), first.getOrganisation,
+      val q = ExtractedBuildMetaH(modRevId.getRevision, Seq(Project(fixName(first.getName), first.getOrganisation,
         firstNode.getAllArtifacts.toSeq.map(artifactToProjectRef).distinct,
         loaded.flatMap { _.getAllArtifacts.toSeq.map(artifactToProjectRef) }.distinct)))
       log.debug(q.toString)

support/src/main/scala/com/typesafe/dbuild/support/ivy/IvyMachinery.scala

@@ -30,6 +30,7 @@ import org.apache.ivy.core.resolve.IvyNode
 import org.apache.ivy.core.module.descriptor.Configuration
 import org.apache.ivy.core.module.descriptor.DefaultDependencyArtifactDescriptor
 import com.typesafe.dbuild.project.build.BuildDirs._
+import com.typesafe.dbuild.model.SeqStringH._
 
 object IvyMachinery {
   // there are two stages to the madness below. The first: we create a dummy caller, and add the module we need as a dependency.

support/src/main/scala/com/typesafe/dbuild/support/nil/NilBuildSystem.scala

@@ -49,6 +49,6 @@ object NilBuildSystem extends BuildSystemCore {
    * Fabricate some ExtractedBuildMeta as suitable.
    */
   private def readMeta(config: ProjectBuildConfig): ExtractedBuildMeta = {
-    ExtractedBuildMeta(config.setVersion getOrElse "xxx", Seq.empty, Seq.empty)
+    ExtractedBuildMetaH(config.setVersion getOrElse "xxx", Seq.empty, Seq.empty)
   }
 }

support/src/main/scala/com/typesafe/dbuild/support/sbt/DependencyExtractor.scala

@@ -11,6 +11,7 @@ import sys.process.Process
 import com.typesafe.dbuild.model.Utils.{ readValue, writeValue }
 import com.typesafe.dbuild.logging.Logger.logFullStackTrace
 import com.fasterxml.jackson.annotation.JsonProperty
+import com.typesafe.dbuild.model.SeqStringH._
 
 /**
  * Input data to the dbuild sbt plugin

support/src/main/scala/com/typesafe/dbuild/support/sbt/SbtBuildRunner.scala

@@ -14,6 +14,7 @@ import com.typesafe.dbuild.project.build.BuildDirs._
 import com.typesafe.dbuild.support.sbt.SbtRunner.SbtFileNames._
 import com.typesafe.dbuild.support.sbt.SbtRunner.{ sbtIvyCache, buildArtsFile }
 import com.typesafe.dbuild.model.SeqSeqString
+import com.typesafe.dbuild.model.SeqStringH._
 /**
  * Rewiring a level needs the information contained in RewireInput:
  *

support/src/main/scala/com/typesafe/dbuild/support/sbt/SbtBuildSystem.scala

@@ -14,6 +14,8 @@ import com.typesafe.dbuild.project.build.LocalBuildRunner
 import com.typesafe.dbuild.project.{ BuildSystem, BuildData }
 import com.typesafe.dbuild.model.Utils.{ writeValue, readValue }
 import com.typesafe.dbuild.support.sbt.SbtRunner.{ sbtIvyCache, buildArtsFile }
+import com.typesafe.dbuild.model.SeqSeqStringH._
+import com.typesafe.dbuild.model.SeqStringH._
 
 /** Implementation of the SBT build system. */
 class SbtBuildSystem(repos: List[xsbti.Repository], workingDir: File, debug: Boolean) extends BuildSystemCore {

support/src/main/scala/com/typesafe/dbuild/support/scala/ScalaBuildSystem.scala

@@ -24,6 +24,7 @@ import org.apache.maven.model.Dependency
 import org.apache.ivy.util.ChecksumHelper
 import com.typesafe.dbuild.support.NameFixer.fixName
 import com.typesafe.dbuild.project.build.BuildDirs.dbuildDirName
+import com.typesafe.dbuild.model.SeqStringH._
 
 /** Implementation of the Scala  build system. */
 object ScalaBuildSystem extends BuildSystemCore {
@@ -55,7 +56,7 @@ object ScalaBuildSystem extends BuildSystemCore {
     }
 
     // ok, now we just have to merge everything together.
-    val newMeta = ExtractedBuildMeta(meta.version, configAndExtracted.extracted.projects, meta.subproj)
+    val newMeta = ExtractedBuildMetaH(meta.version, configAndExtracted.extracted.projects, meta.subproj)
     log.info(newMeta.subproj.mkString("These subprojects will be built: ", ", ", ""))
     newMeta
   }

support/src/main/scala/com/typesafe/dbuild/support/test/TestBuildSystem.scala

@@ -52,6 +52,6 @@ object TestBuildSystem extends BuildSystemCore {
    * Fabricate some ExtractedBuildMeta as suitable.
    */
   private def readMeta(config: ProjectBuildConfig): ExtractedBuildMeta = {
-    ExtractedBuildMeta(config.setVersion getOrElse "xxx", Seq.empty, Seq.empty)
+    ExtractedBuildMetaH(config.setVersion getOrElse "xxx", Seq.empty, Seq.empty)
   }
 }