Skip to content

Commit

Permalink
minor change
Browse files Browse the repository at this point in the history
  • Loading branch information
workingDog committed Dec 9, 2017
1 parent a1553c6 commit 8d79e0c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,4 @@ With older Java you need to download the JCE from Oracle and follow the installa


### Status
work inn progress, not tested.
work in progress, not tested.
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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",
// "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"
)

Expand Down
3 changes: 2 additions & 1 deletion src/main/scala/com/kodekutters/taxii/Server.scala
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import scala.concurrent.ExecutionContext.Implicits.global
/**
* This Endpoint provides general information about a TAXII Server, including the advertised API Roots.
*
* @param conn the connection to the taxii2 server
* @param thePath the path to the server discovery endpoint, default "/taxii/"
* @param conn the connection to the taxii2 server
*/
case class Server(thePath: String = "/taxii/", conn: TaxiiConnection) {

Expand Down
6 changes: 3 additions & 3 deletions src/main/scala/com/kodekutters/taxii/TaxiiConnection.scala
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ case class TaxiiConnection(host: String,
"version" -> taxiiVersion,
"Authorization" -> ("Basic " + hash)).toSeq

// create the standalone WS client
// create the standalone Web Service client
val wsClient = StandaloneAhcWSClient()

/**
Expand Down Expand Up @@ -167,7 +167,7 @@ case class TaxiiConnection(host: String,
}

/**
* post data to the server. A POST with the chosen path is sent to the com.kodekutters.taxii server.
* post data to the server. A POST with the chosen path is sent to the taxii server.
* The server response is converted a Taxii2 Status resource.
*
* @param thePath the url path for the post
Expand Down Expand Up @@ -211,7 +211,7 @@ case class TaxiiConnection(host: String,
* start, end and total of the range
* If an error occurs return (-1,-1,-1)
*
* @param theString the Content-Range string
* @param theString the Content-Range string, for example "items 0-10/58"
*/
def toRangeInfo(theString: String): Tuple3[Int, Int, Int] = {
try {
Expand Down

0 comments on commit 8d79e0c

Please sign in to comment.