Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Commit

Permalink
correct travis shield and add version and type to plugins formatter
Browse files Browse the repository at this point in the history
  • Loading branch information
andrew committed Nov 21, 2017
1 parent d8a5047 commit 8518613
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 11 deletions.
10 changes: 5 additions & 5 deletions README.md
@@ -1,17 +1,17 @@
[![Build Status](https://travis-ci.org/datamountaineer/kafka-connect-tools.svg?branch=master)](https://travis-ci.org/datamountaineer/kafka-connect-tools)
[<img src="https://img.shields.io/badge/latest%20release-v1.0.3-blue.svg?label=latest%20release"/>](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22kafka-connect-cli%22)
[![Build Status](https://travis-ci.org/landoop/kafka-connect-tools.svg?branch=master)](https://travis-ci.org/landoop/kafka-connect-tools)
[<img src="https://img.shields.io/badge/latest%20release-v1.0.4-blue.svg?label=latest%20release"/>](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22kafka-connect-cli%22)

Connect tools is Maven

```bash
<dependency>
<groupId>com.datamountaineer</groupId>
<artifactId>kafka-connect-cli</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
</dependency>
```

##Requirements
## Requirements

* Java 1.8
* Gradle 3
Expand All @@ -27,7 +27,7 @@ out of band info to `stderr` and non-zero exit status on error. Commands
dealing with configuration expect or produce data in .properties
style: `key=value` lines and comments start with a `#`.

connect-cli 1.0.3
connect-cli 1.0.4
Usage: connect-cli [ps|get|rm|create|run|diff|status|plugins|describe|validate|restart|pause|resume] [options] [<connector-name>]

--help
Expand Down
1 change: 0 additions & 1 deletion build.gradle
Expand Up @@ -178,7 +178,6 @@ if (project.hasProperty('release')) {

}
}

}

nexusStaging {
Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/com/datamountaineer/connect/tools/Domain.scala
Expand Up @@ -18,7 +18,7 @@ case class TasklessConnectorInfo(name: String, config: Map[String,String])
case class ConnectorStatus(state:String,worker_id:String, trace:Option[String])
case class TaskStatus(id:Int, state:String,worker_id:String,trace:Option[String])
case class ConnectorTaskStatus(name:String, connector: ConnectorStatus, tasks: List[TaskStatus])
case class ConnectorPlugins(`class` :String)
case class ConnectorPlugins(`class` :String, `type`: String, version: Option[String])

case class Definition(name: String, `type`: String, required: Boolean, default_value: Option[String],
importance: Option[String], group: Option[String], display_name: Option[String],
Expand All @@ -36,7 +36,7 @@ object MyJsonProtocol extends DefaultJsonProtocol {
implicit val connectorstatus = jsonFormat3(ConnectorStatus)
implicit val taskstatus = jsonFormat4(TaskStatus)
implicit val connectortaskstatus = jsonFormat3(ConnectorTaskStatus)
implicit val connectorplugins = jsonFormat1(ConnectorPlugins)
implicit val connectorplugins = jsonFormat3(ConnectorPlugins)
implicit val values = jsonFormat5(Values)
implicit val definitions = jsonFormat9(Definition)
implicit val configs = jsonFormat2(Configs)
Expand Down
Expand Up @@ -120,7 +120,7 @@ class PropertiesFormatter extends Formatter {
s"${s.tasks.map(taskStatus).mkString("")}"

override def connectorPlugins(s: Seq[ConnectorPlugins]): String = {
s.map(_.toString).sorted.map(s=> s"Class name: $s").mkString("\n")
s.map(s => s"Class name: ${s.`class`}, Type: ${s.`type`}, Version: ${s.version.getOrElse("")}").mkString("\n")
}

override def connectorPluginsValidate(s: ConnectorPluginsValidate, validate: Boolean = false, props: Map[String, String] = Map.empty): String = {
Expand Down
4 changes: 2 additions & 2 deletions src/test/scala/com/datamountaineer/connect/tools/Test.scala
Expand Up @@ -110,10 +110,10 @@ class ApiUnitTests extends FunSuite with Matchers with MockFactory {
}

test("plugins") {
val ret = new RestKafkaConnectApi(URL, verifyingHttpClient("/connector-plugins", "GET", 200, Some("""[{"class": "andrew"}]"""))
val ret = new RestKafkaConnectApi(URL, verifyingHttpClient("/connector-plugins", "GET", 200, Some("""[{"class": "andrew", "type": "class"}]"""))
).connectorPlugins()

ret shouldEqual Success(List(ConnectorPlugins("andrew")))
ret shouldEqual Success(List(ConnectorPlugins("andrew", "class", None)))
}

test("pauseConnector") {
Expand Down

0 comments on commit 8518613

Please sign in to comment.