Draft: migrate to `[email protected]` #163

bbortt · 2023-05-14T12:16:42Z

upgrade citrus core from com.consol.citrus to org.citrusframework dependency. that includes some transitive dependency updates/migrations, also in order to support a jdk17 build minimum:

javax to jakarta
org.springframework
org.springframework.boot

BREAKING CHANGE: contains breaking dependency updates!

closes #162.

pom.xml

README.md

simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/pom.xml

bbortt · 2023-07-29T15:54:05Z

@christophd there seems to be an issue with the org.citrusframework.org:citrus-mail package.. see the build:

Error:  Tests run: 4, Failures: 4, Errors: 0, Skipped: 0, Time elapsed: 8.044 s <<< FAILURE! - in org.citrusframework.simulator.SimulatorMailIT
Error:  testDefaultRequest(org.citrusframework.simulator.SimulatorMailIT)  Time elapsed: 0.215 s  <<< FAILURE!
java.lang.NoClassDefFoundError: javax/activation/DataContentHandler
Caused by: java.lang.ClassNotFoundException: javax.activation.DataContentHandler

I am not exactly sure if this comes from the com.sun.mail:jakarta.mail package? that one hasn't been updated in a long time.

bbortt · 2023-07-30T06:38:06Z

Update: found the bug --> jakartaee/mail-api#665. will update citrusframework/citrus code of citrus-mail and then follow up in this PR.

The implemented workaround allows jakarta-mail to find the corresponding classes when opening a new session. The reported without the workaround error is: ```shell java.lang.IllegalStateException: Not provider of jakarta.mail.util.StreamProvider was found at org.citrusframework.mail.server.MailServerTest.testMultipartMessageSplitting(MailServerTest.java:378) ``` Report in PR: citrusframework/citrus-simulator#163 (comment).

bbortt · 2023-08-04T05:01:52Z

@christophd I tried implementing that mentioned fix in 7339378, but without success. now I am stuck. any ideas?

