Merge branch 'release-3.x'

woq-blended · Jun 6, 2019 · aebcc4e · aebcc4e
2 parents 6769187 + 75608b1
commit aebcc4e
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 26 deletions.
diff --git a/blended.jms.bridge/src/test/scala/blended/jms/bridge/internal/BridgeSpec.scala b/blended.jms.bridge/src/test/scala/blended/jms/bridge/internal/BridgeSpec.scala
@@ -11,7 +11,7 @@ import blended.akka.internal.BlendedAkkaActivator
 import blended.container.context.api.ContainerIdentifierService
 import blended.jms.utils.{IdAwareConnectionFactory, JmsDestination, JmsQueue}
 import blended.streams.jms._
-import blended.streams.message.{FlowEnvelope, FlowMessage, TextFlowMessage}
+import blended.streams.message.{BinaryFlowMessage, FlowEnvelope, FlowMessage, TextFlowMessage}
 import blended.streams.processor.Collector
 import blended.streams.transaction.{FlowHeaderConfig, FlowTransactionEvent, FlowTransactionStarted, FlowTransactionUpdate}
 import blended.testsupport.pojosr.{BlendedPojoRegistry, PojoSrTestHelper, SimplePojoContainerSpec}
@@ -141,7 +141,25 @@ class InboundBridgeUntrackedSpec extends BridgeSpecSupport {
 
       implicit val timeout : FiniteDuration = 1.second
 
-      val msg : TextFlowMessage = TextFlowMessage(null, FlowMessage.noProps)
+      val msg : FlowMessage = TextFlowMessage(null, FlowMessage.noProps)
+      val msgs : Seq[FlowEnvelope] = Seq(FlowEnvelope(msg))
+
+      val switch : KillSwitch = sendMessages("sampleIn", external)(msgs : _*)
+
+      val messages : List[FlowEnvelope] =
+        consumeMessages(internal, "bridge.data.in.activemq.external")(1.second, system, materializer).get
+
+      messages should have size msgs.size
+
+      consumeEvents().get should be(empty)
+
+      switch.shutdown()
+    }
+
+    "process messages with an empty binary body" in {
+      implicit val timeout : FiniteDuration = 1.second
+
+      val msg : FlowMessage = BinaryFlowMessage(Array.empty[Byte], FlowMessage.noProps)
       val msgs : Seq[FlowEnvelope] = Seq(FlowEnvelope(msg))
 
       val switch : KillSwitch = sendMessages("sampleIn", external)(msgs : _*)

diff --git a/blended.mgmt.agent/src/main/scala/blended/mgmt/agent/internal/MgmtReporter.scala b/blended.mgmt.agent/src/main/scala/blended/mgmt/agent/internal/MgmtReporter.scala
@@ -90,7 +90,6 @@ trait MgmtReporter extends Actor with PrickleSupport {
     super.postStop()
   }
 
-
   private def handleTick(state : MgmtReporterState) : Receive = {
     case Tick =>
       config.foreach { cfg =>

diff --git a/blended.mgmt.agent/src/main/scala/blended/mgmt/agent/internal/OsgiMgmtReporter.scala b/blended.mgmt.agent/src/main/scala/blended/mgmt/agent/internal/OsgiMgmtReporter.scala
@@ -46,7 +46,7 @@ class OsgiMgmtReporter(cfg : OSGIActorConfig) extends OSGIActor(cfg) with MgmtRe
       x
   }
 
-  override protected val idSvc: ContainerIdentifierService = cfg.idSvc
+  override protected val idSvc : ContainerIdentifierService = cfg.idSvc
 }
 
 object OsgiMgmtReporter {

diff --git a/blended.mgmt.mock/src/main/scala/blended/mgmt/mock/clients/MgmtMockClients.scala b/blended.mgmt.mock/src/main/scala/blended/mgmt/mock/clients/MgmtMockClients.scala
@@ -22,14 +22,14 @@ class MgmtMockClients(config : Config) {
   private[this] val rnd = new Random()
 
   private[this] val ctCtxt : ContainerContext = new ContainerContext {
-    override def getContainerDirectory(): String = "."
-    override def getContainerConfigDirectory(): String = getContainerDirectory()
-    override def getContainerLogDirectory(): String = getContainerDirectory()
-    override def getProfileDirectory(): String = getContainerDirectory()
-    override def getProfileConfigDirectory(): String = getContainerDirectory()
-    override def getContainerHostname(): String = "localhost"
-    override def getContainerCryptoSupport(): ContainerCryptoSupport = BlendedCryptoSupport.initCryptoSupport("pwd.txt")
-    override def getContainerConfig(): TSConfig = ConfigFactory.empty()
+    override def getContainerDirectory() : String = "."
+    override def getContainerConfigDirectory() : String = getContainerDirectory()
+    override def getContainerLogDirectory() : String = getContainerDirectory()
+    override def getProfileDirectory() : String = getContainerDirectory()
+    override def getProfileConfigDirectory() : String = getContainerDirectory()
+    override def getContainerHostname() : String = "localhost"
+    override def getContainerCryptoSupport() : ContainerCryptoSupport = BlendedCryptoSupport.initCryptoSupport("pwd.txt")
+    override def getContainerConfig() : TSConfig = ConfigFactory.empty()
   }
 
   implicit val system : ActorSystem = ActorSystem("MgmtMockClients")
@@ -51,7 +51,7 @@ class MgmtMockClients(config : Config) {
       )
 
       val idSvc : ContainerIdentifierService = new ContainerIdentifierServiceImpl(ctCtxt) {
-        override lazy val uuid: String = ci.containerId
+        override lazy val uuid : String = ci.containerId
       }
 
       system.actorOf(ContainerActor.props(reporterConfig, idSvc), name = "container-" + ci.containerId)

diff --git a/...ed.mgmt.repo.rest/src/main/scala/blended/mgmt/repo/rest/internal/ArtifactRepoRoutes.scala b/...ed.mgmt.repo.rest/src/main/scala/blended/mgmt/repo/rest/internal/ArtifactRepoRoutes.scala
@@ -65,9 +65,9 @@ trait ArtifactRepoRoutes {
     path(Segment) { repoId =>
       getRepoFile(repoId, "")
     } ~
-    path(Segment / Remaining) { (repoId, rest) =>
-      getRepoFile(repoId, rest)
-    }
+      path(Segment / Remaining) { (repoId, rest) =>
+        getRepoFile(repoId, rest)
+      }
   }
 
 }
diff --git a/blended.security.ssl/src/test/scala/blended/security/ssl/internal/MemoryKeystoreSpec.scala b/blended.security.ssl/src/test/scala/blended/security/ssl/internal/MemoryKeystoreSpec.scala
@@ -24,7 +24,7 @@ class MemoryKeystoreSpec extends LoggingFreeSpec
     cnProvider = cnProvider
   )
 
-  private def newHostCertificate(cn : String, issuedBy : CertificateHolder, days: Int) : CertificateHolder =
+  private def newHostCertificate(cn : String, issuedBy : CertificateHolder, days : Int) : CertificateHolder =
     createHostCertificate(cn, issuedBy, days) match {
       case Success(h) => h
       case Failure(t) => fail(t)
@@ -45,7 +45,7 @@ class MemoryKeystoreSpec extends LoggingFreeSpec
       val ms : MemoryKeystore = MemoryKeystore(Map.empty)
       ms.nextCertificateTimeout() match {
         case Success(to) => assert(start <= to.getTime() && System.currentTimeMillis() >= to.getTime())
-        case Failure(t) => fail(t)
+        case Failure(t)  => fail(t)
       }
     }
 
@@ -58,10 +58,9 @@ class MemoryKeystoreSpec extends LoggingFreeSpec
       val ms : MemoryKeystore = MemoryKeystore(Map("root" -> root))
       ms.nextCertificateTimeout() match {
         case Success(to) => assert(start <= to.getTime() && to.getTime() <= end)
-        case Failure(t) => fail(t)
+        case Failure(t)  => fail(t)
       }
 
-
     }
 
     "not allow inconsistent updates" in {

diff --git a/...patcher/src/main/scala/blended/streams/dispatcher/internal/builder/DispatcherFanout.scala b/...patcher/src/main/scala/blended/streams/dispatcher/internal/builder/DispatcherFanout.scala
@@ -93,7 +93,7 @@ case class DispatcherFanout(
           }
 
           newEnv = if (oh.clearBody) {
-            newEnv.copy(flowMessage = BaseFlowMessage(newEnv.flowMessage.header))
+            newEnv.copy(flowMessage = newEnv.flowMessage.clearBody())
           } else {
             newEnv
           }

diff --git a/blended.streams/src/main/scala/blended/streams/jms/JmsFlowSupport.scala b/blended.streams/src/main/scala/blended/streams/jms/JmsFlowSupport.scala
@@ -51,6 +51,7 @@ trait JmsEnvelopeHeader {
   val deliveryModeHeader : String => String = s => jmsHeaderPrefix(s) + "DeliveryMode"
   val replyToHeader : String => String = s => jmsHeaderPrefix(s) + "ReplyTo"
   val timestampHeader : String => String = s => jmsHeaderPrefix(s) + "Timestamp"
+  val typeHeader : String => String = s => jmsHeaderPrefix(s) + "Type"
 
   val replyToQueueName : String = "replyTo"
 }
@@ -90,7 +91,8 @@ object JmsFlowSupport extends JmsEnvelopeHeader {
         srcDestHeader(prefix) -> dest,
         priorityHeader(prefix) -> msg.getJMSPriority(),
         deliveryModeHeader(prefix) -> delMode,
-        timestampHeader(prefix) -> msg.getJMSTimestamp()
+        timestampHeader(prefix) -> msg.getJMSTimestamp(),
+        typeHeader(prefix) -> msg.getJMSType()
       ).get
 
       val expireHeaderMap : Map[String, MsgProperty] = msg.getJMSExpiration() match {

diff --git a/blended.streams/src/main/scala/blended/streams/message/FlowMessage.scala b/blended.streams/src/main/scala/blended/streams/message/FlowMessage.scala
@@ -86,6 +86,8 @@ import blended.streams.message.FlowMessage.FlowMessageProps
 sealed abstract class FlowMessage(msgHeader : FlowMessageProps) {
 
   def body() : Any
+  def clearBody() : FlowMessage = this
+
   def header : FlowMessageProps = msgHeader
 
   def bodySize() : Int
@@ -175,7 +177,7 @@ sealed abstract class FlowMessage(msgHeader : FlowMessageProps) {
 
   def withHeader(key : String, value : Any, overwrite : Boolean = true) : Try[FlowMessage]
 
-  protected def doRemoveHeader(keys : String*) : FlowMessageProps = header.filter(k => !keys.contains(k))
+  protected def doRemoveHeader(keys : String*) : FlowMessageProps = header.filterKeys(k => !keys.contains(k))
 
   protected def newHeader(key : String, value : Any, overwrite : Boolean) : Try[FlowMessageProps] = Try {
     if (overwrite) {
@@ -223,13 +225,17 @@ case class BinaryFlowMessage(content : ByteString, override val header : FlowMes
   }
 
   override def removeHeader(keys : String*) : FlowMessage = copy(header = doRemoveHeader(keys : _*))
+
+  override def clearBody() : FlowMessage = BinaryFlowMessage(Array.empty[Byte], header)
 }
 
 case class TextFlowMessage(content : String, override val header : FlowMessageProps) extends FlowMessage(header) {
 
   private val textContent : Option[String] = Option(content)
 
-  override def body() : Any = textContent.getOrElse(null)
+  // scalastyle:off null
+  override def body() : Any = textContent.orNull
+  // scalastyle:on null
 
   def getText() : String = textContent.getOrElse("")
 
@@ -240,4 +246,8 @@ case class TextFlowMessage(content : String, override val header : FlowMessagePr
   }
 
   override def removeHeader(keys : String*) : FlowMessage = copy(header = doRemoveHeader(keys : _*))
+
+  // scalastyle:off null
+  override def clearBody() : FlowMessage = TextFlowMessage("", header)
+  // scalastyle:on null
 }
diff --git a/blended.updater.config/shared/src/main/scala/blended/updater/config/Artifact.scala b/blended.updater.config/shared/src/main/scala/blended/updater/config/Artifact.scala
@@ -19,7 +19,7 @@ object Artifact extends ((String, Option[String], Option[String]) => Artifact) {
     // scalastyle:off null
     fileName : String = null,
     sha1Sum : String = null
-    // scalastyle:on null
+  // scalastyle:on null
   ) : Artifact = {
     Artifact(
       url = url,

diff --git a/blended.updater/src/main/scala/blended/updater/ArtifactDownloader.scala b/blended.updater/src/main/scala/blended/updater/ArtifactDownloader.scala
@@ -16,7 +16,7 @@ class ArtifactDownloader(mvnRepositories : List[String])
 
   private[this] val log = Logger[ArtifactDownloader]
 
-  private def fileIssue(file : File, artifact: Artifact) : Option[String] = {
+  private def fileIssue(file : File, artifact : Artifact) : Option[String] = {
     if (!file.exists()) {
       Some(s"File does not exist: $file")
     } else {