From 2cd3dd65496d170f0319fc5e2ea349f181918942 Mon Sep 17 00:00:00 2001 From: norangebit Date: Fri, 24 Apr 2020 18:58:13 +0200 Subject: [PATCH] add trust all package --- .../drills/drill07/exercise3/hello/Replier.kt | 4 ++-- .../drill07/exercise3/hello/Requestor.kt | 7 ++++--- .../kotlin/drills/drill07/exercise4/Replier.kt | 4 ++-- .../drills/drill07/exercise4/Requestor.kt | 7 ++++--- .../jms}/replier/AbstarctReplier.kt | 18 ++++++++++-------- .../jms}/replier/ActiveMQReplier.kt | 3 ++- .../exercise3 => util/jms}/replier/Replier.kt | 5 +++-- .../jms}/requestor/AbstractRequestor.kt | 6 ++++-- .../jms}/requestor/ActiveMQRequestor.kt | 3 ++- .../jms}/requestor/Requestor.kt | 5 +++-- 10 files changed, 36 insertions(+), 26 deletions(-) rename src/main/kotlin/{drills/drill07/exercise3 => util/jms}/replier/AbstarctReplier.kt (72%) rename src/main/kotlin/{drills/drill07/exercise3 => util/jms}/replier/ActiveMQReplier.kt (81%) rename src/main/kotlin/{drills/drill07/exercise3 => util/jms}/replier/Replier.kt (70%) rename src/main/kotlin/{drills/drill07/exercise3 => util/jms}/requestor/AbstractRequestor.kt (90%) rename src/main/kotlin/{drills/drill07/exercise3 => util/jms}/requestor/ActiveMQRequestor.kt (80%) rename src/main/kotlin/{drills/drill07/exercise3 => util/jms}/requestor/Requestor.kt (67%) diff --git a/src/main/kotlin/drills/drill07/exercise3/hello/Replier.kt b/src/main/kotlin/drills/drill07/exercise3/hello/Replier.kt index 99a4e35..5b8d2d1 100644 --- a/src/main/kotlin/drills/drill07/exercise3/hello/Replier.kt +++ b/src/main/kotlin/drills/drill07/exercise3/hello/Replier.kt @@ -1,7 +1,7 @@ package drills.drill07.exercise3.hello -import drills.drill07.exercise3.replier.ActiveMQReplier -import drills.drill07.exercise3.replier.Replier +import util.jms.replier.ActiveMQReplier +import util.jms.replier.Replier import javax.jms.TextMessage fun main() { diff --git a/src/main/kotlin/drills/drill07/exercise3/hello/Requestor.kt b/src/main/kotlin/drills/drill07/exercise3/hello/Requestor.kt index 83ce803..c03d1ec 100644 --- a/src/main/kotlin/drills/drill07/exercise3/hello/Requestor.kt +++ b/src/main/kotlin/drills/drill07/exercise3/hello/Requestor.kt @@ -1,11 +1,12 @@ package drills.drill07.exercise3.hello -import drills.drill07.exercise3.requestor.ActiveMQRequestor -import drills.drill07.exercise3.requestor.Requestor +import util.jms.requestor.ActiveMQRequestor +import util.jms.requestor.Requestor import javax.jms.TextMessage fun main() { - val requestor: Requestor = ActiveMQRequestor("hello", shared = true) + val requestor: Requestor = + ActiveMQRequestor("hello", shared = true) val msg = requestor.request(requestor.createTextMessage("Hello Home!")) as TextMessage diff --git a/src/main/kotlin/drills/drill07/exercise4/Replier.kt b/src/main/kotlin/drills/drill07/exercise4/Replier.kt index 80090ec..feaedaf 100644 --- a/src/main/kotlin/drills/drill07/exercise4/Replier.kt +++ b/src/main/kotlin/drills/drill07/exercise4/Replier.kt @@ -1,7 +1,7 @@ package drills.drill07.exercise4 -import drills.drill07.exercise3.replier.ActiveMQReplier -import drills.drill07.exercise3.replier.Replier +import util.jms.replier.ActiveMQReplier +import util.jms.replier.Replier fun main() { val replier: Replier = ActiveMQReplier("factorial", shared = true) diff --git a/src/main/kotlin/drills/drill07/exercise4/Requestor.kt b/src/main/kotlin/drills/drill07/exercise4/Requestor.kt index 6003f54..931d62e 100644 --- a/src/main/kotlin/drills/drill07/exercise4/Requestor.kt +++ b/src/main/kotlin/drills/drill07/exercise4/Requestor.kt @@ -1,10 +1,11 @@ package drills.drill07.exercise4 -import drills.drill07.exercise3.requestor.ActiveMQRequestor -import drills.drill07.exercise3.requestor.Requestor +import util.jms.requestor.ActiveMQRequestor +import util.jms.requestor.Requestor fun main() { - val requestor: Requestor = ActiveMQRequestor("factorial", shared = true) + val requestor: Requestor = + ActiveMQRequestor("factorial", shared = true) println("Enter the number of which you want to calculate the factorial:") val n = readLine()?.toInt() diff --git a/src/main/kotlin/drills/drill07/exercise3/replier/AbstarctReplier.kt b/src/main/kotlin/util/jms/replier/AbstarctReplier.kt similarity index 72% rename from src/main/kotlin/drills/drill07/exercise3/replier/AbstarctReplier.kt rename to src/main/kotlin/util/jms/replier/AbstarctReplier.kt index b78fc6f..9f988aa 100644 --- a/src/main/kotlin/drills/drill07/exercise3/replier/AbstarctReplier.kt +++ b/src/main/kotlin/util/jms/replier/AbstarctReplier.kt @@ -1,5 +1,6 @@ -package drills.drill07.exercise3.replier +package util.jms.replier +import java.io.Serializable import javax.jms.Message import javax.jms.Queue import javax.jms.QueueConnectionFactory @@ -13,12 +14,12 @@ abstract class AbstarctReplier( ) : Replier { private val factory: QueueConnectionFactory = this.getFactory() private val connection = factory.createQueueConnection() - private val session = connection.createQueueSession( + private val mainSession = connection.createQueueSession( false, Session.AUTO_ACKNOWLEDGE ) - private val mainQueue = session.createQueue(queueName) - private val receiver = session.createReceiver(mainQueue) + private val mainQueue = mainSession.createQueue(queueName) + private val receiver = mainSession.createReceiver(mainQueue) private val secondarySession = connection.createQueueSession( false, Session.AUTO_ACKNOWLEDGE @@ -37,18 +38,19 @@ abstract class AbstarctReplier( } } - override fun createTextMessage(text: String): TextMessage = session.createTextMessage(text) + override fun createTextMessage(text: String): TextMessage = mainSession.createTextMessage(text) - override fun createObjectMessage(): ObjectMessage = session.createObjectMessage() + override fun createObjectMessage(obj: Serializable?): ObjectMessage = + mainSession.createObjectMessage(obj) - override fun createMessage(): Message = session.createMessage() + override fun createMessage(): Message = mainSession.createMessage() override fun start() { connection.start() } override fun close() { - session.close() + mainSession.close() connection.close() } diff --git a/src/main/kotlin/drills/drill07/exercise3/replier/ActiveMQReplier.kt b/src/main/kotlin/util/jms/replier/ActiveMQReplier.kt similarity index 81% rename from src/main/kotlin/drills/drill07/exercise3/replier/ActiveMQReplier.kt rename to src/main/kotlin/util/jms/replier/ActiveMQReplier.kt index 06e5cec..a41ccb1 100644 --- a/src/main/kotlin/drills/drill07/exercise3/replier/ActiveMQReplier.kt +++ b/src/main/kotlin/util/jms/replier/ActiveMQReplier.kt @@ -1,4 +1,4 @@ -package drills.drill07.exercise3.replier +package util.jms.replier import org.apache.activemq.ActiveMQConnectionFactory import javax.jms.QueueConnectionFactory @@ -8,4 +8,5 @@ class ActiveMQReplier( shared: Boolean = false ) : AbstarctReplier(queueName, shared) { override fun getFactory(uri: String): QueueConnectionFactory = ActiveMQConnectionFactory(uri) + .also { it.isTrustAllPackages = true } } diff --git a/src/main/kotlin/drills/drill07/exercise3/replier/Replier.kt b/src/main/kotlin/util/jms/replier/Replier.kt similarity index 70% rename from src/main/kotlin/drills/drill07/exercise3/replier/Replier.kt rename to src/main/kotlin/util/jms/replier/Replier.kt index 4ccba30..dac4e2d 100644 --- a/src/main/kotlin/drills/drill07/exercise3/replier/Replier.kt +++ b/src/main/kotlin/util/jms/replier/Replier.kt @@ -1,5 +1,6 @@ -package drills.drill07.exercise3.replier +package util.jms.replier +import java.io.Serializable import javax.jms.Message import javax.jms.ObjectMessage import javax.jms.TextMessage @@ -7,7 +8,7 @@ import javax.jms.TextMessage interface Replier { fun onRequest(buildResponse: (Message) -> Message) fun createTextMessage(text: String = ""): TextMessage - fun createObjectMessage(): ObjectMessage + fun createObjectMessage(obj: Serializable? = null): ObjectMessage fun createMessage(): Message fun start() fun close() diff --git a/src/main/kotlin/drills/drill07/exercise3/requestor/AbstractRequestor.kt b/src/main/kotlin/util/jms/requestor/AbstractRequestor.kt similarity index 90% rename from src/main/kotlin/drills/drill07/exercise3/requestor/AbstractRequestor.kt rename to src/main/kotlin/util/jms/requestor/AbstractRequestor.kt index bb9de61..48763a3 100644 --- a/src/main/kotlin/drills/drill07/exercise3/requestor/AbstractRequestor.kt +++ b/src/main/kotlin/util/jms/requestor/AbstractRequestor.kt @@ -1,5 +1,6 @@ -package drills.drill07.exercise3.requestor +package util.jms.requestor +import java.io.Serializable import javax.jms.Message import javax.jms.QueueConnectionFactory import javax.jms.Session @@ -42,7 +43,8 @@ abstract class AbstractRequestor( override fun createTextMessage(text: String): TextMessage = mainSession.createTextMessage(text) - override fun createObjectMessage(): ObjectMessage = mainSession.createObjectMessage() + override fun createObjectMessage(obj: Serializable?): ObjectMessage = + mainSession.createObjectMessage(obj) override fun createMessage(): Message = mainSession.createMessage() diff --git a/src/main/kotlin/drills/drill07/exercise3/requestor/ActiveMQRequestor.kt b/src/main/kotlin/util/jms/requestor/ActiveMQRequestor.kt similarity index 80% rename from src/main/kotlin/drills/drill07/exercise3/requestor/ActiveMQRequestor.kt rename to src/main/kotlin/util/jms/requestor/ActiveMQRequestor.kt index d397f59..96034c1 100644 --- a/src/main/kotlin/drills/drill07/exercise3/requestor/ActiveMQRequestor.kt +++ b/src/main/kotlin/util/jms/requestor/ActiveMQRequestor.kt @@ -1,4 +1,4 @@ -package drills.drill07.exercise3.requestor +package util.jms.requestor import org.apache.activemq.ActiveMQConnectionFactory import javax.jms.QueueConnectionFactory @@ -8,4 +8,5 @@ class ActiveMQRequestor( shared: Boolean = false ) : AbstractRequestor(queueName, shared) { override fun getFactory(uri: String): QueueConnectionFactory = ActiveMQConnectionFactory(uri) + .also { it.isTrustAllPackages = true } } diff --git a/src/main/kotlin/drills/drill07/exercise3/requestor/Requestor.kt b/src/main/kotlin/util/jms/requestor/Requestor.kt similarity index 67% rename from src/main/kotlin/drills/drill07/exercise3/requestor/Requestor.kt rename to src/main/kotlin/util/jms/requestor/Requestor.kt index 22b5d3d..740f8ae 100644 --- a/src/main/kotlin/drills/drill07/exercise3/requestor/Requestor.kt +++ b/src/main/kotlin/util/jms/requestor/Requestor.kt @@ -1,5 +1,6 @@ -package drills.drill07.exercise3.requestor +package util.jms.requestor +import java.io.Serializable import javax.jms.Message import javax.jms.ObjectMessage import javax.jms.TextMessage @@ -7,7 +8,7 @@ import javax.jms.TextMessage interface Requestor { fun request(message: Message): Message fun createTextMessage(text: String = ""): TextMessage - fun createObjectMessage(): ObjectMessage + fun createObjectMessage(obj: Serializable? = null): ObjectMessage fun createMessage(): Message fun close() }