initial commit

build.sbt

@@ -12,8 +12,8 @@ libraryDependencies ++= Seq(
   "com.typesafe.play" %% "play-ws-standalone-json" % "1.1.3",
   "com.typesafe.play" %% "play-json" % "2.6.7",
   "com.github.workingDog" %% "scalastix" % "0.6-SNAPSHOT",
- // "ch.qos.logback" % "logback-classic" % "1.2.3",
- // "com.typesafe.scala-logging" %% "scala-logging" % "3.7.2"
+//  "ch.qos.logback" % "logback-classic" % "1.2.3",
+//  "com.typesafe.scala-logging" %% "scala-logging" % "3.7.2"
   "org.slf4j" % "slf4j-nop" % "1.7.25"
 )
 

src/main/scala/taxii/Collection.scala

@@ -39,7 +39,7 @@ case class Collection(taxiiCollection: TaxiiCollection, api_root: String,
   def addObjects(bundle: Bundle): Future[Option[TaxiiStatus]] =
     conn.post(thePath, Json.toJson[Bundle](bundle)).map(_.toOption)
 
-  def getManifest(filter: Option[Seq[(String, String)]] = None, range: String = ""): Future[Option[TaxiiManifest]] = {
+  def getManifests(filter: Option[Seq[(String, String)]] = None, range: String = ""): Future[Option[TaxiiManifest]] = {
     val thePath = basePath + "/manifest/"
     val theHeader = if (range == null || range.isEmpty) conn.getHeaders
     else (conn.getHeaders.toMap + ("Range" -> ("items=" + range))).toSeq

src/main/scala/taxii/TaxiiConnection.scala

@@ -64,7 +64,7 @@ case class TaxiiConnection(host: String,
 
   import TaxiiConnection._
 
-  //  private val logger = Logger(classOf[TaxiiConnection])
+  // private val logger = Logger(classOf[TaxiiConnection])
 
   // make sure have a clean protocol value
   val protocolValue = if (protocol.trim.endsWith(":")) protocol.trim.dropRight(1) else protocol.trim
@@ -173,7 +173,7 @@ case class TaxiiConnection(host: String,
     * @param thePath   the url path for the post
     * @param jsonValue the JsValue data to send as a json Taxii resource.
     * @return either a future Taxii2 error message or a future Taxii2 Status resource.
-    *         Json.stringify(jsonValue)
+    *
     */
   def post(thePath: String, jsonValue: JsValue): Future[Either[TaxiiErrorMessage, TaxiiStatus]] = {
     wsClient.url(thePath)
@@ -209,7 +209,7 @@ case class TaxiiConnection(host: String,
   /**
     * return the Content-Range string as a tuple of 3 integers,
     * start, end and total of the range
-    * If an error occurs return (0,0,0)
+    * If an error occurs return (-1,-1,-1)
     *
     * @param theString the Content-Range  string
     */
@@ -222,7 +222,7 @@ case class TaxiiConnection(host: String,
       val total = part(1).toInt
       (start, end, total)
     } catch {
-      case ex: Throwable => (0, 0, 0)
+      case ex: Throwable => (-1, -1, -1)
     }
   }
 }