Removing unnecessary adapters

Author: brianluisgomez

src/main/java/org/openapitools/client/model/bxml/adapter/DiversionReasonAdapter.java

@@ -66,11 +66,10 @@ public void withVerbsWorks() {
     @Test
     public void toBxmlWithDiversionWorks() throws JAXBException {
         jaxbContext = JAXBContext.newInstance(Bxml.class);
+        String expectedBxml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><Bxml><Forward callTimeout=\"300.0\" diversionTreatment=\"NONE\" diversionReason=\"DO_NOT_DISTURB\"/></Bxml>";
         Bxml bxml = new Bxml().with(Forward.builder()
                 .diversionReason(DiversionReason.DO_NOT_DISTURB)
                 .build());
-        assertThat(bxml.toBxml(jaxbContext), 
-                containsString("diversionReason=\"do-not-disturb\""));
+        assertThat(bxml.toBxml(jaxbContext), is(expectedBxml));
     }
-
 };

src/main/java/org/openapitools/client/model/bxml/adapter/DiversionTreatmentAdapter.java

@@ -38,7 +38,7 @@ public class ForwardVerbTest {
     @Test
     public void forwardVerbWorks() throws JAXBException {
         jaxbContext = JAXBContext.newInstance(Bxml.class);
-        String expectedBxml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><Bxml><Forward to=\"+19195554321\" from=\"19195554322\" uui=\"93d6f3c0be5845960b744fa28015d8ede84bd1a4;encoding=base64,asdf;encoding=jwt\" callTimeout=\"15.0\" diversionTreatment=\"propagate\" diversionReason=\"away\"/></Bxml>";
+        String expectedBxml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><Bxml><Forward to=\"+19195554321\" from=\"19195554322\" uui=\"93d6f3c0be5845960b744fa28015d8ede84bd1a4;encoding=base64,asdf;encoding=jwt\" callTimeout=\"15.0\" diversionTreatment=\"PROPAGATE\" diversionReason=\"AWAY\"/></Bxml>";
 
         assertThat(new Bxml().with(forward).toBxml(jaxbContext), is(expectedBxml));
     }

src/main/java/org/openapitools/client/model/bxml/package-info.java

@@ -66,11 +66,11 @@ public void withVerbsWorks() {
      @Test
      public void toBxmlWithDiversionWorks() throws JAXBException {
          jaxbContext = JAXBContext.newInstance(Response.class);
+         String expectedBxml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><Response><Forward callTimeout=\"300.0\" diversionTreatment=\"NONE\" diversionReason=\"DO_NOT_DISTURB\"/></Response>";
          Response response = new Response().with(Forward.builder()
                  .diversionReason(DiversionReason.DO_NOT_DISTURB)
                  .build());
-         assertThat(response.toBxml(jaxbContext), 
-                 containsString("diversionReason=\"do-not-disturb\""));
+         assertThat(response.toBxml(jaxbContext), is(expectedBxml));
      }
 
  };

src/test/java/org/openapitools/client/model/unit/bxml/BxmlVerbTest.java

@@ -57,8 +57,8 @@ public class TransferVerbTest {
     @Test
     public void transferVerbWorks() throws JAXBException {
         jaxbContext = JAXBContext.newInstance(Bxml.class);
-        String expectedSipUriBxml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><Bxml><Transfer transferCallerId=\"+19195554321\" callTimeout=\"15.0\" transferCompleteMethod=\"POST\" transferCompleteFallbackMethod=\"POST\" tag=\"test\" diversionTreatment=\"none\" diversionReason=\"unknown\"><SipUri uui=\"test\" transferAnswerUrl=\"https://example.com/webhooks/transfer_answer\" transferAnswerMethod=\"POST\" transferAnswerFallbackMethod=\"POST\" transferDisconnectMethod=\"POST\" tag=\"test\">[email protected]</SipUri></Transfer></Bxml>";
-        String expectedPhoneNumberBxml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><Bxml><Transfer transferCallerId=\"+19195554321\" callTimeout=\"15.0\" transferCompleteMethod=\"POST\" transferCompleteFallbackMethod=\"POST\" tag=\"test\" diversionTreatment=\"none\" diversionReason=\"unknown\"><PhoneNumber transferAnswerUrl=\"https://example.com/webhooks/transfer_answer\" transferAnswerMethod=\"POST\" transferAnswerFallbackMethod=\"POST\" transferDisconnectMethod=\"POST\" tag=\"test\">+19195551234</PhoneNumber></Transfer></Bxml>";
+        String expectedSipUriBxml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><Bxml><Transfer transferCallerId=\"+19195554321\" callTimeout=\"15.0\" transferCompleteMethod=\"POST\" transferCompleteFallbackMethod=\"POST\" tag=\"test\" diversionTreatment=\"NONE\" diversionReason=\"UNKNOWN\"><SipUri uui=\"test\" transferAnswerUrl=\"https://example.com/webhooks/transfer_answer\" transferAnswerMethod=\"POST\" transferAnswerFallbackMethod=\"POST\" transferDisconnectMethod=\"POST\" tag=\"test\">[email protected]</SipUri></Transfer></Bxml>";
+        String expectedPhoneNumberBxml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><Bxml><Transfer transferCallerId=\"+19195554321\" callTimeout=\"15.0\" transferCompleteMethod=\"POST\" transferCompleteFallbackMethod=\"POST\" tag=\"test\" diversionTreatment=\"NONE\" diversionReason=\"UNKNOWN\"><PhoneNumber transferAnswerUrl=\"https://example.com/webhooks/transfer_answer\" transferAnswerMethod=\"POST\" transferAnswerFallbackMethod=\"POST\" transferDisconnectMethod=\"POST\" tag=\"test\">+19195551234</PhoneNumber></Transfer></Bxml>";
 
         assertThat(new Bxml().with(transfer1).toBxml(jaxbContext), is(expectedSipUriBxml));
         assertThat(new Bxml().with(transfer2).toBxml(jaxbContext), is(expectedPhoneNumberBxml));