Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Re-enable version attribute and allow XML root elements on JsonPipe #5280

Merged
merged 5 commits into from
Aug 29, 2023
Merged

Re-enable version attribute and allow XML root elements on JsonPipe #5280

merged 5 commits into from
Aug 29, 2023

Conversation

nielsm5
Copy link
Member

@nielsm5 nielsm5 commented Aug 23, 2023

No description provided.

@nielsm5 nielsm5 mentioned this pull request Aug 23, 2023
Closed
@nielsm5 nielsm5 added this to the 7.8.2 milestone Aug 23, 2023
@nielsm5 nielsm5 linked an issue Aug 23, 2023 that may be closed by this pull request
Allow XML root elements on JsonPipe #5281
Closed
nielsm5 added a commit that referenced this pull request Aug 24, 2023
@nielsm5
Re-enable version attribute and allow XML root elements on JsonPipe
1970024 
Backport of #5280
@nielsm5 nielsm5 mentioned this pull request Aug 24, 2023
Merged
@nielsm5 nielsm5 requested a review from tnleeuw August 28, 2023 15:54
tnleeuw
tnleeuw approved these changes Aug 29, 2023
View reviewed changes
core/src/test/java/nl/nn/adapterframework/pipes/JsonPipeTest.java
@@ -71,7 +70,7 @@ public void doPipeInputObject() throws Exception {
PipeRunResult prr = doPipe(pipe, input, session);

String result = prr.getResult().asString();
assertXmlEquals("<root><occupation nil=\"true\"/><name>Lars</name><female>false</female><age>15</age><male>true</male></root>", result);
MatchUtils.assertXmlEquals("<root><occupation nil=\"true\"/><name>Lars</name><female>false</female><age>15</age><male>true</male></root>", result);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Waarom eigenlijk geen static import meer?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nu kan je zien waar hij vandaan komt. Puur een code style voorkeur van mij

@nielsm5 nielsm5 merged commit 2b611e3 into master Aug 29, 2023
@nielsm5 nielsm5 deleted the feature/allowXmlRootElementsOnJsonPipe branch August 29, 2023 09:29
Jarivanoort added a commit to Jarivanoort/iaf that referenced this pull request Sep 6, 2023
@Jarivanoort
Squashed commit of the following:
53b9dfb 
commit bf96226
Author: Niels <nielsmeijer@hotmail.com>
Date:   Tue Sep 5 16:51:13 2023 +0200

    Attempt to enable SonarCloud (frankframework#5332)

commit 9556f5e
Author: J. Koster <j.koster@gmx.com>
Date:   Tue Sep 5 16:49:23 2023 +0200

    Use public FF repo by default, to resolve jfileserver-enterprise library (frankframework#5334)

    * This avoids the use of a mandatory profile setting

commit 2e7adbe
Author: Niels <nielsmeijer@hotmail.com>
Date:   Tue Sep 5 13:57:13 2023 +0200

    ASPOSE: Strip MimeType params for converters (frankframework#5315)

commit c653455
Author: Niels <nielsmeijer@hotmail.com>
Date:   Tue Sep 5 13:57:05 2023 +0200

    Add ContentDisposition header to WSS responses (frankframework#5314)

commit 6382219
Author: Sergi Philipsen <philipsen.sergi@gmail.com>
Date:   Tue Sep 5 13:56:29 2023 +0200

    Update information in Docker.md (frankframework#5325)

commit 217d15e
Author: Niels <nielsmeijer@hotmail.com>
Date:   Tue Sep 5 13:37:37 2023 +0200

    Allow global setting for the use of eTags and disable by default (frankframework#5317)

commit ba3f824
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Sep 5 11:51:37 2023 +0200

    Bump org.apache.tomcat:tomcat-catalina from 9.0.78 to 9.0.80 (frankframework#5322)

commit 27d3049
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Sep 5 11:51:23 2023 +0200

    Bump org.apache.ant:ant from 1.10.13 to 1.10.14 (frankframework#5323)

commit 5a1a4d8
Author: Niels <nielsmeijer@hotmail.com>
Date:   Thu Aug 31 17:47:52 2023 +0200

    Fix detection of named params in QuerySenders (frankframework#5313)

    (cherry picked from commit 9cc2994)

commit d154d9d
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu Aug 31 09:49:47 2023 +0200

    Bump spring.boot.version from 2.7.14 to 2.7.15 (frankframework#5309)

    Updates `org.springframework.boot:spring-boot-starter` from 2.7.14 to 2.7.15
    - [Release notes](https://github.com/spring-projects/spring-boot/releases)
    - [Commits](spring-projects/spring-boot@v2.7.14...v2.7.15)

    Updates `org.springframework.boot:spring-boot-starter-tomcat` from 2.7.14 to 2.7.15
    - [Release notes](https://github.com/spring-projects/spring-boot/releases)
    - [Commits](spring-projects/spring-boot@v2.7.14...v2.7.15)

    Updates `org.springframework.boot:spring-boot-loader` from 2.7.14 to 2.7.15
    - [Release notes](https://github.com/spring-projects/spring-boot/releases)
    - [Commits](spring-projects/spring-boot@v2.7.14...v2.7.15)

commit 038e502
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu Aug 31 09:42:52 2023 +0200

    Bump org.eclipse.jetty:jetty-maven-plugin (frankframework#5310)

    Bumps [org.eclipse.jetty:jetty-maven-plugin](https://github.com/eclipse/jetty.project) from 9.4.51.v20230217 to 9.4.52.v20230823.
    - [Release notes](https://github.com/eclipse/jetty.project/releases)
    - [Commits](jetty/jetty.project@jetty-9.4.51.v20230217...jetty-9.4.52.v20230823)

commit 0c69d02
Author: Niels <nielsmeijer@hotmail.com>
Date:   Wed Aug 30 15:47:28 2023 +0200

    Fix CORS headers (frankframework#5257)

commit 7f86c1d
Author: Niels <nielsmeijer@hotmail.com>
Date:   Wed Aug 30 15:38:26 2023 +0200

    ASPOSE: Preserve message when converting an image (frankframework#5299)

commit 4967b35
Author: Tim van der Leeuw <tnleeuw@gmail.com>
Date:   Wed Aug 30 15:38:02 2023 +0200

    Make logger `static final` for some of the most common classes (frankframework#5303)

commit 6ce0e89
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed Aug 30 11:33:28 2023 +0200

    Bump spring-security.version from 5.8.5 to 5.8.6 (frankframework#5304)

commit d06ee3c
Author: Tim van der Leeuw <tnleeuw@gmail.com>
Date:   Wed Aug 30 11:32:34 2023 +0200

    Miscellaneous minor code cleanups (frankframework#5306)

commit 99e8389
Author: Niels <nielsmeijer@hotmail.com>
Date:   Tue Aug 29 17:29:03 2023 +0200

    Add an application log that also prints to the std-out (frankframework#5256)

commit 2b611e3
Author: Niels <nielsmeijer@hotmail.com>
Date:   Tue Aug 29 11:28:58 2023 +0200

    Re-enable version attribute and allow XML root elements on JsonPipe (frankframework#5280)

commit 630b164
Author: Sergi Philipsen <philipsen.sergi@gmail.com>
Date:   Tue Aug 29 10:04:59 2023 +0200

    Add non-xa db2 datasource to DB2 compose file (frankframework#5297)

commit 1a6d9d2
Author: Niels <nielsmeijer@hotmail.com>
Date:   Tue Aug 29 10:03:58 2023 +0200

    Add more debug and trace logging (frankframework#5255)

commit 9b327ed
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Aug 29 10:00:56 2023 +0200

    Bump software.amazon.awssdk:sqs from 2.20.124 to 2.20.135 (frankframework#5295)

commit 7792aa1
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Aug 29 10:00:18 2023 +0200

    Bump software.amazon.awssdk:utils from 2.20.122 to 2.20.135 (frankframework#5296)

commit 8eda416
Author: Jeroen Jansen van Rosendaal <jjansenvr@gmail.com>
Date:   Wed Aug 23 15:51:54 2023 +0200

    Update MD files (frankframework#5268)

commit bb37053
Author: Niels <nielsmeijer@hotmail.com>
Date:   Wed Aug 23 09:41:24 2023 +0200

    Globally fix java imports (frankframework#5258)

commit 4d8182c
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Aug 11 16:02:55 2023 +0200

    Bump com.microsoft.azure:msal4j from 1.13.9 to 1.13.10 (frankframework#5235)

    Bumps [com.microsoft.azure:msal4j](https://github.com/AzureAD/microsoft-authentication-library-for-java) from 1.13.9 to 1.13.10.
    - [Release notes](https://github.com/AzureAD/microsoft-authentication-library-for-java/releases)
    - [Changelog](https://github.com/AzureAD/microsoft-authentication-library-for-java/blob/dev/changelog.txt)
    - [Commits](AzureAD/microsoft-authentication-library-for-java@v1.13.9...v1.13.10)

commit 90c5fc5
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Aug 11 16:02:46 2023 +0200

    Bump com.google.protobuf:protobuf-java from 3.23.4 to 3.24.0 (frankframework#5236)

    Bumps [com.google.protobuf:protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.23.4 to 3.24.0.
    - [Release notes](https://github.com/protocolbuffers/protobuf/releases)
    - [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl)
    - [Commits](protocolbuffers/protobuf@v3.23.4...v3.24.0)

commit da2252d
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Aug 11 16:02:35 2023 +0200

    Bump software.amazon.awssdk:sqs from 2.20.122 to 2.20.124 (frankframework#5237)

commit a19607c
Author: Tim van der Leeuw <tnleeuw@gmail.com>
Date:   Fri Aug 11 16:01:48 2023 +0200

    Support StoredProcedure OUT parameters for Oracle (frankframework#5224)

commit e417c44
Author: Niels <nielsmeijer@hotmail.com>
Date:   Thu Aug 10 16:59:05 2023 +0200

    Add logLevelParam to LogSender (frankframework#5231)

commit 89726d0
Author: Niels <nielsmeijer@hotmail.com>
Date:   Thu Aug 10 15:36:57 2023 +0200

    Allow create folder when creating/writing to a file (frankframework#5220)

commit 9bf93c2
Author: Niels <nielsmeijer@hotmail.com>
Date:   Thu Aug 10 15:36:08 2023 +0200

    Fix global forward Frank/Java-doc (frankframework#5230)

commit a3d9541
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu Aug 10 10:03:49 2023 +0200

    Bump com.hierynomus:smbj from 0.12.1 to 0.12.2 (frankframework#5225)

    Bumps [com.hierynomus:smbj](https://github.com/hierynomus/smbj) from 0.12.1 to 0.12.2.
    - [Commits](hierynomus/smbj@v0.12.1...v0.12.2)

commit f18eadd
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu Aug 10 10:03:16 2023 +0200

    Bump software.amazon.awssdk:cloudwatch from 2.20.120 to 2.20.122 (frankframework#5227)

commit dd70307
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu Aug 10 10:03:05 2023 +0200

    Bump org.apache.maven:maven-artifact from 3.9.3 to 3.9.4 (frankframework#5226)

    Bumps [org.apache.maven:maven-artifact](https://github.com/apache/maven) from 3.9.3 to 3.9.4.
    - [Release notes](https://github.com/apache/maven/releases)
    - [Commits](apache/maven@maven-3.9.3...maven-3.9.4)

commit 1adffc2
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed Aug 9 10:58:12 2023 +0200

    Bump org.apache.wss4j:wss4j-ws-security-dom from 2.4.1 to 2.4.2 (frankframework#5214)

commit 75d649d
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed Aug 9 10:24:39 2023 +0200

    Bump software.amazon.awssdk:sqs from 2.20.103 to 2.20.122 (frankframework#5221)

commit d84ee77
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed Aug 9 10:24:20 2023 +0200

    Bump software.amazon.awssdk:utils from 2.20.117 to 2.20.122 (frankframework#5223)

commit 0089983
Author: Tim van der Leeuw <tnleeuw@gmail.com>
Date:   Wed Aug 9 10:23:52 2023 +0200

    Make JDBC and JTA tests more stable when testing with real databases (frankframework#5184)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tnleeuw tnleeuw tnleeuw approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
7.8.2
Development

Successfully merging this pull request may close these issues.

Allow XML root elements on JsonPipe
2 participants
@nielsm5 @tnleeuw