Skip to content

Commit

Permalink
Merge pull request #33 from bitrockteam/feature/rename-to-dvs
Browse files Browse the repository at this point in the history
Replace flightstream occurrencies with dvs
  • Loading branch information
simoexpo authored Jan 15, 2020
2 parents 62efe6a + 240e5fe commit 0d8dcdb
Show file tree
Hide file tree
Showing 28 changed files with 85 additions and 85 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ COPY .scalafmt.conf .
RUN sbt compile && \
sbt test && \
sbt universal:packageBin && \
mv "target/universal/kafka-flightstream-producer-$(sbt -no-colors version | tail -1 | cut -d ' ' -f 2).zip" /app.zip
mv "target/universal/kafka-dvs-producer-$(sbt -no-colors version | tail -1 | cut -d ' ' -f 2).zip" /app.zip

# end of build stage

Expand All @@ -32,6 +32,6 @@ ENV JAVA_OPTS="-Xmx512m"
COPY --from=sbt-build /app.zip .
RUN unzip app.zip

RUN chmod u+x bin/kafka-flightstream-producer
RUN chmod u+x bin/kafka-dvs-producer

ENTRYPOINT ["./bin/kafka-flightstream-producer"]
ENTRYPOINT ["./bin/kafka-dvs-producer"]
6 changes: 3 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pipeline {
AWS_REGION = 'eu-west-1'
GITHUB_CREDENTIALS = 'BitrockCI token'
GITHUB_ACCOUNT = 'bitrockteam'
GITHUB_REPO = 'kafka-flightstream-producer'
GITHUB_REPO = 'kafka-dvs-producer'
GITHUB_SSH = "centos"
RELEASE_BRANCH = "master"
SBT_OPTS="-Xmx2048M"
Expand Down Expand Up @@ -96,7 +96,7 @@ pipeline {
sh "docker push ${DOCKER_REPOSITORY}/${GITHUB_REPO}:${tagAfter}"
sh "docker tag ${DOCKER_REPOSITORY}/${GITHUB_REPO}:${tagAfter} ${DOCKER_REPOSITORY}/${GITHUB_REPO}:latest"
sh "docker push ${DOCKER_REPOSITORY}/${GITHUB_REPO}:latest"
sh "printf '[{\"name\":\"kafka-flightstream-producer\",\"imageUri\":\"%s\"}]' \$(git describe --tags --abbrev=0 | sed 's/^v//') > imagedefinitions.json"
sh "printf '[{\"name\":\"kafka-dvs-producer\",\"imageUri\":\"%s\"}]' \$(git describe --tags --abbrev=0 | sed 's/^v//') > imagedefinitions.json"
}
}
}
Expand All @@ -111,7 +111,7 @@ pipeline {
}
}
steps {
build job: 'kafka-flightstream-cd/master',
build job: 'kafka-dvs-cd/master',
parameters: [[$class: 'StringParameterValue', name: 'deployment', value: "${GITHUB_REPO}@${tagAfter}"]],
wait: false
}
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# FlightStream Producer
# DVS Producer

## Configuration

Expand All @@ -13,7 +13,7 @@ The application references the following environment variables:

### Resolvers

Some dependencies are downloaded from a private Nexus repository. Make sure to provide a `~/.sbt/.credentials.flightstream` file containing valid credentials:
Some dependencies are downloaded from a private Nexus repository. Make sure to provide a `~/.sbt/.credentials.bitrock` file containing valid credentials:

