From 004bd4016799e6ff967191ffb954307faa186bab Mon Sep 17 00:00:00 2001 From: Jan Ypma Date: Tue, 9 Aug 2016 15:11:44 +0200 Subject: [PATCH] Release v0.0.8 - First release of ts-reaktive-marshal - Upgrade akka to 2.4.8 - Upgrade kamon to 0.6.2 - Upgrade akka-persistence-cassandra to 0.17 --- README.md | 16 ++++++++---- build.sbt | 8 +++--- .../AbstractActorPublisherWithStash.scala | 25 ------------------- .../cassandra/ResultSetActorPublisher.java | 2 +- 4 files changed, 16 insertions(+), 35 deletions(-) delete mode 100644 ts-reaktive-akka/src/main/scala/com/tradeshift/reaktive/akka/AbstractActorPublisherWithStash.scala diff --git a/README.md b/README.md index db790451..eee15bd0 100644 --- a/README.md +++ b/README.md @@ -8,14 +8,19 @@ In addition, it contains several extensions for [kamon](http://kamon.io) that pr The repository consists of the following modules: - [ts-reaktive-actors](ts-reaktive-actors) contains the base Java classes with which a reactive application can be built - - [ts-reaktive-testkit](ts-reaktive-testkit) provides a test framework for testing akka routes with real HTTP - - [ts-reaktive-testkit-assertj](ts-reaktive-testkit-assertj) provides [AssertJ](http://joel-costigliola.github.io/assertj/)-style - assertions for Java 8 [CompletionStage](https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletionStage.html) - (with wait support) and Jackson's [JsonNode](https://fasterxml.github.io/jackson-databind/javadoc/2.2.0/com/fasterxml/jackson/databind/JsonNode.html). + - [ts-reaktive-akka](ts-reaktive-akka) contains Akka additions that haven't been merged in to akka main yet + - [ts-reaktive-cassandra](ts-reaktive-cassandra) contains classes that help using Cassandra in an async way + - [ts-reaktive-java](ts-reaktive-cassandra) contains various utility classes for Java 8 - [ts-reaktive-kamon-akka](ts-reaktive-kamon-akka) provides dead letter monitoring for an actor system. Just have it on your classpath to enable. - [ts-reaktive-kamon-akka-http](ts-reaktive-kamon-akka-http) provides http server monitoring for akka streams http. Just have it on your classpath to enable. - [ts-reaktive-kamon-akka-cluster](ts-reaktive-kamon-akka-cluster) provides cluster membership monitoring for akka clustering. Just have it on your classpath to enable. - [ts-reaktive-kamon-log4j](ts-reaktive-kamon-log4j) provides log4j error and warning monitoring. Just have it on your classpath to enable. + - [ts-reaktive-marshal](ts-reaktive-marshal) provides a non-blocking marshalling DSL for XML and JSON + - [ts-reaktive-ssl](ts-reaktive-ssl) provides utility classes to read SSL keys and certs in PEM format + - [ts-reaktive-testkit](ts-reaktive-testkit) provides a test framework for testing akka routes with real HTTP + - [ts-reaktive-testkit-assertj](ts-reaktive-testkit-assertj) provides [AssertJ](http://joel-costigliola.github.io/assertj/)-style + assertions for Java 8 [CompletionStage](https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletionStage.html) + (with wait support) and Jackson's [JsonNode](https://fasterxml.github.io/jackson-databind/javadoc/2.2.0/com/fasterxml/jackson/databind/JsonNode.html). How to use from SBT =================== @@ -25,11 +30,12 @@ If you use SBT, you can use this library by adding the following: resolvers += Resolver.bintrayRepo("jypma", "maven") libraryDependencies ++= { - val version = "0.0.7" + val version = "0.0.8" Seq( "com.tradeshift" % "ts-reaktive-actors" % version, "com.tradeshift" %% "ts-reaktive-akka" % version, "com.tradeshift" % "ts-reaktive-cassandra" % version, + "com.tradeshift" % "ts-reaktive-marshal" % version, "com.tradeshift" % "ts-reaktive-ssl" % version, "com.tradeshift" % "ts-reaktive-testkit" % version % "test", "com.tradeshift" % "ts-reaktive-testkit-assertj" % version % "test", diff --git a/build.sbt b/build.sbt index 988e4ef5..6858ab6e 100644 --- a/build.sbt +++ b/build.sbt @@ -5,7 +5,7 @@ import sbtprotobuf.{ProtobufPlugin=>PB} lazy val projectSettings = PB.protobufSettings ++ Seq( licenses := Seq(("MIT", url("http://opensource.org/licenses/MIT"))), organization := "com.tradeshift", - version := "0.0.8-SNAPSHOT", + version := "0.0.8", scalaVersion := "2.11.8", publishMavenStyle := true, javacOptions ++= Seq("-source", "1.8"), @@ -27,8 +27,8 @@ lazy val projectSettings = PB.protobufSettings ++ Seq( lazy val commonSettings = projectSettings ++ Seq( libraryDependencies ++= { - val akkaVersion = "2.4.7" - val kamonVersion = "0.6.1" + val akkaVersion = "2.4.8" + val kamonVersion = "0.6.2" Seq( "com.google.guava" % "guava" % "18.0", @@ -42,7 +42,7 @@ lazy val commonSettings = projectSettings ++ Seq( "com.typesafe.akka" %% "akka-http-core" % akkaVersion, "com.typesafe.akka" %% "akka-http-jackson-experimental" % akkaVersion, "com.typesafe.akka" %% "akka-http-testkit" % akkaVersion % "test", - "com.typesafe.akka" %% "akka-persistence-cassandra" % "0.16", + "com.typesafe.akka" %% "akka-persistence-cassandra" % "0.17", "com.readytalk" % "metrics3-statsd" % "4.1.0", // to log cassandra (codahale / dropwizard) metrics into statsd "io.kamon" %% "kamon-core" % kamonVersion, "io.kamon" %% "kamon-akka" % kamonVersion, diff --git a/ts-reaktive-akka/src/main/scala/com/tradeshift/reaktive/akka/AbstractActorPublisherWithStash.scala b/ts-reaktive-akka/src/main/scala/com/tradeshift/reaktive/akka/AbstractActorPublisherWithStash.scala deleted file mode 100644 index b901d23b..00000000 --- a/ts-reaktive-akka/src/main/scala/com/tradeshift/reaktive/akka/AbstractActorPublisherWithStash.scala +++ /dev/null @@ -1,25 +0,0 @@ -package com.tradeshift.reaktive.akka - -import akka.actor.AbstractActor -import akka.actor.Stash -import akka.actor.UnrestrictedStash -import akka.actor.UnboundedStash -import akka.stream.actor.ActorPublisher - -/** - * Adds a Stash to AbstractActorPublisher - * @see [[akka.stream.actor.ActorPublisher]] and [[akka.stream.actor.AbstractActorWithStash]] - */ -abstract class AbstractActorPublisherWithStash[T] extends AbstractActor with ActorPublisher[T] with Stash - -/** - * Adds an Unbounded Stash to AbstractActorPublisher - * @see [[akka.stream.actor.ActorPublisher]] and [[akka.stream.actor.AbstractActorWithUnboundedStash]] - */ -abstract class AbstractActorPublisherWithUnboundedStash[T] extends AbstractActor with ActorPublisher[T] with UnboundedStash - -/** - * Adds an Unrestricted Stash to AbstractActorPublisher - * @see [[akka.stream.actor.ActorPublisher]] and [[akka.stream.actor.AbstractActorWithUnrestrictedStash]] - */ -abstract class AbstractActorPublisherWithUnrestrictedStash[T] extends AbstractActor with ActorPublisher[T] with UnrestrictedStash diff --git a/ts-reaktive-cassandra/src/main/java/com/tradeshift/reaktive/cassandra/ResultSetActorPublisher.java b/ts-reaktive-cassandra/src/main/java/com/tradeshift/reaktive/cassandra/ResultSetActorPublisher.java index 646c1bfd..0ffe63a6 100644 --- a/ts-reaktive-cassandra/src/main/java/com/tradeshift/reaktive/cassandra/ResultSetActorPublisher.java +++ b/ts-reaktive-cassandra/src/main/java/com/tradeshift/reaktive/cassandra/ResultSetActorPublisher.java @@ -12,12 +12,12 @@ import com.datastax.driver.core.ResultSetFuture; import com.datastax.driver.core.Row; import com.google.common.util.concurrent.MoreExecutors; -import com.tradeshift.reaktive.akka.AbstractActorPublisherWithStash; import akka.actor.ActorRef; import akka.actor.Cancellable; import akka.actor.Props; import akka.japi.pf.ReceiveBuilder; +import akka.stream.actor.AbstractActorPublisherWithStash; import akka.stream.actor.ActorPublisherMessage; import akka.stream.javadsl.Source; import scala.PartialFunction;