Skip to content

Commit 22c0ff3

Browse files
ckoegelckoegel
authored
Merge pull request #48 from Bandwidth/DX-2226-XML
DX-2226 Updated XML Declaration
2 parents 7e237ab + 5fc3a95 commit 22c0ff3

File tree

3 files changed

+25
-25
lines changed

3 files changed

+25
-25
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179
<dependency>
180180
<groupId>org.projectlombok</groupId>
181181
<artifactId>lombok</artifactId>
182-
<version>1.18.8</version>
182+
<version>1.18.20</version>
183183
</dependency>
184184

185185
<dependency>

‎src/main/java/com/bandwidth/voice/bxml/verbs/Response.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ private Marshaller getMarshaller() {
120120
jaxbContext = JAXBContext.newInstance(Response.class);
121121
}
122122
Marshaller marshaller = jaxbContext.createMarshaller();
123-
// omits <?xml version="1.0" encoding="UTF-8"?>
123+
marshaller.setProperty("com.sun.xml.bind.xmlHeaders", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
124124
marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true);
125125

126126
return marshaller;

‎src/test/java/com/bandwidth/BxmlTest.java‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void testBridge() {
3636
String response = new Response()
3737
.add(bridge)
3838
.toBXML();
39-
String expected = "<Response><Bridge bridgeCompleteFallbackUrl=\"https://test3.com\" bridgeCompleteFallbackMethod=\"GET\" bridgeTargetCompleteFallbackUrl=\"https://test4.com\" bridgeTargetCompleteFallbackMethod=\"POST\" fallbackUsername=\"fuser\" fallbackPassword=\"fpass\" bridgeCompleteUrl=\"https://test.com\" bridgeCompleteMethod=\"GET\" bridgeTargetCompleteUrl=\"https://test2.com\" bridgeTargetCompleteMethod=\"POST\" username=\"user\" password=\"pass\" tag=\"custom tag\">c-95ac8d6e-1a31c52e-b38f-4198-93c1-51633ec68f8d</Bridge></Response>";
39+
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Response><Bridge bridgeCompleteFallbackUrl=\"https://test3.com\" bridgeCompleteFallbackMethod=\"GET\" bridgeTargetCompleteFallbackUrl=\"https://test4.com\" bridgeTargetCompleteFallbackMethod=\"POST\" fallbackUsername=\"fuser\" fallbackPassword=\"fpass\" bridgeCompleteUrl=\"https://test.com\" bridgeCompleteMethod=\"GET\" bridgeTargetCompleteUrl=\"https://test2.com\" bridgeTargetCompleteMethod=\"POST\" username=\"user\" password=\"pass\" tag=\"custom tag\">c-95ac8d6e-1a31c52e-b38f-4198-93c1-51633ec68f8d</Bridge></Response>";
4040

4141
assertEquals("BXML strings not equal", expected, response);
4242
}
@@ -61,7 +61,7 @@ public void testConference() {
6161
String response = new Response()
6262
.add(conference)
6363
.toBXML();
64-
String expected = "<Response><Conference mute=\"true\" hold=\"true\" callIdsToCoach=\"id1,id2\" conferenceEventUrl=\"https://example.com\" conferenceEventMethod=\"POST\" username=\"user\" password=\"pass\" tag=\"tag1\">my conference</Conference></Response>";
64+
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Response><Conference mute=\"true\" hold=\"true\" callIdsToCoach=\"id1,id2\" conferenceEventUrl=\"https://example.com\" conferenceEventMethod=\"POST\" username=\"user\" password=\"pass\" tag=\"tag1\">my conference</Conference></Response>";
6565

6666
assertEquals("BXML strings not equal", expected, response);
6767
}
@@ -78,7 +78,7 @@ public void testSpeakSentence() {
7878
String response = new Response()
7979
.add(speakSentence)
8080
.toBXML();
81-
String expected = "<Response><SpeakSentence voice=\"susan\" gender=\"female\" locale=\"en_US\">test</SpeakSentence></Response>";
81+
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Response><SpeakSentence voice=\"susan\" gender=\"female\" locale=\"en_US\">test</SpeakSentence></Response>";
8282

8383
assertEquals("BXML strings not equal", expected, response);
8484
}
@@ -92,7 +92,7 @@ public void testSpeakSentenceWithSsml() {
9292
String response = new Response()
9393
.add(speakSentence)
9494
.toBXML();
95-
String expected = "<Response><SpeakSentence>Hello, you have reached the home of <lang xml:lang=\"es-MX\">Antonio Mendoza</lang>.Please leave a message.</SpeakSentence></Response>";
95+
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Response><SpeakSentence>Hello, you have reached the home of <lang xml:lang=\"es-MX\">Antonio Mendoza</lang>.Please leave a message.</SpeakSentence></Response>";
9696

9797
assertEquals("BXML strings not equal", expected, response);
9898
}
@@ -108,7 +108,7 @@ public void testPlayAudio() {
108108
String response = new Response()
109109
.add(playAudio)
110110
.toBXML();
111-
String expected = "<Response><PlayAudio username=\"user\" password=\"pass\">https://test.com</PlayAudio></Response>";
111+
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Response><PlayAudio username=\"user\" password=\"pass\">https://test.com</PlayAudio></Response>";
112112

113113
assertEquals("BXML strings not equal", expected, response);
114114
}
@@ -135,7 +135,7 @@ public void testGather() {
135135
String response = new Response()
136136
.add(gather)
137137
.toBXML();
138-
String expected = "<Response><Gather gatherUrl=\"https://test.com\" gatherMethod=\"GET\" username=\"user\" password=\"pass\" tag=\"tag\" terminatingDigits=\"123\" maxDigits=\"3\" interDigitTimeout=\"4.0\" firstDigitTimeout=\"5.0\" repeatCount=\"6\" fallbackUsername=\"fuser\" fallbackPassword=\"fpass\" gatherFallbackUrl=\"https://test2.com\" gatherFallbackMethod=\"POST\"/></Response>";
138+
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Response><Gather gatherUrl=\"https://test.com\" gatherMethod=\"GET\" username=\"user\" password=\"pass\" tag=\"tag\" terminatingDigits=\"123\" maxDigits=\"3\" interDigitTimeout=\"4.0\" firstDigitTimeout=\"5.0\" repeatCount=\"6\" fallbackUsername=\"fuser\" fallbackPassword=\"fpass\" gatherFallbackUrl=\"https://test2.com\" gatherFallbackMethod=\"POST\"/></Response>";
139139

140140
assertEquals("BXML strings not equal", expected, response);
141141
}
@@ -159,7 +159,7 @@ public void testNestedGatherMultipleVerbs() {
159159
String response = new Response()
160160
.add(gather)
161161
.toBXML();
162-
String expected = "<Response><Gather><SpeakSentence>test</SpeakSentence><PlayAudio>https://test.com</PlayAudio></Gather></Response>";
162+
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Response><Gather><SpeakSentence>test</SpeakSentence><PlayAudio>https://test.com</PlayAudio></Gather></Response>";
163163

164164
assertEquals("BXML strings not equal", expected, response);
165165
}
@@ -177,7 +177,7 @@ public void testNestedGatherSingleVerb() {
177177
String response = new Response()
178178
.add(gather)
179179
.toBXML();
180-
String expected = "<Response><Gather><SpeakSentence>test</SpeakSentence></Gather></Response>";
180+
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Response><Gather><SpeakSentence>test</SpeakSentence></Gather></Response>";
181181

182182
assertEquals("BXML strings not equal", expected, response);
183183
}
@@ -186,7 +186,7 @@ public void testNestedGatherSingleVerb() {
186186
public void testResponse() {
187187
String response = new Response()
188188
.toBXML();
189-
String expected = "<Response/>";
189+
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Response/>";
190190

191191
assertEquals("BXML strings not equal", expected, response);
192192
}
@@ -199,7 +199,7 @@ public void testHangup() {
199199
.add(hangup)
200200
.toBXML();
201201

202-
String expected = "<Response><Hangup/></Response>";
202+
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Response><Hangup/></Response>";
203203

204204
assertEquals("BXML strings not equal", expected, response);
205205
}
@@ -216,7 +216,7 @@ public void testSendDtmf() {
216216
.add(sendDtmf)
217217
.toBXML();
218218

219-
String expected = "<Response><SendDtmf toneDuration=\"75.0\" toneInterval=\"50.0\">321</SendDtmf></Response>";
219+
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Response><SendDtmf toneDuration=\"75.0\" toneInterval=\"50.0\">321</SendDtmf></Response>";
220220

221221
assertEquals("BXML strings not equal", expected, response);
222222
}
@@ -235,7 +235,7 @@ public void testForward() {
235235
.add(forward)
236236
.toBXML();
237237

238-
String expected = "<Response><Forward to=\"+18887775555\" from=\"+8887779999\" callTimeout=\"3\" diversionTreatment=\"none\" diversionReason=\"away\"/></Response>";
238+
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Response><Forward to=\"+18887775555\" from=\"+8887779999\" callTimeout=\"3\" diversionTreatment=\"none\" diversionReason=\"away\"/></Response>";
239239

240240
assertEquals("BXML strings not equal", expected, response);
241241
}
@@ -250,7 +250,7 @@ public void testPause() {
250250
.add(pause)
251251
.toBXML();
252252

253-
String expected = "<Response><Pause duration=\"3.0\"/></Response>";
253+
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Response><Pause duration=\"3.0\"/></Response>";
254254

255255
assertEquals("BXML strings not equal", expected, response);
256256
}
@@ -273,7 +273,7 @@ public void testRedirect() {
273273
.add(redirect)
274274
.toBXML();
275275

276-
String expected = "<Response><Redirect redirectUrl=\"https://test2.com\" redirectMethod=\"GET\" tag=\"tag\" username=\"user\" password=\"pass\" fallbackUsername=\"fuser\" fallbackPassword=\"fpass\" redirectFallbackMethod=\"POST\"/></Response>";
276+
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Response><Redirect redirectUrl=\"https://test2.com\" redirectMethod=\"GET\" tag=\"tag\" username=\"user\" password=\"pass\" fallbackUsername=\"fuser\" fallbackPassword=\"fpass\" redirectFallbackMethod=\"POST\"/></Response>";
277277

278278
assertEquals("BXML strings not equal", expected, response);
279279
}
@@ -331,7 +331,7 @@ public void testTransfer() {
331331
.add(transfer)
332332
.toBXML();
333333

334-
String expected = "<Response><Transfer transferCallerId=\"+18888888888\" callTimeout=\"3.0\" transferCompleteUrl=\"https://testtransfer.com\" transferCompleteMethod=\"GET\" username=\"usertransfer\" password=\"passtransfer\" tag=\"tag3\" diversionTreatment=\"none\" diversionReason=\"away\" fallbackUsername=\"fuser7\" fallbackPassword=\"fpass7\" transferCompleteFallbackUrl=\"https://test7.com\" transferCompleteFallbackMethod=\"POST\"><PhoneNumber transferAnswerUrl=\"https://test.com\" transferAnswerMethod=\"GET\" username=\"user\" password=\"pass\" tag=\"tag\" fallbackUsername=\"fuser\" fallbackPassword=\"fpass\" transferAnswerFallbackUrl=\"https://test2.com\" transferAnswerFallbackMethod=\"POST\">+17776665555</PhoneNumber><SipUri uui=\"uui\" transferAnswerUrl=\"https://test3.com\" transferAnswerMethod=\"POST\" transferAnswerFallbackUrl=\"https://test4.com\" transferAnswerFallbackMethod=\"POST\" username=\"user2\" password=\"pass2\" fallbackUsername=\"fuser2\" fallbackPassword=\"fpass2\" tag=\"tag2\">sip-uri</SipUri></Transfer></Response>";
334+
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Response><Transfer transferCallerId=\"+18888888888\" callTimeout=\"3.0\" transferCompleteUrl=\"https://testtransfer.com\" transferCompleteMethod=\"GET\" username=\"usertransfer\" password=\"passtransfer\" tag=\"tag3\" diversionTreatment=\"none\" diversionReason=\"away\" fallbackUsername=\"fuser7\" fallbackPassword=\"fpass7\" transferCompleteFallbackUrl=\"https://test7.com\" transferCompleteFallbackMethod=\"POST\"><PhoneNumber transferAnswerUrl=\"https://test.com\" transferAnswerMethod=\"GET\" username=\"user\" password=\"pass\" tag=\"tag\" fallbackUsername=\"fuser\" fallbackPassword=\"fpass\" transferAnswerFallbackUrl=\"https://test2.com\" transferAnswerFallbackMethod=\"POST\">+17776665555</PhoneNumber><SipUri uui=\"uui\" transferAnswerUrl=\"https://test3.com\" transferAnswerMethod=\"POST\" transferAnswerFallbackUrl=\"https://test4.com\" transferAnswerFallbackMethod=\"POST\" username=\"user2\" password=\"pass2\" fallbackUsername=\"fuser2\" fallbackPassword=\"fpass2\" tag=\"tag2\">sip-uri</SipUri></Transfer></Response>";
335335

336336
assertEquals("BXML strings not equal", expected, response);
337337
}
@@ -359,7 +359,7 @@ public void testRecord() {
359359
.add(record)
360360
.toBXML();
361361

362-
String expected = "<Response><Record transcribe=\"false\" recordCompleteUrl=\"https://url.com\" recordCompleteMethod=\"POST\" recordingAvailableUrl=\"https://url.com\" recordingAvailableMethod=\"POST\" tag=\"tag\" username=\"user\" password=\"pass\" terminatingDigits=\"123\" maxDuration=\"3\" fileFormat=\"wav\" fallbackUsername=\"fuser\" fallbackPassword=\"fpass\" recordCompleteFallbackUrl=\"https://test.com\" recordCompleteFallbackMethod=\"GET\"/></Response>";
362+
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Response><Record transcribe=\"false\" recordCompleteUrl=\"https://url.com\" recordCompleteMethod=\"POST\" recordingAvailableUrl=\"https://url.com\" recordingAvailableMethod=\"POST\" tag=\"tag\" username=\"user\" password=\"pass\" terminatingDigits=\"123\" maxDuration=\"3\" fileFormat=\"wav\" fallbackUsername=\"fuser\" fallbackPassword=\"fpass\" recordCompleteFallbackUrl=\"https://test.com\" recordCompleteFallbackMethod=\"GET\"/></Response>";
363363

364364
assertEquals("BXML strings not equal", expected, response);
365365
}
@@ -380,7 +380,7 @@ public void testStartRecording() {
380380
.add(startRecording)
381381
.toBXML();
382382

383-
String expected = "<Response><StartRecording transcribe=\"false\" recordingAvailableUrl=\"https://url.com\" recordingAvailableMethod=\"POST\" tag=\"tag\" username=\"user\" password=\"pass\" multiChannel=\"false\" fileFormat=\"wav\"/></Response>";
383+
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Response><StartRecording transcribe=\"false\" recordingAvailableUrl=\"https://url.com\" recordingAvailableMethod=\"POST\" tag=\"tag\" username=\"user\" password=\"pass\" multiChannel=\"false\" fileFormat=\"wav\"/></Response>";
384384

385385
assertEquals("BXML strings not equal", expected, response);
386386
}
@@ -393,7 +393,7 @@ public void testPauseRecording() {
393393
.add(pauseRecording)
394394
.toBXML();
395395

396-
String expected = "<Response><PauseRecording/></Response>";
396+
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Response><PauseRecording/></Response>";
397397

398398
assertEquals("BXML strings not equal", expected, response);
399399
}
@@ -406,7 +406,7 @@ public void testResumeRecording() {
406406
.add(resumeRecording)
407407
.toBXML();
408408

409-
String expected = "<Response><ResumeRecording/></Response>";
409+
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Response><ResumeRecording/></Response>";
410410

411411
assertEquals("BXML strings not equal", expected, response);
412412
}
@@ -419,7 +419,7 @@ public void testStopRecording() {
419419
.add(stopRecording)
420420
.toBXML();
421421

422-
String expected = "<Response><StopRecording/></Response>";
422+
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Response><StopRecording/></Response>";
423423

424424
assertEquals("BXML strings not equal", expected, response);
425425
}
@@ -434,7 +434,7 @@ public void testRing() {
434434
.add(ring)
435435
.toBXML();
436436

437-
String expected = "<Response><Ring duration=\"3.0\"/></Response>";
437+
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Response><Ring duration=\"3.0\"/></Response>";
438438

439439
assertEquals("BXML strings not equal", expected, response);
440440
}
@@ -447,7 +447,7 @@ public void testStopGather() {
447447
.add(stopGather)
448448
.toBXML();
449449

450-
String expected = "<Response><StopGather/></Response>";
450+
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Response><StopGather/></Response>";
451451

452452
assertEquals("BXML strings not equal", expected, response);
453453
}
@@ -460,7 +460,7 @@ public void testStartGather() {
460460
.add(startGather)
461461
.toBXML();
462462

463-
String expected = "<Response><StartGather/></Response>";
463+
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Response><StartGather/></Response>";
464464

465465
assertEquals("BXML strings not equal", expected, response);
466466
}

0 commit comments

Comments
 (0)