From cad8b2ac84dac80b4bb67ea957d98f21f308fedf Mon Sep 17 00:00:00 2001
From: Alex Maltsev <and1sscsgo@gmail.com>
Date: Fri, 15 Jul 2022 18:36:33 +0300
Subject: [PATCH] Fixed unwanted VAST XML linebreaks

---
 .../org/prebid/server/vast/VastModifier.java  |  8 ++---
 .../prebid/server/vast/VastModifierTest.java  | 34 +++++++++++--------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/main/java/org/prebid/server/vast/VastModifier.java b/src/main/java/org/prebid/server/vast/VastModifier.java
index b9633c6c977..ce80078bfc1 100644
--- a/src/main/java/org/prebid/server/vast/VastModifier.java
+++ b/src/main/java/org/prebid/server/vast/VastModifier.java
@@ -94,10 +94,10 @@ public String createBidVastXml(String bidder,
     private static String resolveVastXmlFrom(String bidAdm, String bidNurl) {
         return StringUtils.isEmpty(bidAdm) && bidNurl != null
                 ? """
-                <VAST version="3.0"><Ad><Wrapper>
-                <AdSystem>prebid.org wrapper</AdSystem>
-                <VASTAdTagURI><![CDATA[%s]]></VASTAdTagURI>
-                <Creatives></Creatives>
+                <VAST version="3.0"><Ad><Wrapper>\
+                <AdSystem>prebid.org wrapper</AdSystem>\
+                <VASTAdTagURI><![CDATA[%s]]></VASTAdTagURI>\
+                <Creatives></Creatives>\
                 </Wrapper></Ad></VAST>""".formatted(bidNurl)
                 : bidAdm;
     }
diff --git a/src/test/java/org/prebid/server/vast/VastModifierTest.java b/src/test/java/org/prebid/server/vast/VastModifierTest.java
index 74deffcd33a..5593a535028 100644
--- a/src/test/java/org/prebid/server/vast/VastModifierTest.java
+++ b/src/test/java/org/prebid/server/vast/VastModifierTest.java
@@ -109,10 +109,13 @@ public void modifyVastXmlShouldModifyVastAndAppendUrl() {
                 INTEGRATION);
 
         // then
-        final String modifiedVast = "<VAST version=\"3.0\"><Ad><Wrapper><AdSystem>prebid.org wrapper</AdSystem>"
-                + "<VASTAdTagURI><![CDATA[adm2]]></VASTAdTagURI><Impression></Impression>"
-                + "<Impression><![CDATA[http://external-url/event]]></Impression>"
-                + "<Creatives></Creatives></Wrapper></Ad></VAST>";
+        final String modifiedVast =
+                """
+                <VAST version="3.0"><Ad><Wrapper><AdSystem>prebid.org wrapper</AdSystem>\
+                <VASTAdTagURI><![CDATA[adm2]]></VASTAdTagURI><Impression></Impression>\
+                <Impression><![CDATA[http://external-url/event]]></Impression><Creatives>\
+                </Creatives></Wrapper></Ad></VAST>\
+                """;
 
         assertThat(result).isEqualTo(new TextNode(modifiedVast));
     }
@@ -341,20 +344,23 @@ private static TextNode nodeAdm() {
     }
 
     public static String adm() {
-        return "<VAST version=\"3.0\"><Ad><Wrapper>"
-                + "<AdSystem>prebid.org wrapper</AdSystem>"
-                + "<VASTAdTagURI><![CDATA[adm2]]></VASTAdTagURI>"
-                + "<Impression></Impression><Creatives></Creatives>"
-                + "</Wrapper></Ad></VAST>";
+        return """
+                <VAST version="3.0"><Ad><Wrapper>\
+                <AdSystem>prebid.org wrapper</AdSystem><VASTAdTagURI>\
+                <![CDATA[adm2]]></VASTAdTagURI><Impression>\
+                </Impression><Creatives></Creatives>\
+                </Wrapper></Ad></VAST>\
+                """;
     }
 
     private static String modifiedAdm(String bidNurl) {
         return """
-                <VAST version="3.0"><Ad><Wrapper>
-                <AdSystem>prebid.org wrapper</AdSystem>
-                <VASTAdTagURI><![CDATA[%s]]></VASTAdTagURI>
-                <Creatives></Creatives>
-                </Wrapper></Ad></VAST>""".formatted(bidNurl);
+                <VAST version="3.0"><Ad><Wrapper>\
+                <AdSystem>prebid.org wrapper</AdSystem>\
+                <VASTAdTagURI><![CDATA[%s]]></VASTAdTagURI>\
+                <Creatives></Creatives>\
+                </Wrapper></Ad></VAST>\
+                """.formatted(bidNurl);
     }
 
     private static EventsContext givenEventsContext(boolean accountEnabled) {