(btw sorry if I mentioned you too much. I thought I've already written this comment, but cannot find it now)

boskoop · 2023-08-05T08:59:04Z

@bbortt I didn't look at it in detail, but maybe you need to add the Eclipse Angus reference implementation for Jakarta Mail to work: https://eclipse-ee4j.github.io/angus-mail/

bbortt · 2023-08-07T07:46:03Z

@bbortt I didn't look at it in detail, but maybe you need to add the Eclipse Angus reference implementation for Jakarta Mail to work: https://eclipse-ee4j.github.io/angus-mail/

I've tried that too, I think. but let me double check.

The implemented workaround allows jakarta-mail to find the corresponding classes when opening a new session. The reported without the workaround error is: ```shell java.lang.IllegalStateException: Not provider of jakarta.mail.util.StreamProvider was found at org.citrusframework.mail.server.MailServerTest.testMultipartMessageSplitting(MailServerTest.java:378) ``` Report in PR: citrusframework/citrus-simulator#163 (comment).

bbortt · 2023-08-07T17:48:33Z

@boskoop I've tried that too.. and pushed another commit (referenced above this comment) with my latest changes. ended up with the com.sun.* implementation again, in the end. no clue why its still looking for a javax.* class:

java.lang.NoClassDefFoundError: javax/activation/DataContentHandler

and even if this is present on the class path, some cast does then (obviously) not work:

java.lang.ClassCastException: class com.sun.mail.handlers.text_plain cannot be cast to class jakarta.activation.DataContentHandler (com.sun.mail.handlers.text_plain and jakarta.activation.DataContentHandler are in unnamed module of loader 'app')

edit: I will try and take a look at the maven dependency tree.. maybe I can find something. must come from somewhere, tho!

Compatibility fixes for the [citrusframework/citrus-simulator](https://github.com/citrusframework/citrus-simulator) project. These changes - mostly in `citrus-jms` and `citrus-mail` - will allow it to build on jdk17 and with the latest Spring- and Boot framework as well. Progress originally reported in PR: citrusframework/citrus-simulator#163 (comment).

bbortt · 2023-08-07T19:37:28Z

never mind.. I got it. don't know how exactly, but I got it 🤣 see the linked PR.

Compatibility fixes for the [citrusframework/citrus-simulator](https://github.com/citrusframework/citrus-simulator) project. These changes - mostly in `citrus-jms` and `citrus-mail` - will allow it to build on jdk17 and with the latest Spring- and Boot framework as well. Progress originally reported in PR: citrusframework/citrus-simulator#163 (comment).

bbortt · 2023-08-21T18:20:20Z

by the way, if someone wants to continue this: feel free to add commits on top of it. we can squash it later. 'cause I'll have no time this week (probably until next monday).

bbortt · 2023-08-29T15:04:12Z

by the way, if someone wants to continue this: feel free to add commits on top of it. we can squash it later. 'cause I'll have no time this week (probably until next monday).

I've fixed it, btw. will push it this evening 🚀

bbortt · 2023-08-31T16:29:17Z

@buergich fyi I've now migrated the samples to ActiveMQ Artemis as well (like we did with the citrus core). ActiveMQ classic is not ready yet, but will be probably in the next month. See:

bbortt · 2023-09-01T05:56:23Z

simulator-starter/src/main/java/org/citrusframework/simulator/http/HttpOperationScenario.java

        }

        requestBuilder
-            .messageType(MessageType.JSON)
+            // TODO: .messageType(MessageType.JSON)


as far as I saw in the legacy code, this did select the extractor or serializer based on the type. how will this be handled in the future?

bbortt · 2023-09-01T05:57:00Z

simulator-starter/src/main/java/org/citrusframework/simulator/scenario/ScenarioDesigner.java

@@ -44,6 +54,10 @@ public class ScenarioDesigner extends DefaultTestDesigner {
    /** Bean reference resolver */
    private final ReferenceResolver referenceResolver;

+    // TODO: Is this still relevant?
+    /** Optional stack of containers cached for execution */
+    protected Stack<TestActionContainerBuilder<? extends TestActionContainer, ?>> containers = new Stack<>();


Is this still relevant? if not, I think this part can be removed as well.

bbortt · 2023-09-01T05:57:40Z

simulator-starter/src/main/java/org/citrusframework/simulator/scenario/ScenarioDesigner.java

@@ -67,18 +81,22 @@ public CorrelationManager correlation() {
        return () -> {
            CorrelationHandlerBuilder builder = new CorrelationHandlerBuilder(scenarioEndpoint, applicationContext);
            action(builder);
+            // TODO: Not sure if this works? Where does this action get called?
+            // See: https://github.com/citrusframework/citrus/pull/946/files#diff-f5bc91f18a5e506ee478ab30a349ef1aee9eecf68efbb8954c5978a7eb14029eL749
            doFinally().actions(builder.stop());


Not sure if this works? These builded actions, they're not added to any list nor similar. Where or how are these bein executed?

bbortt · 2023-09-01T05:57:47Z

simulator-starter/src/main/java/org/citrusframework/simulator/scenario/ScenarioDesigner.java

            doFinally().actions(builder.stop());
            return builder;
        };
    }

+


note to myself:

Suggested change

bbortt · 2023-09-01T05:59:13Z

simulator-starter/src/main/java/org/citrusframework/simulator/scenario/ScenarioRunner.java

@@ -60,9 +70,11 @@ public ScenarioRunner(ScenarioEndpoint scenarioEndpoint, ApplicationContext appl
     *
     * @return
     */
-    public CorrelationHandlerBuilder correlation(CorrelationBuilderSupport configurer) {
+    public StartCorrelationHandlerAction correlation(CorrelationBuilderSupport configurer) {


this will now return an action, not a builder. but if the last line calls run, no builder will be returned (as expected).

bbortt · 2023-09-01T05:59:44Z

...or-starter/src/main/java/org/citrusframework/simulator/service/ScenarioExecutionService.java

@@ -105,60 +103,51 @@ public final Long run(SimulatorScenario scenario, String name, List<ScenarioPara
    private Future<?> startScenarioAsync(Long executionId, String name, SimulatorScenario scenario, List<ScenarioParameter> scenarioParameters) {
        return executorService.submit(() -> {
            try {
-                if (scenario instanceof Executable) {


I think that concept of an Executable does no longer exist, right? I've removed that condition.

bbortt · 2023-09-01T06:04:10Z

simulator-starter/src/main/java/org/citrusframework/simulator/scenario/ScenarioDesigner.java


 /**
 * @author Christoph Deppisch
 */
-public class ScenarioDesigner extends DefaultTestDesigner {
+public class ScenarioDesigner extends DefaultTestCaseRunner {


the whole concept around "Designers" has been removed from the core, I think. this class would be removed and the ScenarioRunner would be the only remaining option, right? it does not differ much from the designer, tho.

upgrade citrus core from `com.consol.citrus` to `org.citrusframework` dependency. that includes some transitive dependency updates/migrations, also in order to support a jdk17 build minimum: * `javax` to `jakarta` * `org.springframework` * `org.springframework.boot` BREAKING CHANGE: contains breaking dependency updates!

bbortt · 2023-09-05T16:14:29Z

@christophd with 034acf9 the sample-bank-service works on my local machine. would be cool to know if the way I've refactored it is good to continue. because refactoring all samples is a bit of repetitive work which I'd like to not do too often.

christophd · 2023-09-11T11:41:14Z

@bbortt I had a look and managed to fix all issues to complete the migration to Citrus 4.x 😃

My changes build on top of this draft PR.
In this PR you can see my changes #168
This is the combined PR towards main branch so we can see all tests green before merge 😅 #169

bbortt · 2023-09-12T04:28:41Z

superseded by #169.

bbortt added Type: Enhancement IN PROGRESS Prio: High dependencies Pull requests that update a dependency file java Pull requests that update Java code labels May 14, 2023

bbortt self-assigned this May 14, 2023

bbortt force-pushed the feature/#162-citrusframework-4-milestone-1 branch from 1ca2ea1 to 0c309d6 Compare May 14, 2023 15:17

boskoop suggested changes Jul 21, 2023

View reviewed changes

pom.xml Outdated Show resolved Hide resolved

README.md Outdated Show resolved Hide resolved

simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/pom.xml Outdated Show resolved Hide resolved

bbortt force-pushed the feature/#162-citrusframework-4-milestone-1 branch from 0c309d6 to ec1464d Compare July 29, 2023 15:45

bbortt mentioned this pull request Aug 7, 2023

citrus-simulator compatibility fixes citrusframework/citrus#961

Merged

bbortt force-pushed the feature/#162-citrusframework-4-milestone-1 branch from ec1464d to 04ac686 Compare August 7, 2023 19:46

bbortt force-pushed the feature/#162-citrusframework-4-milestone-1 branch from 04ac686 to 428a0b9 Compare August 14, 2023 19:44

bbortt mentioned this pull request Aug 14, 2023

fullbuild on windows citrusframework/citrus#959

Merged

bbortt force-pushed the feature/#162-citrusframework-4-milestone-1 branch 2 times, most recently from 586b7a3 to 4492511 Compare August 31, 2023 16:27

bbortt commented Sep 1, 2023

View reviewed changes

bbortt force-pushed the feature/#162-citrusframework-4-milestone-1 branch 2 times, most recently from 41f6cd8 to 231aa18 Compare September 4, 2023 19:32

bbortt force-pushed the feature/#162-citrusframework-4-milestone-1 branch from 231aa18 to 034acf9 Compare September 5, 2023 16:13

bbortt mentioned this pull request Sep 9, 2023

auditable entities #166

Closed

bbortt closed this Sep 12, 2023

bbortt deleted the feature/#162-citrusframework-4-milestone-1 branch September 12, 2023 04:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Draft: migrate to `[email protected]` #163

Draft: migrate to `[email protected]` #163

bbortt commented May 14, 2023

bbortt commented Jul 29, 2023

bbortt commented Jul 30, 2023

bbortt commented Aug 4, 2023 •

edited

Loading

boskoop commented Aug 5, 2023

bbortt commented Aug 7, 2023 •

edited

Loading

bbortt commented Aug 7, 2023 •

edited

Loading

bbortt commented Aug 7, 2023

bbortt commented Aug 21, 2023

bbortt commented Aug 29, 2023

bbortt commented Aug 31, 2023

bbortt Sep 1, 2023

bbortt Sep 1, 2023

bbortt Sep 1, 2023

bbortt Sep 1, 2023

bbortt Sep 1, 2023

bbortt Sep 1, 2023

bbortt Sep 1, 2023

bbortt commented Sep 5, 2023

christophd commented Sep 11, 2023

bbortt commented Sep 12, 2023

Draft: migrate to [email protected] #163

Draft: migrate to [email protected] #163

Conversation

bbortt commented May 14, 2023

bbortt commented Jul 29, 2023

bbortt commented Jul 30, 2023

bbortt commented Aug 4, 2023 • edited Loading

boskoop commented Aug 5, 2023

bbortt commented Aug 7, 2023 • edited Loading

bbortt commented Aug 7, 2023 • edited Loading

bbortt commented Aug 7, 2023

bbortt commented Aug 21, 2023

bbortt commented Aug 29, 2023

bbortt commented Aug 31, 2023

bbortt Sep 1, 2023

Choose a reason for hiding this comment

bbortt Sep 1, 2023

Choose a reason for hiding this comment

bbortt Sep 1, 2023

Choose a reason for hiding this comment

bbortt Sep 1, 2023

Choose a reason for hiding this comment

bbortt Sep 1, 2023

Choose a reason for hiding this comment

bbortt Sep 1, 2023

Choose a reason for hiding this comment

bbortt Sep 1, 2023

Choose a reason for hiding this comment

bbortt commented Sep 5, 2023

christophd commented Sep 11, 2023

bbortt commented Sep 12, 2023

Draft: migrate to `[email protected]` #163

Draft: migrate to `[email protected]` #163

bbortt commented Aug 4, 2023 •

edited

Loading

bbortt commented Aug 7, 2023 •

edited

Loading

bbortt commented Aug 7, 2023 •

edited

Loading