```properties
realm=Sonatype Nexus Repository Manager
Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ lazy val compileSettings = Seq(
lazy val dependenciesSettings = Seq(
credentials ++= Seq(
baseDirectory.value / ".sbt" / ".credentials",
Path.userHome / ".sbt" / ".credentials.flightstream"
Path.userHome / ".sbt" / ".credentials.bitrock"
).collect {
case c if c.exists => Credentials(c)
},
Expand Down Expand Up @@ -57,8 +57,8 @@ lazy val testSettings = Seq(

lazy val root = (project in file("."))
.settings(
name := "kafka-flightstream-producer",
organization := "it.bitrock.kafkaflightstream"
name := "kafka-dvs-producer",
organization := "it.bitrock.dvs"
)
.settings(compileSettings: _*)
.settings(dependenciesSettings: _*)
Expand Down
2 changes: 1 addition & 1 deletion dev/start_services.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ echo -e "Building and starting the services...\n" >&2
sleep 1

docker-compose build && \
docker-compose up -d kafka-flightstream-producer kafka-flightstream-streams
docker-compose up -d kafka-dvs-producer kafka-dvs-streams

docker_cmd_status=$?

Expand Down
34 changes: 17 additions & 17 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ object Dependencies {
lazy val ConfluentPlatform = "5.1.0"
lazy val JakartaWsRs = "2.1.4"
lazy val Kafka = "2.1.0"
lazy val KafkaCommons = "0.0.3"
lazy val KafkaFlightStream = "0.1.11"
lazy val KafkaCommons = "0.0.5"
lazy val KafkaDVS = "0.1.14"
lazy val LogbackClassic = "1.2.3"
lazy val PureConfig = "0.10.2"
lazy val ScalaLogging = "3.9.2"
lazy val Slf4j = "1.7.26"
lazy val TestCommons = "0.0.3"
lazy val TestCommons = "0.0.5"

}

Expand All @@ -46,23 +46,23 @@ object Dependencies {
}

lazy val prodDeps: Seq[ModuleID] = Seq(
"com.github.pureconfig" %% "pureconfig" % Versions.PureConfig,
"com.typesafe.akka" %% "akka-http" % Versions.AkkaHttp,
"com.typesafe.akka" %% "akka-stream" % Versions.Akka,
"com.typesafe.akka" %% "akka-http-spray-json" % Versions.AkkaHttp,
"io.confluent" % "kafka-avro-serializer" % Versions.ConfluentPlatform,
"it.bitrock.kafkaflightstream" %% "kafka-flightstream-avro-schemas" % Versions.KafkaFlightStream,
"it.bitrock.kafkageostream" %% "kafka-commons" % Versions.KafkaCommons,
"org.apache.kafka" % "kafka-clients" % Versions.Kafka,
"com.typesafe.akka" %% "akka-stream-kafka" % Versions.Alpakka
"com.github.pureconfig" %% "pureconfig" % Versions.PureConfig,
"com.typesafe.akka" %% "akka-http" % Versions.AkkaHttp,
"com.typesafe.akka" %% "akka-stream" % Versions.Akka,
"com.typesafe.akka" %% "akka-http-spray-json" % Versions.AkkaHttp,
"io.confluent" % "kafka-avro-serializer" % Versions.ConfluentPlatform,
"it.bitrock.dvs" %% "kafka-dvs-avro-schemas" % Versions.KafkaDVS,
"it.bitrock" %% "kafka-commons" % Versions.KafkaCommons,
"org.apache.kafka" % "kafka-clients" % Versions.Kafka,
"com.typesafe.akka" %% "akka-stream-kafka" % Versions.Alpakka
) ++ Logging.prodDeps

lazy val testDeps: Seq[ModuleID] = Seq(
"com.typesafe.akka" %% "akka-http-testkit" % Versions.AkkaHttp,
"com.typesafe.akka" %% "akka-stream-testkit" % Versions.Akka,
"io.github.embeddedkafka" %% "embedded-kafka-schema-registry" % Versions.ConfluentPlatform,
"jakarta.ws.rs" % "jakarta.ws.rs-api" % Versions.JakartaWsRs, // mandatory when javax.ws.rs-api gets excluded
"it.bitrock.kafkageostream" %% "test-commons" % Versions.TestCommons
"com.typesafe.akka" %% "akka-http-testkit" % Versions.AkkaHttp,
"com.typesafe.akka" %% "akka-stream-testkit" % Versions.Akka,
"io.github.embeddedkafka" %% "embedded-kafka-schema-registry" % Versions.ConfluentPlatform,
"jakarta.ws.rs" % "jakarta.ws.rs-api" % Versions.JakartaWsRs, // mandatory when javax.ws.rs-api gets excluded
"it.bitrock" %% "test-commons" % Versions.TestCommons
).map(_ % Test)

lazy val excludeDeps: Seq[ExclusionRule] = Seq(
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application.conf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ kafka {
city-raw-topic = "city_raw"
}

application-id = "kafka-flightstream-producer"
application-id = "kafka-dvs-producer"

aviation {
host = ""
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package it.bitrock.kafkaflightstream.producer
package it.bitrock.dvs.producer

import akka.actor.ActorSystem
import akka.stream.ActorMaterializer
import com.typesafe.scalalogging.LazyLogging
import it.bitrock.kafkaflightstream.producer.model._
import it.bitrock.kafkaflightstream.producer.services.MainFunctions._
import it.bitrock.dvs.producer.model._
import it.bitrock.dvs.producer.services.MainFunctions._

import scala.concurrent.duration._
import scala.concurrent.{Await, ExecutionContext}

object Main extends App with LazyLogging {

implicit val system: ActorSystem = ActorSystem("KafkaFlightstreamProducer")
implicit val system: ActorSystem = ActorSystem("KafkaDVSProducer")
implicit val mat: ActorMaterializer = ActorMaterializer()
implicit val ec: ExecutionContext = system.dispatcher

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package it.bitrock.kafkaflightstream.producer.config
package it.bitrock.dvs.producer.config

import pureconfig.generic.auto._

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package it.bitrock.kafkaflightstream.producer.config
package it.bitrock.dvs.producer.config

import pureconfig.generic.auto._
import java.net.URI
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package it.bitrock.kafkaflightstream.producer.config
package it.bitrock.dvs.producer.config

import java.net.URI

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package it.bitrock.kafkaflightstream.producer.config
package it.bitrock.dvs.producer.config

final case class ServerConfig(
host: String,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package it.bitrock.kafkaflightstream.producer.kafka
package it.bitrock.dvs.producer.kafka

import akka.Done
import akka.kafka.ProducerSettings
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package it.bitrock.kafkaflightstream.producer.kafka
package it.bitrock.dvs.producer.kafka

import it.bitrock.kafkaflightstream.model.{AirlineRaw, AirplaneRaw, AirportRaw, CityRaw, FlightRaw}
import it.bitrock.dvs.model.avro.{AirlineRaw, AirplaneRaw, AirportRaw, CityRaw, FlightRaw}

object KafkaTypes {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package it.bitrock.kafkaflightstream.producer.kafka
package it.bitrock.dvs.producer.kafka

import it.bitrock.kafkaflightstream.producer.kafka.KafkaTypes._
import it.bitrock.kafkaflightstream.producer.kafka.models.RawImplicitConversions._
import it.bitrock.kafkaflightstream.producer.model.{
import KafkaTypes._
import it.bitrock.dvs.producer.kafka.models.RawImplicitConversions._
import it.bitrock.dvs.producer.model.{
AirlineMessageJson,
AirplaneMessageJson,
AirportMessageJson,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package it.bitrock.kafkaflightstream.producer.kafka.models
package it.bitrock.dvs.producer.kafka.models

import it.bitrock.kafkaflightstream.model._
import it.bitrock.kafkaflightstream.producer.model._
import it.bitrock.dvs.model.avro._
import it.bitrock.dvs.producer.model._

object RawImplicitConversions {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package it.bitrock.kafkaflightstream.producer.model
package it.bitrock.dvs.producer.model

sealed trait AviationStream
case object FlightStream extends AviationStream
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package it.bitrock.kafkaflightstream.producer.model
package it.bitrock.dvs.producer.model

sealed trait MessageJson extends Product

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package it.bitrock.kafkaflightstream.producer.routes
package it.bitrock.dvs.producer.routes

import akka.http.scaladsl.model.StatusCodes
import akka.http.scaladsl.server.Directives.{get, path}
import akka.http.scaladsl.server.Route
import akka.http.scaladsl.server.directives.RouteDirectives.complete
import it.bitrock.kafkaflightstream.producer.config.ServerConfig
import it.bitrock.dvs.producer.config.ServerConfig

class Routes(serverConfig: ServerConfig) {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package it.bitrock.kafkaflightstream.producer.services
package it.bitrock.dvs.producer.services

import java.util.Calendar

Expand All @@ -10,7 +10,7 @@ import akka.http.scaladsl.unmarshalling.Unmarshal
import akka.stream.ActorMaterializer
import akka.stream.scaladsl.Flow
import com.typesafe.scalalogging.LazyLogging
import it.bitrock.kafkaflightstream.producer.model.{MessageJson, Tick}
import it.bitrock.dvs.producer.model.{MessageJson, Tick}
import JsonSupport._

import scala.concurrent.{ExecutionContext, Future}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package it.bitrock.kafkaflightstream.producer.services
package it.bitrock.dvs.producer.services

import akka.Done
import akka.actor.ActorSystem
import akka.kafka.ProducerSettings
import akka.stream.scaladsl.Sink
import it.bitrock.kafkaflightstream.producer.config.{AviationConfig, AviationStreamConfig, KafkaConfig}
import it.bitrock.kafkaflightstream.producer.kafka.KafkaSinkFactory
import it.bitrock.kafkaflightstream.producer.kafka.KafkaTypes._
import it.bitrock.kafkaflightstream.producer.model._
import it.bitrock.kafkageostream.kafkacommons.serialization.AvroSerdes
import it.bitrock.dvs.producer.config.{AviationConfig, AviationStreamConfig, KafkaConfig}
import it.bitrock.dvs.producer.kafka.KafkaSinkFactory
import it.bitrock.dvs.producer.kafka.KafkaTypes._
import it.bitrock.dvs.producer.model._
import it.bitrock.kafkacommons.serialization.AvroSerdes
import org.apache.kafka.common.serialization.Serdes

import scala.concurrent.Future
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package it.bitrock.kafkaflightstream.producer.services
package it.bitrock.dvs.producer.services

import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport
import it.bitrock.kafkaflightstream.producer.model._
import it.bitrock.dvs.producer.model._
import spray.json._

object JsonSupport extends SprayJsonSupport with DefaultJsonProtocol {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package it.bitrock.kafkaflightstream.producer.services
package it.bitrock.dvs.producer.services

import akka.actor.{ActorSystem, Cancellable}
import akka.http.scaladsl.Http
import akka.stream.ActorMaterializer
import it.bitrock.kafkaflightstream.producer.config.{AppConfig, AviationConfig, KafkaConfig, ServerConfig}
import it.bitrock.kafkaflightstream.producer.model._
import it.bitrock.kafkaflightstream.producer.routes.Routes
import it.bitrock.dvs.producer.config.{AppConfig, AviationConfig, KafkaConfig, ServerConfig}
import it.bitrock.dvs.producer.model._
import it.bitrock.dvs.producer.routes.Routes

import scala.concurrent.{ExecutionContext, Future}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package it.bitrock.kafkaflightstream.producer.services
package it.bitrock.dvs.producer.services

import akka.actor.Cancellable
import akka.stream.scaladsl.Source
import it.bitrock.kafkaflightstream.producer.model.Tick
import it.bitrock.dvs.producer.model.Tick

import scala.concurrent.duration._

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package it.bitrock.kafkaflightstream.producer
package it.bitrock.dvs.producer

import it.bitrock.kafkaflightstream.model.{Aircraft, CommonCode, Flight, FlightRaw, Geography, Speed, System}
import it.bitrock.kafkaflightstream.producer.model.{
import it.bitrock.dvs.producer.model.{
AircraftJson,
AirlineMessageJson,
CommonCodeJson,
Expand All @@ -11,6 +10,7 @@ import it.bitrock.kafkaflightstream.producer.model.{
SpeedJson,
SystemJson
}
import it.bitrock.dvs.model.avro.{Aircraft, CommonCode, Flight, FlightRaw, Geography, Speed, System}

trait TestValues {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package it.bitrock.kafkaflightstream.producer.kafka
package it.bitrock.dvs.producer.kafka

import akka.actor.ActorSystem
import akka.kafka.ProducerSettings
import akka.stream.ActorMaterializer
import akka.stream.scaladsl.Source
import akka.testkit.TestKit
import io.confluent.kafka.serializers.AbstractKafkaAvroSerDeConfig
import it.bitrock.kafkaflightstream.producer.TestValues
import it.bitrock.kafkaflightstream.producer.kafka.KafkaTypes.{Key, Flight => KafkaTypesFlight}
import it.bitrock.kafkaflightstream.producer.model._
import it.bitrock.kafkageostream.kafkacommons.serialization.ImplicitConversions._
import it.bitrock.kafkageostream.testcommons.{FixtureLoanerAnyResult, Suite}
import it.bitrock.dvs.producer.model.MessageJson
import it.bitrock.dvs.producer.TestValues
import it.bitrock.dvs.producer.kafka.KafkaTypes.{Key, Flight => KafkaTypesFlight}
import it.bitrock.kafkacommons.serialization.ImplicitConversions._
import it.bitrock.testcommons.{FixtureLoanerAnyResult, Suite}
import net.manub.embeddedkafka.schemaregistry.{EmbeddedKafka, EmbeddedKafkaConfig, _}
import org.apache.kafka.common.serialization.{Serde, Serdes}
import org.scalatest.{BeforeAndAfterAll, WordSpecLike}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package it.bitrock.kafkaflightstream.producer.services
package it.bitrock.dvs.producer.services

import akka.actor.ActorSystem
import akka.stream.ActorMaterializer
import akka.stream.scaladsl.{Keep, Sink, Source}
import akka.stream.testkit.TestSubscriber.Probe
import akka.stream.testkit.scaladsl.TestSink
import akka.testkit.TestKit
import it.bitrock.kafkaflightstream.producer.model._
import it.bitrock.kafkaflightstream.producer.services.AviationFlowSpec.Resource
import it.bitrock.kafkageostream.testcommons.{FixtureLoanerAnyResult, Suite}
import it.bitrock.dvs.producer.model._
import AviationFlowSpec.Resource
import it.bitrock.testcommons.{FixtureLoanerAnyResult, Suite}
import org.scalatest.WordSpecLike

import scala.concurrent.duration._
Expand Down
Loading

0 comments on commit 0d8dcdb

Please sign in to comment.