From 3792d51721db41875a5f62c3b855cbc1fc1038db Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Mon, 25 Sep 2023 11:36:56 +0530
Subject: [PATCH 1/3] add new route and fix attributes

---
 .../java/io/vinyldns/java/VinylDNSClient.java | 11 ++++
 .../io/vinyldns/java/VinylDNSClientImpl.java  | 11 ++++
 .../membership/GetGroupChangeRequest.java     | 45 ++++++++++++++++
 .../membership}/GetGroupRequest.java          |  2 +-
 .../membership/ListGroupActivityResponse.java | 12 ++---
 .../set/ListRecordSetChangesResponse.java     | 16 +++---
 .../io/vinyldns/java/VinylDNSClientTest.java  | 54 ++++++++++++++++++-
 7 files changed, 134 insertions(+), 17 deletions(-)
 create mode 100644 src/main/java/io/vinyldns/java/model/membership/GetGroupChangeRequest.java
 rename src/main/java/io/vinyldns/java/{ => model/membership}/GetGroupRequest.java (96%)

diff --git a/src/main/java/io/vinyldns/java/VinylDNSClient.java b/src/main/java/io/vinyldns/java/VinylDNSClient.java
index 6f8ab16..f6fbde0 100644
--- a/src/main/java/io/vinyldns/java/VinylDNSClient.java
+++ b/src/main/java/io/vinyldns/java/VinylDNSClient.java
@@ -259,6 +259,17 @@ VinylDNSResponse<ListRecordSetChangesResponse> listRecordSetChanges(
    */
   VinylDNSResponse<ListGroupActivityResponse> listGroupActivity(ListGroupActivityRequest request);
 
+    /**
+   * Retrieves a group change for a groupChangeId.
+   *
+   * @param request See {@link GetGroupChangeRequest GetGroupChangeRequest}
+   * @return {@link VinylDNSSuccessResponse
+   *     VinylDNSSuccessResponse&lt;GroupChange&gt;} in case of success and {@link
+   *     VinylDNSFailureResponse VinylDNSFailureResponse&lt;GroupChange&gt;} in case
+   *     of failure.
+   */
+  VinylDNSResponse<GroupChange> getGroupChange(GetGroupChangeRequest request);
+
   // Batch
   /**
    * Retrieves the most recent 100 batch changes created by the user. This call will return a subset
diff --git a/src/main/java/io/vinyldns/java/VinylDNSClientImpl.java b/src/main/java/io/vinyldns/java/VinylDNSClientImpl.java
index db1d648..d7cb5c5 100644
--- a/src/main/java/io/vinyldns/java/VinylDNSClientImpl.java
+++ b/src/main/java/io/vinyldns/java/VinylDNSClientImpl.java
@@ -257,6 +257,17 @@ public VinylDNSResponse<ListGroupActivityResponse> listGroupActivity(
     return executeRequest(vinylDNSRequest, ListGroupActivityResponse.class);
   }
 
+  @Override
+  public VinylDNSResponse<GroupChange> getGroupChange(
+      GetGroupChangeRequest request) {
+    String path = "groups/change/" + request.getId();
+
+    VinylDNSRequest<Void> vinylDNSRequest =
+        new VinylDNSRequest<>(Methods.GET.name(), getBaseUrl(), path, null);
+
+    return executeRequest(vinylDNSRequest, GroupChange.class);
+  }
+
   @Override
   public VinylDNSResponse<RecordSetChange> createRecordSet(CreateRecordSetRequest request) {
     String path = "zones/" + request.getZoneId() + "/recordsets";
diff --git a/src/main/java/io/vinyldns/java/model/membership/GetGroupChangeRequest.java b/src/main/java/io/vinyldns/java/model/membership/GetGroupChangeRequest.java
new file mode 100644
index 0000000..6ae5972
--- /dev/null
+++ b/src/main/java/io/vinyldns/java/model/membership/GetGroupChangeRequest.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright 2018 Comcast Cable Communications Management, LLC
+ *
+ * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * <p>Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.vinyldns.java;
+
+public class GetGroupChangeRequest {
+  private final String id;
+
+  public GetGroupChangeRequest(String id) {
+    this.id = id;
+  }
+
+  public String getId() {
+    return id;
+  }
+
+  @Override
+  public String toString() {
+    return "GroupChangeRequest{id='" + id + "'}";
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+
+    GetGroupChangeRequest that = (GetGroupChangeRequest) o;
+    return id.equals(that.id);
+  }
+
+  @Override
+  public int hashCode() {
+    return id.hashCode();
+  }
+}
diff --git a/src/main/java/io/vinyldns/java/GetGroupRequest.java b/src/main/java/io/vinyldns/java/model/membership/GetGroupRequest.java
similarity index 96%
rename from src/main/java/io/vinyldns/java/GetGroupRequest.java
rename to src/main/java/io/vinyldns/java/model/membership/GetGroupRequest.java
index 0ad3f77..9b978f7 100644
--- a/src/main/java/io/vinyldns/java/GetGroupRequest.java
+++ b/src/main/java/io/vinyldns/java/model/membership/GetGroupRequest.java
@@ -26,7 +26,7 @@ public String getId() {
 
   @Override
   public String toString() {
-    return "ZoneRequest{id='" + id + "'}";
+    return "GroupRequest{id='" + id + "'}";
   }
 
   @Override
diff --git a/src/main/java/io/vinyldns/java/model/membership/ListGroupActivityResponse.java b/src/main/java/io/vinyldns/java/model/membership/ListGroupActivityResponse.java
index 2dbba5d..b765659 100644
--- a/src/main/java/io/vinyldns/java/model/membership/ListGroupActivityResponse.java
+++ b/src/main/java/io/vinyldns/java/model/membership/ListGroupActivityResponse.java
@@ -17,7 +17,7 @@
 
 public class ListGroupActivityResponse {
   private final Set<GroupChange> changes;
-  private String startFrom, nextId; // optional
+  private Integer startFrom, nextId; // optional
   private final Integer maxItems;
 
   public ListGroupActivityResponse(Set<GroupChange> changes, Integer maxItems) {
@@ -26,7 +26,7 @@ public ListGroupActivityResponse(Set<GroupChange> changes, Integer maxItems) {
   }
 
   public ListGroupActivityResponse(
-      Set<GroupChange> changes, String startFrom, String nextId, Integer maxItems) {
+      Set<GroupChange> changes, Integer startFrom, Integer nextId, Integer maxItems) {
     this.changes = changes;
     this.startFrom = startFrom;
     this.nextId = nextId;
@@ -37,11 +37,11 @@ public Set<GroupChange> getGroups() {
     return changes;
   }
 
-  public String getStartFrom() {
+  public Integer getStartFrom() {
     return startFrom;
   }
 
-  public void setStartFrom(String startFrom) {
+  public void setStartFrom(Integer startFrom) {
     this.startFrom = startFrom;
   }
 
@@ -53,11 +53,11 @@ public Set<GroupChange> getChanges() {
     return changes;
   }
 
-  public String getNextId() {
+  public Integer getNextId() {
     return nextId;
   }
 
-  public void setNextId(String nextId) {
+  public void setNextId(Integer nextId) {
     this.nextId = nextId;
   }
 
diff --git a/src/main/java/io/vinyldns/java/model/record/set/ListRecordSetChangesResponse.java b/src/main/java/io/vinyldns/java/model/record/set/ListRecordSetChangesResponse.java
index 53970fb..f94e6c7 100644
--- a/src/main/java/io/vinyldns/java/model/record/set/ListRecordSetChangesResponse.java
+++ b/src/main/java/io/vinyldns/java/model/record/set/ListRecordSetChangesResponse.java
@@ -19,15 +19,15 @@
 public class ListRecordSetChangesResponse {
   private String zoneId;
   private List<RecordSetChange> recordSetChanges;
-  private String nextId; // optional
-  private String startFrom; // optional
+  private Integer nextId; // optional
+  private Integer startFrom; // optional
   private Integer maxItems;
 
   public ListRecordSetChangesResponse(
       String zoneId,
       List<RecordSetChange> recordSetChanges,
-      String nextId,
-      String startFrom,
+      Integer nextId,
+      Integer startFrom,
       Integer maxItems) {
     this.zoneId = zoneId;
     this.recordSetChanges = recordSetChanges;
@@ -52,19 +52,19 @@ public void setRecordSetChanges(List<RecordSetChange> recordSetChanges) {
     this.recordSetChanges = recordSetChanges;
   }
 
-  public String getNextId() {
+  public Integer getNextId() {
     return nextId;
   }
 
-  public void setNextId(String nextId) {
+  public void setNextId(Integer nextId) {
     this.nextId = nextId;
   }
 
-  public String getStartFrom() {
+  public Integer getStartFrom() {
     return startFrom;
   }
 
-  public void setStartFrom(String startFrom) {
+  public void setStartFrom(Integer startFrom) {
     this.startFrom = startFrom;
   }
 
diff --git a/src/test/java/io/vinyldns/java/VinylDNSClientTest.java b/src/test/java/io/vinyldns/java/VinylDNSClientTest.java
index cb1c0b1..cbd8016 100644
--- a/src/test/java/io/vinyldns/java/VinylDNSClientTest.java
+++ b/src/test/java/io/vinyldns/java/VinylDNSClientTest.java
@@ -1111,6 +1111,53 @@ public void listGroupActivitySuccessWithParams() {
     assertEquals(vinylDNSResponse.getValue(), listGroupActivityResponse);
   }
 
+  @Test
+  public void getGroupChangeSuccess() {
+    String response = client.gson.toJson(groupChange);
+
+    wireMockServer.stubFor(
+        get(urlEqualTo("/groups/change/" + groupChangeId))
+            .willReturn(
+                aResponse()
+                    .withStatus(200)
+                    .withHeader("Content-Type", "application/json")
+                    .withBody(response)));
+
+    VinylDNSResponse<Group> vinylDNSResponse = client.getGroupChange(getGroupChangeRequest);
+
+    assertTrue(vinylDNSResponse instanceof ResponseMarker.Success);
+    assertEquals(vinylDNSResponse.getStatusCode(), 200);
+    assertEquals(vinylDNSResponse.getValue(), groupChange);
+  }
+
+  @Test
+  public void getGroupChangeFailure() {
+    wireMockServer.stubFor(
+        get(urlEqualTo("/groups/change/" + groupChangeId))
+            .willReturn(aResponse().withStatus(500).withBody("server error")));
+
+    VinylDNSResponse<Group> vinylDNSResponse = client.getGroup(getGroupChangeRequest);
+
+    assertTrue(vinylDNSResponse instanceof ResponseMarker.Failure);
+    assertEquals(vinylDNSResponse.getStatusCode(), 500);
+    assertEquals(vinylDNSResponse.getMessageBody(), "server error");
+    assertNull(vinylDNSResponse.getValue());
+  }
+
+  @Test
+  public void getGroupChangeFailure404() {
+    wireMockServer.stubFor(
+        get(urlEqualTo("/groups/change/" + groupChangeId))
+            .willReturn(aResponse().withStatus(404).withBody("not found")));
+
+    VinylDNSResponse<Group> vinylDNSResponse = client.getGroup(getGroupChangeRequest);
+
+    assertTrue(vinylDNSResponse instanceof ResponseMarker.Failure);
+    assertEquals(vinylDNSResponse.getStatusCode(), 404);
+    assertEquals(vinylDNSResponse.getMessageBody(), "not found");
+    assertNull(vinylDNSResponse.getValue());
+  }
+
   @Test
   public void createBatchChangeSuccess() {
 
@@ -1672,6 +1719,7 @@ public void listRecordSetGlobalFailure() {
   private GetRecordSetRequest getRecordSetRequest = new GetRecordSetRequest(zoneId, recordSetId);
 
   private String groupId = "groupId";
+  private String grouChangeId = "groupChangeId";
   private GetRecordSetChangeRequest getRecordSetChangeRequest =
       new GetRecordSetChangeRequest(zoneId, recordSetId, recordSetChangeId);
   private UpdateRecordSetRequest updateRecordSetRequest =
@@ -1707,6 +1755,7 @@ public void listRecordSetGlobalFailure() {
 
   private Set<GroupChange> groupChanges =
       Collections.singleton(new GroupChange("ID", newGroup, group, "", "", GroupChangeType.Update));
+  private GroupChange groupChange = new GroupChange("ID", newGroup, group, "", "", GroupChangeType.Update);
 
   private CreateGroupRequest createGroupRequest =
       new CreateGroupRequest("createGroup", "create@group.com", adminMemberId, adminMemberId);
@@ -1721,6 +1770,7 @@ public void listRecordSetGlobalFailure() {
           new DateTime(),
           GroupStatus.Active);
   private GetGroupRequest getGroupRequest = new GetGroupRequest(groupId);
+  private GetGroupChangeRequest getGroupRequest = new GetGroupChangeRequest(groupChangeId);
   private DeleteGroupRequest deleteGroupRequest = new DeleteGroupRequest(groupId);
 
   private List<Group> groupList = Collections.singletonList(group);
@@ -1732,13 +1782,13 @@ public void listRecordSetGlobalFailure() {
       new ListMembersResponse(adminUserInfo, "startFrom", "nextId", 100);
 
   private ListGroupActivityResponse listGroupActivityResponse =
-      new ListGroupActivityResponse(groupChanges, "startFrom", "nextId", 100);
+      new ListGroupActivityResponse(groupChanges, 1, 2, 100);
 
   private List<RecordSetChange> recordSetChangeList =
       Collections.singletonList(recordSetChangeCreate);
 
   private ListRecordSetChangesResponse listRecordSetChangesResponse =
-      new ListRecordSetChangesResponse(zoneId, recordSetChangeList, "", "startFrom", 1);
+      new ListRecordSetChangesResponse(zoneId, recordSetChangeList, 2, 1, 1);
 
   private SearchRecordSetsResponse searchRecordSetsResponse =
           new SearchRecordSetsResponse(

From 49b2363620fcd4bf135c643baa06a8fab949ffed Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Mon, 25 Sep 2023 11:50:00 +0530
Subject: [PATCH 2/3] fix indentation

---
 src/main/java/io/vinyldns/java/VinylDNSClient.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/vinyldns/java/VinylDNSClient.java b/src/main/java/io/vinyldns/java/VinylDNSClient.java
index f6fbde0..d6e3170 100644
--- a/src/main/java/io/vinyldns/java/VinylDNSClient.java
+++ b/src/main/java/io/vinyldns/java/VinylDNSClient.java
@@ -259,7 +259,7 @@ VinylDNSResponse<ListRecordSetChangesResponse> listRecordSetChanges(
    */
   VinylDNSResponse<ListGroupActivityResponse> listGroupActivity(ListGroupActivityRequest request);
 
-    /**
+  /**
    * Retrieves a group change for a groupChangeId.
    *
    * @param request See {@link GetGroupChangeRequest GetGroupChangeRequest}

From 54077d89229ca65a0e9725958c393e23be9bf3bd Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Mon, 25 Sep 2023 12:23:48 +0530
Subject: [PATCH 3/3] fix code structure and tests

---
 .../java/io/vinyldns/java/VinylDNSClient.java |  33 ++-
 .../vinyldns/java/VinylDNSClientConfig.java   |  16 +-
 .../io/vinyldns/java/VinylDNSClientImpl.java  |  30 +--
 .../io/vinyldns/java/VinylDNSRequest.java     |  16 +-
 .../java/handlers/ErrorResponseHandler.java   |  16 +-
 .../java/handlers/StringResponseHandler.java  |  16 +-
 .../java/io/vinyldns/java/model/Methods.java  |  16 +-
 .../java/io/vinyldns/java/model/Order.java    |  23 ++-
 .../io/vinyldns/java/model/acl/ACLRule.java   |  16 +-
 .../vinyldns/java/model/acl/AccessLevel.java  |  16 +-
 .../java/model/batch/AddChangeInput.java      |  19 +-
 .../java/model/batch/AddSingleChange.java     |  16 +-
 .../batch/BatchChangeApprovalStatus.java      |  16 +-
 .../java/model/batch/BatchChangeReview.java   |  16 +-
 .../java/model/batch/BatchChangeStatus.java   |  16 +-
 .../java/model/batch/BatchResponse.java       |  16 +-
 .../java/model/batch/ChangeInput.java         |  24 ++-
 .../java/model/batch/ChangeInputType.java     |  16 +-
 .../java/model/batch/CreateBatchRequest.java  |  16 +-
 .../batch/DeleteRecordSetChangeInput.java     |  16 +-
 .../batch/DeleteRecordSetSingleChange.java    |  16 +-
 .../java/model/batch/GetRecordSetRequest.java |  16 +-
 .../model/batch/ListBatchChangesRequest.java  |  16 +-
 .../model/batch/ListBatchChangesResponse.java |  16 +-
 .../java/model/batch/SingleChange.java        |  16 +-
 .../java/model/batch/SingleChangeError.java   |  16 +-
 .../java/model/batch/SingleChangeStatus.java  |  16 +-
 .../java/model/batch/ValidationError.java     |  16 +-
 .../model/membership/CreateGroupRequest.java  |  16 +-
 .../model/membership/DeleteGroupRequest.java  |  16 +-
 .../membership/GetGroupChangeRequest.java     |  16 +-
 .../model/membership/GetGroupRequest.java     |  16 +-
 .../vinyldns/java/model/membership/Group.java |  16 +-
 .../java/model/membership/GroupChange.java    |  16 +-
 .../model/membership/GroupChangeType.java     |  16 +-
 .../java/model/membership/GroupStatus.java    |  16 +-
 .../model/membership/ListAdminsResponse.java  |  16 +-
 .../membership/ListGroupActivityRequest.java  |  24 ++-
 .../membership/ListGroupActivityResponse.java |  16 +-
 .../model/membership/ListGroupsRequest.java   |  16 +-
 .../model/membership/ListGroupsResponse.java  |  16 +-
 .../model/membership/ListMembersRequest.java  |  16 +-
 .../model/membership/ListMembersResponse.java |  16 +-
 .../java/model/membership/LockStatus.java     |  16 +-
 .../java/model/membership/MemberId.java       |  16 +-
 .../model/membership/UpdateGroupRequest.java  |  16 +-
 .../java/model/membership/UserInfo.java       |  16 +-
 .../java/model/record/RecordType.java         |  16 +-
 .../java/model/record/data/AAAAData.java      |  16 +-
 .../java/model/record/data/AData.java         |  16 +-
 .../java/model/record/data/CNAMEData.java     |  16 +-
 .../java/model/record/data/MXData.java        |  16 +-
 .../java/model/record/data/NSData.java        |  16 +-
 .../java/model/record/data/PTRData.java       |  16 +-
 .../java/model/record/data/RecordData.java    |  16 +-
 .../java/model/record/data/SOAData.java       |  16 +-
 .../java/model/record/data/SPFData.java       |  16 +-
 .../java/model/record/data/SRVData.java       |  16 +-
 .../java/model/record/data/SSHFPData.java     |  16 +-
 .../java/model/record/data/TXTData.java       |  16 +-
 .../java/model/record/data/UNKNOWNData.java   |  16 +-
 .../record/set/CreateRecordSetRequest.java    |  16 +-
 .../record/set/DeleteRecordSetRequest.java    |  16 +-
 .../record/set/GetRecordSetChangeRequest.java |  16 +-
 .../set/ListRecordSetChangesRequest.java      |  16 +-
 .../set/ListRecordSetChangesResponse.java     |  16 +-
 .../record/set/ListRecordSetsRequest.java     |  16 +-
 .../record/set/ListRecordSetsResponse.java    |  16 +-
 .../java/model/record/set/RecordSet.java      |  16 +-
 .../java/model/record/set/RecordSetBase.java  |  16 +-
 .../model/record/set/RecordSetChange.java     |  16 +-
 .../record/set/RecordSetChangeStatus.java     |  16 +-
 .../model/record/set/RecordSetChangeType.java |  16 +-
 .../model/record/set/RecordSetStatus.java     |  16 +-
 .../record/set/SearchRecordSetsRequest.java   | 191 +++++++++---------
 .../record/set/SearchRecordSetsResponse.java  | 187 +++++++++--------
 .../record/set/UpdateRecordSetRequest.java    |  16 +-
 .../java/model/zone/GetRecordSetResponse.java |  16 +-
 .../java/model/zone/GetZoneResponse.java      |  16 +-
 .../model/zone/ListZoneChangesRequest.java    |  16 +-
 .../model/zone/ListZoneChangesResponse.java   |  16 +-
 .../java/model/zone/ListZonesRequest.java     |  16 +-
 .../java/model/zone/ListZonesResponse.java    |  16 +-
 .../io/vinyldns/java/model/zone/Zone.java     |  16 +-
 .../io/vinyldns/java/model/zone/ZoneACL.java  |  16 +-
 .../java/model/zone/ZoneChangeStatus.java     |  16 +-
 .../java/model/zone/ZoneChangeType.java       |  16 +-
 .../java/model/zone/ZoneConnection.java       |  16 +-
 .../vinyldns/java/model/zone/ZoneRequest.java |  16 +-
 .../java/model/zone/ZoneResponse.java         |  16 +-
 .../vinyldns/java/model/zone/ZoneStatus.java  |  16 +-
 .../java/responses/ResponseMarker.java        |  16 +-
 .../responses/VinylDNSFailureResponse.java    |  16 +-
 .../java/responses/VinylDNSResponse.java      |  16 +-
 .../responses/VinylDNSSuccessResponse.java    |  16 +-
 .../serializers/ChangeInputDeserializer.java  |  16 +-
 .../java/serializers/DateTimeSerializer.java  |  16 +-
 .../java/serializers/InstantSerializer.java   |  16 +-
 .../serializers/RecordDataDeserializer.java   |  16 +-
 .../RecordSetTypeAdapterFactory.java          |  16 +-
 .../serializers/SerializationFactory.java     |  16 +-
 .../SingleChangeAdapterFactory.java           |  63 +++---
 .../io/vinyldns/java/VinylDNSClientTest.java  | 105 +++++-----
 .../java/models/batch/ChangeInputTest.java    |  63 ++++--
 .../serializers/SerializationFactoryTest.java |  16 +-
 105 files changed, 1247 insertions(+), 1019 deletions(-)

diff --git a/src/main/java/io/vinyldns/java/VinylDNSClient.java b/src/main/java/io/vinyldns/java/VinylDNSClient.java
index d6e3170..9a7b18f 100644
--- a/src/main/java/io/vinyldns/java/VinylDNSClient.java
+++ b/src/main/java/io/vinyldns/java/VinylDNSClient.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java;
@@ -263,10 +265,9 @@ VinylDNSResponse<ListRecordSetChangesResponse> listRecordSetChanges(
    * Retrieves a group change for a groupChangeId.
    *
    * @param request See {@link GetGroupChangeRequest GetGroupChangeRequest}
-   * @return {@link VinylDNSSuccessResponse
-   *     VinylDNSSuccessResponse&lt;GroupChange&gt;} in case of success and {@link
-   *     VinylDNSFailureResponse VinylDNSFailureResponse&lt;GroupChange&gt;} in case
-   *     of failure.
+   * @return {@link VinylDNSSuccessResponse VinylDNSSuccessResponse&lt;GroupChange&gt;} in case of
+   *     success and {@link VinylDNSFailureResponse VinylDNSFailureResponse&lt;GroupChange&gt;} in
+   *     case of failure.
    */
   VinylDNSResponse<GroupChange> getGroupChange(GetGroupChangeRequest request);
 
@@ -375,11 +376,9 @@ VinylDNSResponse<ListRecordSetChangesResponse> listRecordSetChanges(
    * minimum of two alpha-numeric characters is required.
    *
    * @param request See {@link SearchRecordSetsRequest SearchRecordSetsRequest Model}
-   * @return {@link VinylDNSSuccessResponse
-   *     VinylDNSSuccessResponse&lt;SearchRecordSetsResponse&gt;} in case of success and {@link
-   *     VinylDNSFailureResponse VinylDNSFailureResponse&lt;SearchRecordSetsResponse&gt;} in case
-   *     of failure
+   * @return {@link VinylDNSSuccessResponse VinylDNSSuccessResponse&lt;SearchRecordSetsResponse&gt;}
+   *     in case of success and {@link VinylDNSFailureResponse
+   *     VinylDNSFailureResponse&lt;SearchRecordSetsResponse&gt;} in case of failure
    */
-  VinylDNSResponse<SearchRecordSetsResponse> searchRecordSets(
-          SearchRecordSetsRequest request);
+  VinylDNSResponse<SearchRecordSetsResponse> searchRecordSets(SearchRecordSetsRequest request);
 }
diff --git a/src/main/java/io/vinyldns/java/VinylDNSClientConfig.java b/src/main/java/io/vinyldns/java/VinylDNSClientConfig.java
index 8bd7c4b..5bf0f0b 100644
--- a/src/main/java/io/vinyldns/java/VinylDNSClientConfig.java
+++ b/src/main/java/io/vinyldns/java/VinylDNSClientConfig.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java;
diff --git a/src/main/java/io/vinyldns/java/VinylDNSClientImpl.java b/src/main/java/io/vinyldns/java/VinylDNSClientImpl.java
index d7cb5c5..78871fb 100644
--- a/src/main/java/io/vinyldns/java/VinylDNSClientImpl.java
+++ b/src/main/java/io/vinyldns/java/VinylDNSClientImpl.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java;
@@ -247,7 +249,7 @@ public VinylDNSResponse<ListGroupActivityResponse> listGroupActivity(
         new VinylDNSRequest<>(Methods.GET.name(), getBaseUrl(), path, null);
 
     if (request.getStartFrom() != null) {
-      vinylDNSRequest.addParameter("startFrom", request.getStartFrom());
+      vinylDNSRequest.addParameter("startFrom", request.getStartFrom().toString());
     }
 
     if (request.getMaxItems() != null) {
@@ -258,8 +260,7 @@ public VinylDNSResponse<ListGroupActivityResponse> listGroupActivity(
   }
 
   @Override
-  public VinylDNSResponse<GroupChange> getGroupChange(
-      GetGroupChangeRequest request) {
+  public VinylDNSResponse<GroupChange> getGroupChange(GetGroupChangeRequest request) {
     String path = "groups/change/" + request.getId();
 
     VinylDNSRequest<Void> vinylDNSRequest =
@@ -421,11 +422,11 @@ public VinylDNSResponse<BatchResponse> cancelBatchChanges(String id) {
 
   @Override
   public VinylDNSResponse<SearchRecordSetsResponse> searchRecordSets(
-          SearchRecordSetsRequest request) {
+      SearchRecordSetsRequest request) {
     String path = "recordsets";
 
     VinylDNSRequest<Void> vinylDNSRequest =
-            new VinylDNSRequest<>(Methods.GET.name(), getBaseUrl(), path, null);
+        new VinylDNSRequest<>(Methods.GET.name(), getBaseUrl(), path, null);
 
     if (request.getStartFrom() != null) {
       vinylDNSRequest.addParameter("startFrom", request.getStartFrom());
@@ -440,12 +441,11 @@ public VinylDNSResponse<SearchRecordSetsResponse> searchRecordSets(
     }
 
     if (request.getNameSort() != null) {
-      vinylDNSRequest.addParameter( "nameSort", request.getNameSort().name());
+      vinylDNSRequest.addParameter("nameSort", request.getNameSort().name());
     }
 
     if (request.getRecordOwnerGroupFilter() != null) {
-      vinylDNSRequest.addParameter( "recordOwnerGroupFilter",
-                                    request.getRecordOwnerGroupFilter());
+      vinylDNSRequest.addParameter("recordOwnerGroupFilter", request.getRecordOwnerGroupFilter());
     }
 
     return executeRequest(vinylDNSRequest, SearchRecordSetsResponse.class);
diff --git a/src/main/java/io/vinyldns/java/VinylDNSRequest.java b/src/main/java/io/vinyldns/java/VinylDNSRequest.java
index 3778e17..67945a6 100644
--- a/src/main/java/io/vinyldns/java/VinylDNSRequest.java
+++ b/src/main/java/io/vinyldns/java/VinylDNSRequest.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java;
diff --git a/src/main/java/io/vinyldns/java/handlers/ErrorResponseHandler.java b/src/main/java/io/vinyldns/java/handlers/ErrorResponseHandler.java
index 37264d2..17245c3 100644
--- a/src/main/java/io/vinyldns/java/handlers/ErrorResponseHandler.java
+++ b/src/main/java/io/vinyldns/java/handlers/ErrorResponseHandler.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.handlers;
diff --git a/src/main/java/io/vinyldns/java/handlers/StringResponseHandler.java b/src/main/java/io/vinyldns/java/handlers/StringResponseHandler.java
index 90f08d6..5e7e971 100644
--- a/src/main/java/io/vinyldns/java/handlers/StringResponseHandler.java
+++ b/src/main/java/io/vinyldns/java/handlers/StringResponseHandler.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.handlers;
diff --git a/src/main/java/io/vinyldns/java/model/Methods.java b/src/main/java/io/vinyldns/java/model/Methods.java
index de97d75..0b103b2 100644
--- a/src/main/java/io/vinyldns/java/model/Methods.java
+++ b/src/main/java/io/vinyldns/java/model/Methods.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model;
diff --git a/src/main/java/io/vinyldns/java/model/Order.java b/src/main/java/io/vinyldns/java/model/Order.java
index ce0eba8..234a10e 100644
--- a/src/main/java/io/vinyldns/java/model/Order.java
+++ b/src/main/java/io/vinyldns/java/model/Order.java
@@ -1,8 +1,21 @@
+/*
+ * Copyright 2018 Comcast Cable Communications Management, LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package io.vinyldns.java.model;
 
-public enum Order
-{
-    ASC,
-    DESC
-
+public enum Order {
+  ASC,
+  DESC
 }
diff --git a/src/main/java/io/vinyldns/java/model/acl/ACLRule.java b/src/main/java/io/vinyldns/java/model/acl/ACLRule.java
index 895a5ec..9f456cc 100644
--- a/src/main/java/io/vinyldns/java/model/acl/ACLRule.java
+++ b/src/main/java/io/vinyldns/java/model/acl/ACLRule.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.acl;
diff --git a/src/main/java/io/vinyldns/java/model/acl/AccessLevel.java b/src/main/java/io/vinyldns/java/model/acl/AccessLevel.java
index b33254c..e51502c 100644
--- a/src/main/java/io/vinyldns/java/model/acl/AccessLevel.java
+++ b/src/main/java/io/vinyldns/java/model/acl/AccessLevel.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.acl;
diff --git a/src/main/java/io/vinyldns/java/model/batch/AddChangeInput.java b/src/main/java/io/vinyldns/java/model/batch/AddChangeInput.java
index f7bbb02..b35b7b6 100644
--- a/src/main/java/io/vinyldns/java/model/batch/AddChangeInput.java
+++ b/src/main/java/io/vinyldns/java/model/batch/AddChangeInput.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.batch;
@@ -41,8 +43,7 @@ public boolean equals(Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
     AddChangeInput that = (AddChangeInput) o;
-    return super.equals(o)
-        && Objects.equals(this.ttl, that.ttl);
+    return super.equals(o) && Objects.equals(this.ttl, that.ttl);
   }
 
   @Override
diff --git a/src/main/java/io/vinyldns/java/model/batch/AddSingleChange.java b/src/main/java/io/vinyldns/java/model/batch/AddSingleChange.java
index aa6b2b9..313a74b 100644
--- a/src/main/java/io/vinyldns/java/model/batch/AddSingleChange.java
+++ b/src/main/java/io/vinyldns/java/model/batch/AddSingleChange.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.batch;
diff --git a/src/main/java/io/vinyldns/java/model/batch/BatchChangeApprovalStatus.java b/src/main/java/io/vinyldns/java/model/batch/BatchChangeApprovalStatus.java
index b59a6dc..80b5542 100644
--- a/src/main/java/io/vinyldns/java/model/batch/BatchChangeApprovalStatus.java
+++ b/src/main/java/io/vinyldns/java/model/batch/BatchChangeApprovalStatus.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.batch;
diff --git a/src/main/java/io/vinyldns/java/model/batch/BatchChangeReview.java b/src/main/java/io/vinyldns/java/model/batch/BatchChangeReview.java
index 3331bdb..636bca0 100644
--- a/src/main/java/io/vinyldns/java/model/batch/BatchChangeReview.java
+++ b/src/main/java/io/vinyldns/java/model/batch/BatchChangeReview.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.batch;
diff --git a/src/main/java/io/vinyldns/java/model/batch/BatchChangeStatus.java b/src/main/java/io/vinyldns/java/model/batch/BatchChangeStatus.java
index df36850..08103a8 100644
--- a/src/main/java/io/vinyldns/java/model/batch/BatchChangeStatus.java
+++ b/src/main/java/io/vinyldns/java/model/batch/BatchChangeStatus.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.batch;
diff --git a/src/main/java/io/vinyldns/java/model/batch/BatchResponse.java b/src/main/java/io/vinyldns/java/model/batch/BatchResponse.java
index 3f6f2cc..f29b20f 100644
--- a/src/main/java/io/vinyldns/java/model/batch/BatchResponse.java
+++ b/src/main/java/io/vinyldns/java/model/batch/BatchResponse.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.batch;
diff --git a/src/main/java/io/vinyldns/java/model/batch/ChangeInput.java b/src/main/java/io/vinyldns/java/model/batch/ChangeInput.java
index 7babf8d..fffee91 100644
--- a/src/main/java/io/vinyldns/java/model/batch/ChangeInput.java
+++ b/src/main/java/io/vinyldns/java/model/batch/ChangeInput.java
@@ -1,21 +1,22 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.batch;
 
 import io.vinyldns.java.model.record.RecordType;
 import io.vinyldns.java.model.record.data.RecordData;
-
 import java.util.Objects;
 
 public class ChangeInput {
@@ -31,7 +32,8 @@ public ChangeInput(ChangeInputType changeType, String inputName, RecordType type
     this.record = null;
   }
 
-  public ChangeInput(ChangeInputType changeType, String inputName, RecordType type, RecordData record) {
+  public ChangeInput(
+      ChangeInputType changeType, String inputName, RecordType type, RecordData record) {
     this.changeType = changeType;
     this.inputName = inputName;
     this.type = type;
@@ -50,7 +52,9 @@ public RecordType getType() {
     return type;
   }
 
-  public RecordData getRecord() { return record; }
+  public RecordData getRecord() {
+    return record;
+  }
 
   @Override
   public boolean equals(Object o) {
diff --git a/src/main/java/io/vinyldns/java/model/batch/ChangeInputType.java b/src/main/java/io/vinyldns/java/model/batch/ChangeInputType.java
index 83f9a3d..ea41bb2 100644
--- a/src/main/java/io/vinyldns/java/model/batch/ChangeInputType.java
+++ b/src/main/java/io/vinyldns/java/model/batch/ChangeInputType.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.batch;
diff --git a/src/main/java/io/vinyldns/java/model/batch/CreateBatchRequest.java b/src/main/java/io/vinyldns/java/model/batch/CreateBatchRequest.java
index 8d78b28..da72f08 100644
--- a/src/main/java/io/vinyldns/java/model/batch/CreateBatchRequest.java
+++ b/src/main/java/io/vinyldns/java/model/batch/CreateBatchRequest.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.batch;
diff --git a/src/main/java/io/vinyldns/java/model/batch/DeleteRecordSetChangeInput.java b/src/main/java/io/vinyldns/java/model/batch/DeleteRecordSetChangeInput.java
index cecedd9..594edef 100644
--- a/src/main/java/io/vinyldns/java/model/batch/DeleteRecordSetChangeInput.java
+++ b/src/main/java/io/vinyldns/java/model/batch/DeleteRecordSetChangeInput.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.batch;
diff --git a/src/main/java/io/vinyldns/java/model/batch/DeleteRecordSetSingleChange.java b/src/main/java/io/vinyldns/java/model/batch/DeleteRecordSetSingleChange.java
index 1f530cc..baf82db 100644
--- a/src/main/java/io/vinyldns/java/model/batch/DeleteRecordSetSingleChange.java
+++ b/src/main/java/io/vinyldns/java/model/batch/DeleteRecordSetSingleChange.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.batch;
diff --git a/src/main/java/io/vinyldns/java/model/batch/GetRecordSetRequest.java b/src/main/java/io/vinyldns/java/model/batch/GetRecordSetRequest.java
index 1a66e2f..704e4ea 100644
--- a/src/main/java/io/vinyldns/java/model/batch/GetRecordSetRequest.java
+++ b/src/main/java/io/vinyldns/java/model/batch/GetRecordSetRequest.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.batch;
diff --git a/src/main/java/io/vinyldns/java/model/batch/ListBatchChangesRequest.java b/src/main/java/io/vinyldns/java/model/batch/ListBatchChangesRequest.java
index 15874ce..353a738 100644
--- a/src/main/java/io/vinyldns/java/model/batch/ListBatchChangesRequest.java
+++ b/src/main/java/io/vinyldns/java/model/batch/ListBatchChangesRequest.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.batch;
diff --git a/src/main/java/io/vinyldns/java/model/batch/ListBatchChangesResponse.java b/src/main/java/io/vinyldns/java/model/batch/ListBatchChangesResponse.java
index 2b55d39..de547ec 100644
--- a/src/main/java/io/vinyldns/java/model/batch/ListBatchChangesResponse.java
+++ b/src/main/java/io/vinyldns/java/model/batch/ListBatchChangesResponse.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.batch;
diff --git a/src/main/java/io/vinyldns/java/model/batch/SingleChange.java b/src/main/java/io/vinyldns/java/model/batch/SingleChange.java
index 9f4cc04..febaa30 100644
--- a/src/main/java/io/vinyldns/java/model/batch/SingleChange.java
+++ b/src/main/java/io/vinyldns/java/model/batch/SingleChange.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.batch;
diff --git a/src/main/java/io/vinyldns/java/model/batch/SingleChangeError.java b/src/main/java/io/vinyldns/java/model/batch/SingleChangeError.java
index bac2ca1..78755fc 100644
--- a/src/main/java/io/vinyldns/java/model/batch/SingleChangeError.java
+++ b/src/main/java/io/vinyldns/java/model/batch/SingleChangeError.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.batch;
diff --git a/src/main/java/io/vinyldns/java/model/batch/SingleChangeStatus.java b/src/main/java/io/vinyldns/java/model/batch/SingleChangeStatus.java
index 5d49dad..9149e24 100644
--- a/src/main/java/io/vinyldns/java/model/batch/SingleChangeStatus.java
+++ b/src/main/java/io/vinyldns/java/model/batch/SingleChangeStatus.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.batch;
diff --git a/src/main/java/io/vinyldns/java/model/batch/ValidationError.java b/src/main/java/io/vinyldns/java/model/batch/ValidationError.java
index 01c4551..da14cdf 100644
--- a/src/main/java/io/vinyldns/java/model/batch/ValidationError.java
+++ b/src/main/java/io/vinyldns/java/model/batch/ValidationError.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.batch;
diff --git a/src/main/java/io/vinyldns/java/model/membership/CreateGroupRequest.java b/src/main/java/io/vinyldns/java/model/membership/CreateGroupRequest.java
index efef1c8..9c26f97 100644
--- a/src/main/java/io/vinyldns/java/model/membership/CreateGroupRequest.java
+++ b/src/main/java/io/vinyldns/java/model/membership/CreateGroupRequest.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.membership;
diff --git a/src/main/java/io/vinyldns/java/model/membership/DeleteGroupRequest.java b/src/main/java/io/vinyldns/java/model/membership/DeleteGroupRequest.java
index 4e6611a..a3911cf 100644
--- a/src/main/java/io/vinyldns/java/model/membership/DeleteGroupRequest.java
+++ b/src/main/java/io/vinyldns/java/model/membership/DeleteGroupRequest.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.membership;
diff --git a/src/main/java/io/vinyldns/java/model/membership/GetGroupChangeRequest.java b/src/main/java/io/vinyldns/java/model/membership/GetGroupChangeRequest.java
index 6ae5972..b3e23c3 100644
--- a/src/main/java/io/vinyldns/java/model/membership/GetGroupChangeRequest.java
+++ b/src/main/java/io/vinyldns/java/model/membership/GetGroupChangeRequest.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java;
diff --git a/src/main/java/io/vinyldns/java/model/membership/GetGroupRequest.java b/src/main/java/io/vinyldns/java/model/membership/GetGroupRequest.java
index 9b978f7..13391a3 100644
--- a/src/main/java/io/vinyldns/java/model/membership/GetGroupRequest.java
+++ b/src/main/java/io/vinyldns/java/model/membership/GetGroupRequest.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java;
diff --git a/src/main/java/io/vinyldns/java/model/membership/Group.java b/src/main/java/io/vinyldns/java/model/membership/Group.java
index 7c7953d..0da6adc 100644
--- a/src/main/java/io/vinyldns/java/model/membership/Group.java
+++ b/src/main/java/io/vinyldns/java/model/membership/Group.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.membership;
diff --git a/src/main/java/io/vinyldns/java/model/membership/GroupChange.java b/src/main/java/io/vinyldns/java/model/membership/GroupChange.java
index 4b0422a..aecee87 100644
--- a/src/main/java/io/vinyldns/java/model/membership/GroupChange.java
+++ b/src/main/java/io/vinyldns/java/model/membership/GroupChange.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.membership;
diff --git a/src/main/java/io/vinyldns/java/model/membership/GroupChangeType.java b/src/main/java/io/vinyldns/java/model/membership/GroupChangeType.java
index 4ece611..d33888e 100644
--- a/src/main/java/io/vinyldns/java/model/membership/GroupChangeType.java
+++ b/src/main/java/io/vinyldns/java/model/membership/GroupChangeType.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.membership;
diff --git a/src/main/java/io/vinyldns/java/model/membership/GroupStatus.java b/src/main/java/io/vinyldns/java/model/membership/GroupStatus.java
index 1d5bf1d..a6324b1 100644
--- a/src/main/java/io/vinyldns/java/model/membership/GroupStatus.java
+++ b/src/main/java/io/vinyldns/java/model/membership/GroupStatus.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.membership;
diff --git a/src/main/java/io/vinyldns/java/model/membership/ListAdminsResponse.java b/src/main/java/io/vinyldns/java/model/membership/ListAdminsResponse.java
index de1f482..c109724 100644
--- a/src/main/java/io/vinyldns/java/model/membership/ListAdminsResponse.java
+++ b/src/main/java/io/vinyldns/java/model/membership/ListAdminsResponse.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.membership;
diff --git a/src/main/java/io/vinyldns/java/model/membership/ListGroupActivityRequest.java b/src/main/java/io/vinyldns/java/model/membership/ListGroupActivityRequest.java
index 1e438fe..7f6874b 100644
--- a/src/main/java/io/vinyldns/java/model/membership/ListGroupActivityRequest.java
+++ b/src/main/java/io/vinyldns/java/model/membership/ListGroupActivityRequest.java
@@ -1,24 +1,26 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.membership;
 
 public class ListGroupActivityRequest {
   private String groupId;
-  private String startFrom;
+  private Integer startFrom;
   private Integer maxItems;
 
-  public ListGroupActivityRequest(String groupId, String startFrom, Integer maxItems) {
+  public ListGroupActivityRequest(String groupId, Integer startFrom, Integer maxItems) {
     this.groupId = groupId;
     this.startFrom = startFrom;
     this.maxItems = maxItems;
@@ -32,11 +34,11 @@ public void setGroupId(String groupId) {
     this.groupId = groupId;
   }
 
-  public String getStartFrom() {
+  public Integer getStartFrom() {
     return startFrom;
   }
 
-  public void setStartFrom(String startFrom) {
+  public void setStartFrom(Integer startFrom) {
     this.startFrom = startFrom;
   }
 
diff --git a/src/main/java/io/vinyldns/java/model/membership/ListGroupActivityResponse.java b/src/main/java/io/vinyldns/java/model/membership/ListGroupActivityResponse.java
index b765659..d4409b7 100644
--- a/src/main/java/io/vinyldns/java/model/membership/ListGroupActivityResponse.java
+++ b/src/main/java/io/vinyldns/java/model/membership/ListGroupActivityResponse.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.membership;
diff --git a/src/main/java/io/vinyldns/java/model/membership/ListGroupsRequest.java b/src/main/java/io/vinyldns/java/model/membership/ListGroupsRequest.java
index 3e3cfaa..8e8d397 100644
--- a/src/main/java/io/vinyldns/java/model/membership/ListGroupsRequest.java
+++ b/src/main/java/io/vinyldns/java/model/membership/ListGroupsRequest.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.membership;
diff --git a/src/main/java/io/vinyldns/java/model/membership/ListGroupsResponse.java b/src/main/java/io/vinyldns/java/model/membership/ListGroupsResponse.java
index 912aca5..0bf4232 100644
--- a/src/main/java/io/vinyldns/java/model/membership/ListGroupsResponse.java
+++ b/src/main/java/io/vinyldns/java/model/membership/ListGroupsResponse.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.membership;
diff --git a/src/main/java/io/vinyldns/java/model/membership/ListMembersRequest.java b/src/main/java/io/vinyldns/java/model/membership/ListMembersRequest.java
index b3c442c..689a445 100644
--- a/src/main/java/io/vinyldns/java/model/membership/ListMembersRequest.java
+++ b/src/main/java/io/vinyldns/java/model/membership/ListMembersRequest.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.membership;
diff --git a/src/main/java/io/vinyldns/java/model/membership/ListMembersResponse.java b/src/main/java/io/vinyldns/java/model/membership/ListMembersResponse.java
index 71fd445..c96de00 100644
--- a/src/main/java/io/vinyldns/java/model/membership/ListMembersResponse.java
+++ b/src/main/java/io/vinyldns/java/model/membership/ListMembersResponse.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.membership;
diff --git a/src/main/java/io/vinyldns/java/model/membership/LockStatus.java b/src/main/java/io/vinyldns/java/model/membership/LockStatus.java
index ded0410..a75d910 100644
--- a/src/main/java/io/vinyldns/java/model/membership/LockStatus.java
+++ b/src/main/java/io/vinyldns/java/model/membership/LockStatus.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.membership;
diff --git a/src/main/java/io/vinyldns/java/model/membership/MemberId.java b/src/main/java/io/vinyldns/java/model/membership/MemberId.java
index 108586b..b5c4b64 100644
--- a/src/main/java/io/vinyldns/java/model/membership/MemberId.java
+++ b/src/main/java/io/vinyldns/java/model/membership/MemberId.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.membership;
diff --git a/src/main/java/io/vinyldns/java/model/membership/UpdateGroupRequest.java b/src/main/java/io/vinyldns/java/model/membership/UpdateGroupRequest.java
index 7fe7381..ffb5259 100644
--- a/src/main/java/io/vinyldns/java/model/membership/UpdateGroupRequest.java
+++ b/src/main/java/io/vinyldns/java/model/membership/UpdateGroupRequest.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.membership;
diff --git a/src/main/java/io/vinyldns/java/model/membership/UserInfo.java b/src/main/java/io/vinyldns/java/model/membership/UserInfo.java
index 59833d1..ba865dd 100644
--- a/src/main/java/io/vinyldns/java/model/membership/UserInfo.java
+++ b/src/main/java/io/vinyldns/java/model/membership/UserInfo.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.membership;
diff --git a/src/main/java/io/vinyldns/java/model/record/RecordType.java b/src/main/java/io/vinyldns/java/model/record/RecordType.java
index fd981d0..b106e90 100644
--- a/src/main/java/io/vinyldns/java/model/record/RecordType.java
+++ b/src/main/java/io/vinyldns/java/model/record/RecordType.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.record;
diff --git a/src/main/java/io/vinyldns/java/model/record/data/AAAAData.java b/src/main/java/io/vinyldns/java/model/record/data/AAAAData.java
index 6fa0bc0..0e9cda8 100644
--- a/src/main/java/io/vinyldns/java/model/record/data/AAAAData.java
+++ b/src/main/java/io/vinyldns/java/model/record/data/AAAAData.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.record.data;
diff --git a/src/main/java/io/vinyldns/java/model/record/data/AData.java b/src/main/java/io/vinyldns/java/model/record/data/AData.java
index 894ca24..a42cadc 100644
--- a/src/main/java/io/vinyldns/java/model/record/data/AData.java
+++ b/src/main/java/io/vinyldns/java/model/record/data/AData.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.record.data;
diff --git a/src/main/java/io/vinyldns/java/model/record/data/CNAMEData.java b/src/main/java/io/vinyldns/java/model/record/data/CNAMEData.java
index 637b2fc..fc04688 100644
--- a/src/main/java/io/vinyldns/java/model/record/data/CNAMEData.java
+++ b/src/main/java/io/vinyldns/java/model/record/data/CNAMEData.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.record.data;
diff --git a/src/main/java/io/vinyldns/java/model/record/data/MXData.java b/src/main/java/io/vinyldns/java/model/record/data/MXData.java
index 3184fd7..9e82da5 100644
--- a/src/main/java/io/vinyldns/java/model/record/data/MXData.java
+++ b/src/main/java/io/vinyldns/java/model/record/data/MXData.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.record.data;
diff --git a/src/main/java/io/vinyldns/java/model/record/data/NSData.java b/src/main/java/io/vinyldns/java/model/record/data/NSData.java
index 2d8b1d5..96300ea 100644
--- a/src/main/java/io/vinyldns/java/model/record/data/NSData.java
+++ b/src/main/java/io/vinyldns/java/model/record/data/NSData.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.record.data;
diff --git a/src/main/java/io/vinyldns/java/model/record/data/PTRData.java b/src/main/java/io/vinyldns/java/model/record/data/PTRData.java
index d8c6e04..8c17dea 100644
--- a/src/main/java/io/vinyldns/java/model/record/data/PTRData.java
+++ b/src/main/java/io/vinyldns/java/model/record/data/PTRData.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.record.data;
diff --git a/src/main/java/io/vinyldns/java/model/record/data/RecordData.java b/src/main/java/io/vinyldns/java/model/record/data/RecordData.java
index 1df6794..395f6ba 100644
--- a/src/main/java/io/vinyldns/java/model/record/data/RecordData.java
+++ b/src/main/java/io/vinyldns/java/model/record/data/RecordData.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.record.data;
diff --git a/src/main/java/io/vinyldns/java/model/record/data/SOAData.java b/src/main/java/io/vinyldns/java/model/record/data/SOAData.java
index 9032740..2191004 100644
--- a/src/main/java/io/vinyldns/java/model/record/data/SOAData.java
+++ b/src/main/java/io/vinyldns/java/model/record/data/SOAData.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.record.data;
diff --git a/src/main/java/io/vinyldns/java/model/record/data/SPFData.java b/src/main/java/io/vinyldns/java/model/record/data/SPFData.java
index 2942bb8..fb49f6e 100644
--- a/src/main/java/io/vinyldns/java/model/record/data/SPFData.java
+++ b/src/main/java/io/vinyldns/java/model/record/data/SPFData.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.record.data;
diff --git a/src/main/java/io/vinyldns/java/model/record/data/SRVData.java b/src/main/java/io/vinyldns/java/model/record/data/SRVData.java
index 573325b..b0119dd 100644
--- a/src/main/java/io/vinyldns/java/model/record/data/SRVData.java
+++ b/src/main/java/io/vinyldns/java/model/record/data/SRVData.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.record.data;
diff --git a/src/main/java/io/vinyldns/java/model/record/data/SSHFPData.java b/src/main/java/io/vinyldns/java/model/record/data/SSHFPData.java
index 8c3b945..176a146 100644
--- a/src/main/java/io/vinyldns/java/model/record/data/SSHFPData.java
+++ b/src/main/java/io/vinyldns/java/model/record/data/SSHFPData.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.record.data;
diff --git a/src/main/java/io/vinyldns/java/model/record/data/TXTData.java b/src/main/java/io/vinyldns/java/model/record/data/TXTData.java
index 16decbf..f8c9c19 100644
--- a/src/main/java/io/vinyldns/java/model/record/data/TXTData.java
+++ b/src/main/java/io/vinyldns/java/model/record/data/TXTData.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.record.data;
diff --git a/src/main/java/io/vinyldns/java/model/record/data/UNKNOWNData.java b/src/main/java/io/vinyldns/java/model/record/data/UNKNOWNData.java
index cd7bf9c..71b3b69 100644
--- a/src/main/java/io/vinyldns/java/model/record/data/UNKNOWNData.java
+++ b/src/main/java/io/vinyldns/java/model/record/data/UNKNOWNData.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.record.data;
diff --git a/src/main/java/io/vinyldns/java/model/record/set/CreateRecordSetRequest.java b/src/main/java/io/vinyldns/java/model/record/set/CreateRecordSetRequest.java
index 1fd3c7b..3445f53 100644
--- a/src/main/java/io/vinyldns/java/model/record/set/CreateRecordSetRequest.java
+++ b/src/main/java/io/vinyldns/java/model/record/set/CreateRecordSetRequest.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.record.set;
diff --git a/src/main/java/io/vinyldns/java/model/record/set/DeleteRecordSetRequest.java b/src/main/java/io/vinyldns/java/model/record/set/DeleteRecordSetRequest.java
index c7aa388..503eecb 100644
--- a/src/main/java/io/vinyldns/java/model/record/set/DeleteRecordSetRequest.java
+++ b/src/main/java/io/vinyldns/java/model/record/set/DeleteRecordSetRequest.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.record.set;
diff --git a/src/main/java/io/vinyldns/java/model/record/set/GetRecordSetChangeRequest.java b/src/main/java/io/vinyldns/java/model/record/set/GetRecordSetChangeRequest.java
index 77256fd..dc09048 100644
--- a/src/main/java/io/vinyldns/java/model/record/set/GetRecordSetChangeRequest.java
+++ b/src/main/java/io/vinyldns/java/model/record/set/GetRecordSetChangeRequest.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.record.set;
diff --git a/src/main/java/io/vinyldns/java/model/record/set/ListRecordSetChangesRequest.java b/src/main/java/io/vinyldns/java/model/record/set/ListRecordSetChangesRequest.java
index 3240347..886c0cc 100644
--- a/src/main/java/io/vinyldns/java/model/record/set/ListRecordSetChangesRequest.java
+++ b/src/main/java/io/vinyldns/java/model/record/set/ListRecordSetChangesRequest.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.record.set;
diff --git a/src/main/java/io/vinyldns/java/model/record/set/ListRecordSetChangesResponse.java b/src/main/java/io/vinyldns/java/model/record/set/ListRecordSetChangesResponse.java
index f94e6c7..f138bf9 100644
--- a/src/main/java/io/vinyldns/java/model/record/set/ListRecordSetChangesResponse.java
+++ b/src/main/java/io/vinyldns/java/model/record/set/ListRecordSetChangesResponse.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.record.set;
diff --git a/src/main/java/io/vinyldns/java/model/record/set/ListRecordSetsRequest.java b/src/main/java/io/vinyldns/java/model/record/set/ListRecordSetsRequest.java
index dfa1372..63644be 100644
--- a/src/main/java/io/vinyldns/java/model/record/set/ListRecordSetsRequest.java
+++ b/src/main/java/io/vinyldns/java/model/record/set/ListRecordSetsRequest.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.record.set;
diff --git a/src/main/java/io/vinyldns/java/model/record/set/ListRecordSetsResponse.java b/src/main/java/io/vinyldns/java/model/record/set/ListRecordSetsResponse.java
index b1349d9..dde8a00 100644
--- a/src/main/java/io/vinyldns/java/model/record/set/ListRecordSetsResponse.java
+++ b/src/main/java/io/vinyldns/java/model/record/set/ListRecordSetsResponse.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.record.set;
diff --git a/src/main/java/io/vinyldns/java/model/record/set/RecordSet.java b/src/main/java/io/vinyldns/java/model/record/set/RecordSet.java
index be052a3..3d0591f 100644
--- a/src/main/java/io/vinyldns/java/model/record/set/RecordSet.java
+++ b/src/main/java/io/vinyldns/java/model/record/set/RecordSet.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.record.set;
diff --git a/src/main/java/io/vinyldns/java/model/record/set/RecordSetBase.java b/src/main/java/io/vinyldns/java/model/record/set/RecordSetBase.java
index 1b79189..f53c829 100644
--- a/src/main/java/io/vinyldns/java/model/record/set/RecordSetBase.java
+++ b/src/main/java/io/vinyldns/java/model/record/set/RecordSetBase.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.record.set;
diff --git a/src/main/java/io/vinyldns/java/model/record/set/RecordSetChange.java b/src/main/java/io/vinyldns/java/model/record/set/RecordSetChange.java
index acf6bca..71a1167 100644
--- a/src/main/java/io/vinyldns/java/model/record/set/RecordSetChange.java
+++ b/src/main/java/io/vinyldns/java/model/record/set/RecordSetChange.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.record.set;
diff --git a/src/main/java/io/vinyldns/java/model/record/set/RecordSetChangeStatus.java b/src/main/java/io/vinyldns/java/model/record/set/RecordSetChangeStatus.java
index a8a65ae..df400b1 100644
--- a/src/main/java/io/vinyldns/java/model/record/set/RecordSetChangeStatus.java
+++ b/src/main/java/io/vinyldns/java/model/record/set/RecordSetChangeStatus.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.record.set;
diff --git a/src/main/java/io/vinyldns/java/model/record/set/RecordSetChangeType.java b/src/main/java/io/vinyldns/java/model/record/set/RecordSetChangeType.java
index 45f8df7..ddf79de 100644
--- a/src/main/java/io/vinyldns/java/model/record/set/RecordSetChangeType.java
+++ b/src/main/java/io/vinyldns/java/model/record/set/RecordSetChangeType.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.record.set;
diff --git a/src/main/java/io/vinyldns/java/model/record/set/RecordSetStatus.java b/src/main/java/io/vinyldns/java/model/record/set/RecordSetStatus.java
index 8b16f04..3549bdc 100644
--- a/src/main/java/io/vinyldns/java/model/record/set/RecordSetStatus.java
+++ b/src/main/java/io/vinyldns/java/model/record/set/RecordSetStatus.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.record.set;
diff --git a/src/main/java/io/vinyldns/java/model/record/set/SearchRecordSetsRequest.java b/src/main/java/io/vinyldns/java/model/record/set/SearchRecordSetsRequest.java
index d3b6d9e..34b0ee2 100644
--- a/src/main/java/io/vinyldns/java/model/record/set/SearchRecordSetsRequest.java
+++ b/src/main/java/io/vinyldns/java/model/record/set/SearchRecordSetsRequest.java
@@ -18,100 +18,99 @@
 import io.vinyldns.java.model.Order;
 import java.util.Objects;
 
-public class SearchRecordSetsRequest
-{
-    private final String recordNameFilter;
-    private String recordOwnerGroupFilter;
-    private Order nameSort;
-    private String startFrom;
-    private Integer maxItems;
-
-    public SearchRecordSetsRequest(final String recordNameFilter) {
-        this.recordNameFilter = recordNameFilter;
-    }
-
-    public SearchRecordSetsRequest(
-            String recordNameFilter,
-            String recordOwnerGroupFilter,
-            Order nameSort,
-            String startFrom,
-            Integer maxItems) {
-        this.recordNameFilter = recordNameFilter;
-        this.recordOwnerGroupFilter = recordOwnerGroupFilter;
-        this.nameSort = nameSort;
-        this.startFrom = startFrom;
-        this.maxItems = maxItems;
-    }
-
-    @Override
-    public String toString() {
-        return "ListRecordSetGlobalRequest{"
-                + "recordNameFilter='"
-                + recordNameFilter
-                + '\''
-                + ", recordOwnerGroupFilter='"
-                + recordOwnerGroupFilter
-                + '\''
-                + ", nameSort="
-                + nameSort
-                + ", startFrom='"
-                + startFrom
-                + '\''
-                + ", maxItems="
-                + maxItems
-                + '}';
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        SearchRecordSetsRequest that = (SearchRecordSetsRequest) o;
-        return recordNameFilter.equals(that.recordNameFilter)
-                && recordOwnerGroupFilter.equals(that.recordOwnerGroupFilter)
-                && nameSort == that.nameSort
-                && startFrom.equals(that.startFrom)
-                && maxItems.equals(that.maxItems);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(recordNameFilter, recordOwnerGroupFilter, nameSort, startFrom, maxItems);
-    }
-
-    public String getRecordNameFilter() {
-        return recordNameFilter;
-    }
-
-    public String getRecordOwnerGroupFilter() {
-        return recordOwnerGroupFilter;
-    }
-
-    public void setRecordOwnerGroupFilter(String recordOwnerGroupFilter) {
-        this.recordOwnerGroupFilter = recordOwnerGroupFilter;
-    }
-
-    public Order getNameSort() {
-        return nameSort;
-    }
-
-    public void setNameSort(Order nameSort) {
-        this.nameSort = nameSort;
-    }
-
-    public String getStartFrom() {
-        return startFrom;
-    }
-
-    public void setStartFrom(String startFrom) {
-        this.startFrom = startFrom;
-    }
-
-    public Integer getMaxItems() {
-        return maxItems;
-    }
-
-    public void setMaxItems(Integer maxItems) {
-        this.maxItems = maxItems;
-    }
+public class SearchRecordSetsRequest {
+  private final String recordNameFilter;
+  private String recordOwnerGroupFilter;
+  private Order nameSort;
+  private String startFrom;
+  private Integer maxItems;
+
+  public SearchRecordSetsRequest(final String recordNameFilter) {
+    this.recordNameFilter = recordNameFilter;
+  }
+
+  public SearchRecordSetsRequest(
+      String recordNameFilter,
+      String recordOwnerGroupFilter,
+      Order nameSort,
+      String startFrom,
+      Integer maxItems) {
+    this.recordNameFilter = recordNameFilter;
+    this.recordOwnerGroupFilter = recordOwnerGroupFilter;
+    this.nameSort = nameSort;
+    this.startFrom = startFrom;
+    this.maxItems = maxItems;
+  }
+
+  @Override
+  public String toString() {
+    return "ListRecordSetGlobalRequest{"
+        + "recordNameFilter='"
+        + recordNameFilter
+        + '\''
+        + ", recordOwnerGroupFilter='"
+        + recordOwnerGroupFilter
+        + '\''
+        + ", nameSort="
+        + nameSort
+        + ", startFrom='"
+        + startFrom
+        + '\''
+        + ", maxItems="
+        + maxItems
+        + '}';
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    SearchRecordSetsRequest that = (SearchRecordSetsRequest) o;
+    return recordNameFilter.equals(that.recordNameFilter)
+        && recordOwnerGroupFilter.equals(that.recordOwnerGroupFilter)
+        && nameSort == that.nameSort
+        && startFrom.equals(that.startFrom)
+        && maxItems.equals(that.maxItems);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(recordNameFilter, recordOwnerGroupFilter, nameSort, startFrom, maxItems);
+  }
+
+  public String getRecordNameFilter() {
+    return recordNameFilter;
+  }
+
+  public String getRecordOwnerGroupFilter() {
+    return recordOwnerGroupFilter;
+  }
+
+  public void setRecordOwnerGroupFilter(String recordOwnerGroupFilter) {
+    this.recordOwnerGroupFilter = recordOwnerGroupFilter;
+  }
+
+  public Order getNameSort() {
+    return nameSort;
+  }
+
+  public void setNameSort(Order nameSort) {
+    this.nameSort = nameSort;
+  }
+
+  public String getStartFrom() {
+    return startFrom;
+  }
+
+  public void setStartFrom(String startFrom) {
+    this.startFrom = startFrom;
+  }
+
+  public Integer getMaxItems() {
+    return maxItems;
+  }
+
+  public void setMaxItems(Integer maxItems) {
+    this.maxItems = maxItems;
+  }
 }
diff --git a/src/main/java/io/vinyldns/java/model/record/set/SearchRecordSetsResponse.java b/src/main/java/io/vinyldns/java/model/record/set/SearchRecordSetsResponse.java
index 743abd5..4721072 100644
--- a/src/main/java/io/vinyldns/java/model/record/set/SearchRecordSetsResponse.java
+++ b/src/main/java/io/vinyldns/java/model/record/set/SearchRecordSetsResponse.java
@@ -18,98 +18,97 @@
 import io.vinyldns.java.model.record.RecordType;
 import java.util.Collection;
 
-public class SearchRecordSetsResponse
-{
-
-    private Collection<RecordSet> recordSets;
-    private String startFrom;
-    private String nextId;
-    private Integer maxItems;
-    private String recordNameFilter;
-    private Collection<RecordType> recordTypeFilter;
-    private String recordOwnerGroupFilter;
-    private String nameSort;
-
-    public SearchRecordSetsResponse(
-            Collection<RecordSet> recordSets,
-            String startFrom,
-            String nextId,
-            Integer maxItems,
-            String recordNameFilter,
-            Collection<RecordType> recordTypeFilter,
-            String recordOwnerGroupFilter,
-            String nameSort) {
-        this.recordSets = recordSets;
-        this.startFrom = startFrom;
-        this.nextId = nextId;
-        this.maxItems = maxItems;
-        this.recordNameFilter = recordNameFilter;
-        this.recordTypeFilter = recordTypeFilter;
-        this.recordOwnerGroupFilter = recordOwnerGroupFilter;
-        this.nameSort = nameSort;
-    }
-
-    public Collection<RecordSet> getRecordSets() {
-        return recordSets;
-    }
-
-    public void setRecordSets(Collection<RecordSet> recordSets) {
-        this.recordSets = recordSets;
-    }
-
-    public String getStartFrom() {
-        return startFrom;
-    }
-
-    public void setStartFrom(String startFrom) {
-        this.startFrom = startFrom;
-    }
-
-    public String getNextId() {
-        return nextId;
-    }
-
-    public void setNextId(String nextId) {
-        this.nextId = nextId;
-    }
-
-    public Integer getMaxItems() {
-        return maxItems;
-    }
-
-    public void setMaxItems(Integer maxItems) {
-        this.maxItems = maxItems;
-    }
-
-    public String getRecordNameFilter() {
-        return recordNameFilter;
-    }
-
-    public void setRecordNameFilter(String recordNameFilter) {
-        this.recordNameFilter = recordNameFilter;
-    }
-
-    public Collection<RecordType> getRecordTypeFilter() {
-        return recordTypeFilter;
-    }
-
-    public void setRecordTypeFilter(Collection<RecordType> recordTypeFilter) {
-        this.recordTypeFilter = recordTypeFilter;
-    }
-
-    public String getRecordOwnerGroupFilter() {
-        return recordOwnerGroupFilter;
-    }
-
-    public void setRecordOwnerGroupFilter(String recordOwnerGroupFilter) {
-        this.recordOwnerGroupFilter = recordOwnerGroupFilter;
-    }
-
-    public String getNameSort() {
-        return nameSort;
-    }
-
-    public void setNameSort(String nameSort) {
-        this.nameSort = nameSort;
-    }
+public class SearchRecordSetsResponse {
+
+  private Collection<RecordSet> recordSets;
+  private String startFrom;
+  private String nextId;
+  private Integer maxItems;
+  private String recordNameFilter;
+  private Collection<RecordType> recordTypeFilter;
+  private String recordOwnerGroupFilter;
+  private String nameSort;
+
+  public SearchRecordSetsResponse(
+      Collection<RecordSet> recordSets,
+      String startFrom,
+      String nextId,
+      Integer maxItems,
+      String recordNameFilter,
+      Collection<RecordType> recordTypeFilter,
+      String recordOwnerGroupFilter,
+      String nameSort) {
+    this.recordSets = recordSets;
+    this.startFrom = startFrom;
+    this.nextId = nextId;
+    this.maxItems = maxItems;
+    this.recordNameFilter = recordNameFilter;
+    this.recordTypeFilter = recordTypeFilter;
+    this.recordOwnerGroupFilter = recordOwnerGroupFilter;
+    this.nameSort = nameSort;
+  }
+
+  public Collection<RecordSet> getRecordSets() {
+    return recordSets;
+  }
+
+  public void setRecordSets(Collection<RecordSet> recordSets) {
+    this.recordSets = recordSets;
+  }
+
+  public String getStartFrom() {
+    return startFrom;
+  }
+
+  public void setStartFrom(String startFrom) {
+    this.startFrom = startFrom;
+  }
+
+  public String getNextId() {
+    return nextId;
+  }
+
+  public void setNextId(String nextId) {
+    this.nextId = nextId;
+  }
+
+  public Integer getMaxItems() {
+    return maxItems;
+  }
+
+  public void setMaxItems(Integer maxItems) {
+    this.maxItems = maxItems;
+  }
+
+  public String getRecordNameFilter() {
+    return recordNameFilter;
+  }
+
+  public void setRecordNameFilter(String recordNameFilter) {
+    this.recordNameFilter = recordNameFilter;
+  }
+
+  public Collection<RecordType> getRecordTypeFilter() {
+    return recordTypeFilter;
+  }
+
+  public void setRecordTypeFilter(Collection<RecordType> recordTypeFilter) {
+    this.recordTypeFilter = recordTypeFilter;
+  }
+
+  public String getRecordOwnerGroupFilter() {
+    return recordOwnerGroupFilter;
+  }
+
+  public void setRecordOwnerGroupFilter(String recordOwnerGroupFilter) {
+    this.recordOwnerGroupFilter = recordOwnerGroupFilter;
+  }
+
+  public String getNameSort() {
+    return nameSort;
+  }
+
+  public void setNameSort(String nameSort) {
+    this.nameSort = nameSort;
+  }
 }
diff --git a/src/main/java/io/vinyldns/java/model/record/set/UpdateRecordSetRequest.java b/src/main/java/io/vinyldns/java/model/record/set/UpdateRecordSetRequest.java
index 5903202..c004d3f 100644
--- a/src/main/java/io/vinyldns/java/model/record/set/UpdateRecordSetRequest.java
+++ b/src/main/java/io/vinyldns/java/model/record/set/UpdateRecordSetRequest.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.record.set;
diff --git a/src/main/java/io/vinyldns/java/model/zone/GetRecordSetResponse.java b/src/main/java/io/vinyldns/java/model/zone/GetRecordSetResponse.java
index 7d8983a..bf8b6d0 100644
--- a/src/main/java/io/vinyldns/java/model/zone/GetRecordSetResponse.java
+++ b/src/main/java/io/vinyldns/java/model/zone/GetRecordSetResponse.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.zone;
diff --git a/src/main/java/io/vinyldns/java/model/zone/GetZoneResponse.java b/src/main/java/io/vinyldns/java/model/zone/GetZoneResponse.java
index 557aefc..83b919b 100644
--- a/src/main/java/io/vinyldns/java/model/zone/GetZoneResponse.java
+++ b/src/main/java/io/vinyldns/java/model/zone/GetZoneResponse.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.zone;
diff --git a/src/main/java/io/vinyldns/java/model/zone/ListZoneChangesRequest.java b/src/main/java/io/vinyldns/java/model/zone/ListZoneChangesRequest.java
index 8e2db52..11a05f6 100644
--- a/src/main/java/io/vinyldns/java/model/zone/ListZoneChangesRequest.java
+++ b/src/main/java/io/vinyldns/java/model/zone/ListZoneChangesRequest.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 /**
diff --git a/src/main/java/io/vinyldns/java/model/zone/ListZoneChangesResponse.java b/src/main/java/io/vinyldns/java/model/zone/ListZoneChangesResponse.java
index 0ea21aa..fcbb1b5 100644
--- a/src/main/java/io/vinyldns/java/model/zone/ListZoneChangesResponse.java
+++ b/src/main/java/io/vinyldns/java/model/zone/ListZoneChangesResponse.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.zone;
diff --git a/src/main/java/io/vinyldns/java/model/zone/ListZonesRequest.java b/src/main/java/io/vinyldns/java/model/zone/ListZonesRequest.java
index 0e444ac..c91b83e 100644
--- a/src/main/java/io/vinyldns/java/model/zone/ListZonesRequest.java
+++ b/src/main/java/io/vinyldns/java/model/zone/ListZonesRequest.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.zone;
diff --git a/src/main/java/io/vinyldns/java/model/zone/ListZonesResponse.java b/src/main/java/io/vinyldns/java/model/zone/ListZonesResponse.java
index e0b79f1..b4d8917 100644
--- a/src/main/java/io/vinyldns/java/model/zone/ListZonesResponse.java
+++ b/src/main/java/io/vinyldns/java/model/zone/ListZonesResponse.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.zone;
diff --git a/src/main/java/io/vinyldns/java/model/zone/Zone.java b/src/main/java/io/vinyldns/java/model/zone/Zone.java
index 8bbf4ba..da34750 100644
--- a/src/main/java/io/vinyldns/java/model/zone/Zone.java
+++ b/src/main/java/io/vinyldns/java/model/zone/Zone.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.zone;
diff --git a/src/main/java/io/vinyldns/java/model/zone/ZoneACL.java b/src/main/java/io/vinyldns/java/model/zone/ZoneACL.java
index 2b4b40e..c2ae447 100644
--- a/src/main/java/io/vinyldns/java/model/zone/ZoneACL.java
+++ b/src/main/java/io/vinyldns/java/model/zone/ZoneACL.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.zone;
diff --git a/src/main/java/io/vinyldns/java/model/zone/ZoneChangeStatus.java b/src/main/java/io/vinyldns/java/model/zone/ZoneChangeStatus.java
index 1f897ce..d3c39ac 100644
--- a/src/main/java/io/vinyldns/java/model/zone/ZoneChangeStatus.java
+++ b/src/main/java/io/vinyldns/java/model/zone/ZoneChangeStatus.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.zone;
diff --git a/src/main/java/io/vinyldns/java/model/zone/ZoneChangeType.java b/src/main/java/io/vinyldns/java/model/zone/ZoneChangeType.java
index d0d623e..5a55bb2 100644
--- a/src/main/java/io/vinyldns/java/model/zone/ZoneChangeType.java
+++ b/src/main/java/io/vinyldns/java/model/zone/ZoneChangeType.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.zone;
diff --git a/src/main/java/io/vinyldns/java/model/zone/ZoneConnection.java b/src/main/java/io/vinyldns/java/model/zone/ZoneConnection.java
index dd745b8..7965747 100644
--- a/src/main/java/io/vinyldns/java/model/zone/ZoneConnection.java
+++ b/src/main/java/io/vinyldns/java/model/zone/ZoneConnection.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.zone;
diff --git a/src/main/java/io/vinyldns/java/model/zone/ZoneRequest.java b/src/main/java/io/vinyldns/java/model/zone/ZoneRequest.java
index 65c60e2..1d993dd 100644
--- a/src/main/java/io/vinyldns/java/model/zone/ZoneRequest.java
+++ b/src/main/java/io/vinyldns/java/model/zone/ZoneRequest.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.zone;
diff --git a/src/main/java/io/vinyldns/java/model/zone/ZoneResponse.java b/src/main/java/io/vinyldns/java/model/zone/ZoneResponse.java
index ff606f1..2b2d2ef 100644
--- a/src/main/java/io/vinyldns/java/model/zone/ZoneResponse.java
+++ b/src/main/java/io/vinyldns/java/model/zone/ZoneResponse.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.zone;
diff --git a/src/main/java/io/vinyldns/java/model/zone/ZoneStatus.java b/src/main/java/io/vinyldns/java/model/zone/ZoneStatus.java
index 0401e5a..b919370 100644
--- a/src/main/java/io/vinyldns/java/model/zone/ZoneStatus.java
+++ b/src/main/java/io/vinyldns/java/model/zone/ZoneStatus.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.model.zone;
diff --git a/src/main/java/io/vinyldns/java/responses/ResponseMarker.java b/src/main/java/io/vinyldns/java/responses/ResponseMarker.java
index 9eb0e3c..5e1f90c 100644
--- a/src/main/java/io/vinyldns/java/responses/ResponseMarker.java
+++ b/src/main/java/io/vinyldns/java/responses/ResponseMarker.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.responses;
diff --git a/src/main/java/io/vinyldns/java/responses/VinylDNSFailureResponse.java b/src/main/java/io/vinyldns/java/responses/VinylDNSFailureResponse.java
index baf8cb1..5e2a403 100644
--- a/src/main/java/io/vinyldns/java/responses/VinylDNSFailureResponse.java
+++ b/src/main/java/io/vinyldns/java/responses/VinylDNSFailureResponse.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.responses;
diff --git a/src/main/java/io/vinyldns/java/responses/VinylDNSResponse.java b/src/main/java/io/vinyldns/java/responses/VinylDNSResponse.java
index 244aa19..5b24700 100644
--- a/src/main/java/io/vinyldns/java/responses/VinylDNSResponse.java
+++ b/src/main/java/io/vinyldns/java/responses/VinylDNSResponse.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.responses;
diff --git a/src/main/java/io/vinyldns/java/responses/VinylDNSSuccessResponse.java b/src/main/java/io/vinyldns/java/responses/VinylDNSSuccessResponse.java
index edb2e39..d35ee97 100644
--- a/src/main/java/io/vinyldns/java/responses/VinylDNSSuccessResponse.java
+++ b/src/main/java/io/vinyldns/java/responses/VinylDNSSuccessResponse.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.responses;
diff --git a/src/main/java/io/vinyldns/java/serializers/ChangeInputDeserializer.java b/src/main/java/io/vinyldns/java/serializers/ChangeInputDeserializer.java
index 47564f2..f1a516e 100644
--- a/src/main/java/io/vinyldns/java/serializers/ChangeInputDeserializer.java
+++ b/src/main/java/io/vinyldns/java/serializers/ChangeInputDeserializer.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.serializers;
diff --git a/src/main/java/io/vinyldns/java/serializers/DateTimeSerializer.java b/src/main/java/io/vinyldns/java/serializers/DateTimeSerializer.java
index 6f5c322..feb08bd 100644
--- a/src/main/java/io/vinyldns/java/serializers/DateTimeSerializer.java
+++ b/src/main/java/io/vinyldns/java/serializers/DateTimeSerializer.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.serializers;
diff --git a/src/main/java/io/vinyldns/java/serializers/InstantSerializer.java b/src/main/java/io/vinyldns/java/serializers/InstantSerializer.java
index 2e924d7..316f875 100644
--- a/src/main/java/io/vinyldns/java/serializers/InstantSerializer.java
+++ b/src/main/java/io/vinyldns/java/serializers/InstantSerializer.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.serializers;
diff --git a/src/main/java/io/vinyldns/java/serializers/RecordDataDeserializer.java b/src/main/java/io/vinyldns/java/serializers/RecordDataDeserializer.java
index 86b2cf6..a855985 100644
--- a/src/main/java/io/vinyldns/java/serializers/RecordDataDeserializer.java
+++ b/src/main/java/io/vinyldns/java/serializers/RecordDataDeserializer.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.serializers;
diff --git a/src/main/java/io/vinyldns/java/serializers/RecordSetTypeAdapterFactory.java b/src/main/java/io/vinyldns/java/serializers/RecordSetTypeAdapterFactory.java
index 0dbe5ab..a4e249c 100644
--- a/src/main/java/io/vinyldns/java/serializers/RecordSetTypeAdapterFactory.java
+++ b/src/main/java/io/vinyldns/java/serializers/RecordSetTypeAdapterFactory.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.serializers;
diff --git a/src/main/java/io/vinyldns/java/serializers/SerializationFactory.java b/src/main/java/io/vinyldns/java/serializers/SerializationFactory.java
index 7092271..2a96023 100644
--- a/src/main/java/io/vinyldns/java/serializers/SerializationFactory.java
+++ b/src/main/java/io/vinyldns/java/serializers/SerializationFactory.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.serializers;
diff --git a/src/main/java/io/vinyldns/java/serializers/SingleChangeAdapterFactory.java b/src/main/java/io/vinyldns/java/serializers/SingleChangeAdapterFactory.java
index 388fbd7..f838c8b 100644
--- a/src/main/java/io/vinyldns/java/serializers/SingleChangeAdapterFactory.java
+++ b/src/main/java/io/vinyldns/java/serializers/SingleChangeAdapterFactory.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.serializers;
@@ -23,39 +25,38 @@
 import com.google.gson.stream.JsonWriter;
 import io.vinyldns.java.model.batch.AddSingleChange;
 import io.vinyldns.java.model.batch.DeleteRecordSetSingleChange;
-
 import java.io.IOException;
 
 public class SingleChangeAdapterFactory implements TypeAdapterFactory {
 
-    public <T> TypeAdapter<T> create(final Gson gson, TypeToken<T> type) {
-        if (!type.getType().equals(AddSingleChange.class) &&
-            !type.getType().equals(DeleteRecordSetSingleChange.class)) {
-            return null;
-        }
+  public <T> TypeAdapter<T> create(final Gson gson, TypeToken<T> type) {
+    if (!type.getType().equals(AddSingleChange.class)
+        && !type.getType().equals(DeleteRecordSetSingleChange.class)) {
+      return null;
+    }
 
-        final TypeAdapter<T> delegate = gson.getDelegateAdapter(this, type);
-        return new TypeAdapter<T>() {
-            public void write(JsonWriter out, T value) throws IOException {
-                delegate.write(out, value);
-            }
+    final TypeAdapter<T> delegate = gson.getDelegateAdapter(this, type);
+    return new TypeAdapter<T>() {
+      public void write(JsonWriter out, T value) throws IOException {
+        delegate.write(out, value);
+      }
 
-            public T read(JsonReader in) throws IOException {
-                JsonElement tree = gson.fromJson(in, JsonElement.class);
-                JsonObject jsonObject = tree.getAsJsonObject();
+      public T read(JsonReader in) throws IOException {
+        JsonElement tree = gson.fromJson(in, JsonElement.class);
+        JsonObject jsonObject = tree.getAsJsonObject();
 
-                JsonElement record = jsonObject.get("record");
+        JsonElement record = jsonObject.get("record");
 
-                if (record == null || record.isJsonNull()) {
-                    return delegate.fromJsonTree(jsonObject);
-                }
+        if (record == null || record.isJsonNull()) {
+          return delegate.fromJsonTree(jsonObject);
+        }
 
-                JsonElement type = jsonObject.get("type");
+        JsonElement type = jsonObject.get("type");
 
-                record.getAsJsonObject().add("type", type);
+        record.getAsJsonObject().add("type", type);
 
-                return delegate.fromJsonTree(jsonObject);
-            }
-        };
-    }
+        return delegate.fromJsonTree(jsonObject);
+      }
+    };
+  }
 }
diff --git a/src/test/java/io/vinyldns/java/VinylDNSClientTest.java b/src/test/java/io/vinyldns/java/VinylDNSClientTest.java
index cbd8016..8bdf03b 100644
--- a/src/test/java/io/vinyldns/java/VinylDNSClientTest.java
+++ b/src/test/java/io/vinyldns/java/VinylDNSClientTest.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java;
@@ -21,7 +23,6 @@
 import com.amazonaws.auth.BasicAWSCredentials;
 import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.matching.EqualToJsonPattern;
-
 import io.vinyldns.java.model.Order;
 import io.vinyldns.java.model.acl.ACLRule;
 import io.vinyldns.java.model.acl.AccessLevel;
@@ -1090,12 +1091,12 @@ public void listMembersFailure() {
   public void listGroupActivitySuccessWithParams() {
     String response = client.gson.toJson(listGroupActivityResponse);
 
-    String startFrom = listGroupActivityResponse.getStartFrom();
+    int startFrom = listGroupActivityResponse.getStartFrom();
     int maxItems = listGroupActivityResponse.getMaxItems();
 
     wireMockServer.stubFor(
         get(urlMatching("/groups/" + groupId + "/activity?(.*)"))
-            .withQueryParam("startFrom", equalTo(startFrom))
+            .withQueryParam("startFrom", equalTo(String.valueOf(startFrom)))
             .withQueryParam("maxItems", equalTo(String.valueOf(maxItems)))
             .willReturn(
                 aResponse()
@@ -1123,7 +1124,7 @@ public void getGroupChangeSuccess() {
                     .withHeader("Content-Type", "application/json")
                     .withBody(response)));
 
-    VinylDNSResponse<Group> vinylDNSResponse = client.getGroupChange(getGroupChangeRequest);
+    VinylDNSResponse<GroupChange> vinylDNSResponse = client.getGroupChange(getGroupChangeRequest);
 
     assertTrue(vinylDNSResponse instanceof ResponseMarker.Success);
     assertEquals(vinylDNSResponse.getStatusCode(), 200);
@@ -1136,7 +1137,7 @@ public void getGroupChangeFailure() {
         get(urlEqualTo("/groups/change/" + groupChangeId))
             .willReturn(aResponse().withStatus(500).withBody("server error")));
 
-    VinylDNSResponse<Group> vinylDNSResponse = client.getGroup(getGroupChangeRequest);
+    VinylDNSResponse<GroupChange> vinylDNSResponse = client.getGroupChange(getGroupChangeRequest);
 
     assertTrue(vinylDNSResponse instanceof ResponseMarker.Failure);
     assertEquals(vinylDNSResponse.getStatusCode(), 500);
@@ -1150,7 +1151,7 @@ public void getGroupChangeFailure404() {
         get(urlEqualTo("/groups/change/" + groupChangeId))
             .willReturn(aResponse().withStatus(404).withBody("not found")));
 
-    VinylDNSResponse<Group> vinylDNSResponse = client.getGroup(getGroupChangeRequest);
+    VinylDNSResponse<GroupChange> vinylDNSResponse = client.getGroupChange(getGroupChangeRequest);
 
     assertTrue(vinylDNSResponse instanceof ResponseMarker.Failure);
     assertEquals(vinylDNSResponse.getStatusCode(), 404);
@@ -1525,26 +1526,25 @@ public void listRecordSetGlobalSuccess() {
     int maxItems = 55;
 
     wireMockServer.stubFor(
-            get(urlMatching("/recordsets?(.*)"))
-                    .withQueryParam("recordNameFilter", equalTo(recordNameFilter))
-                    .withQueryParam("startFrom", equalTo(startFrom))
-                    .withQueryParam("maxItems", equalTo(String.valueOf(maxItems)))
-                    .willReturn(
-                            aResponse()
-                                    .withStatus(200)
-                                    .withHeader("Content-Type", "application/json")
-                                    .withBody(response)));
+        get(urlMatching("/recordsets?(.*)"))
+            .withQueryParam("recordNameFilter", equalTo(recordNameFilter))
+            .withQueryParam("startFrom", equalTo(startFrom))
+            .withQueryParam("maxItems", equalTo(String.valueOf(maxItems)))
+            .willReturn(
+                aResponse()
+                    .withStatus(200)
+                    .withHeader("Content-Type", "application/json")
+                    .withBody(response)));
 
     VinylDNSResponse<SearchRecordSetsResponse> vinylDNSResponse =
-            client.searchRecordSets(
-                    new SearchRecordSetsRequest(recordNameFilter, null,
-                                                Order.ASC , startFrom, maxItems));
+        client.searchRecordSets(
+            new SearchRecordSetsRequest(recordNameFilter, null, Order.ASC, startFrom, maxItems));
 
     assertTrue(vinylDNSResponse instanceof ResponseMarker.Success);
     assertEquals(vinylDNSResponse.getStatusCode(), 200);
-    assertEquals(vinylDNSResponse.getValue().getRecordNameFilter(),
-                 searchRecordSetsResponse.getRecordNameFilter());
-
+    assertEquals(
+        vinylDNSResponse.getValue().getRecordNameFilter(),
+        searchRecordSetsResponse.getRecordNameFilter());
   }
 
   @Test
@@ -1554,20 +1554,19 @@ public void listRecordSetGlobalFailure() {
     int maxItems = 55;
 
     wireMockServer.stubFor(
-            get(urlMatching("/recordsets?(.*)"))
-                    .withQueryParam("recordNameFilter", equalTo(recordNameFilter))
-                    .withQueryParam("startFrom", equalTo(startFrom))
-                    .withQueryParam("maxItems", equalTo(String.valueOf(maxItems)))
-                    .willReturn(
-                            aResponse()
-                                    .withStatus(500)
-                                    .withHeader("Content-Type", "application/json")
-                                    .withBody("server error")));
+        get(urlMatching("/recordsets?(.*)"))
+            .withQueryParam("recordNameFilter", equalTo(recordNameFilter))
+            .withQueryParam("startFrom", equalTo(startFrom))
+            .withQueryParam("maxItems", equalTo(String.valueOf(maxItems)))
+            .willReturn(
+                aResponse()
+                    .withStatus(500)
+                    .withHeader("Content-Type", "application/json")
+                    .withBody("server error")));
 
     VinylDNSResponse<SearchRecordSetsResponse> vinylDNSResponse =
-            client.searchRecordSets(
-                    new SearchRecordSetsRequest(recordNameFilter, null,
-                                                Order.ASC , startFrom, maxItems));
+        client.searchRecordSets(
+            new SearchRecordSetsRequest(recordNameFilter, null, Order.ASC, startFrom, maxItems));
 
     assertTrue(vinylDNSResponse instanceof ResponseMarker.Failure);
     assertEquals(vinylDNSResponse.getStatusCode(), 500);
@@ -1575,7 +1574,6 @@ public void listRecordSetGlobalFailure() {
     assertNull(vinylDNSResponse.getValue());
   }
 
-
   private String rsId = "recordSetId";
   private String zoneId = "zoneId";
   private ZoneConnection testZoneConnection1 =
@@ -1719,7 +1717,7 @@ public void listRecordSetGlobalFailure() {
   private GetRecordSetRequest getRecordSetRequest = new GetRecordSetRequest(zoneId, recordSetId);
 
   private String groupId = "groupId";
-  private String grouChangeId = "groupChangeId";
+  private String groupChangeId = "groupChangeId";
   private GetRecordSetChangeRequest getRecordSetChangeRequest =
       new GetRecordSetChangeRequest(zoneId, recordSetId, recordSetChangeId);
   private UpdateRecordSetRequest updateRecordSetRequest =
@@ -1755,7 +1753,8 @@ public void listRecordSetGlobalFailure() {
 
   private Set<GroupChange> groupChanges =
       Collections.singleton(new GroupChange("ID", newGroup, group, "", "", GroupChangeType.Update));
-  private GroupChange groupChange = new GroupChange("ID", newGroup, group, "", "", GroupChangeType.Update);
+  private GroupChange groupChange =
+      new GroupChange("ID", newGroup, group, "", "", GroupChangeType.Update);
 
   private CreateGroupRequest createGroupRequest =
       new CreateGroupRequest("createGroup", "create@group.com", adminMemberId, adminMemberId);
@@ -1770,7 +1769,7 @@ public void listRecordSetGlobalFailure() {
           new DateTime(),
           GroupStatus.Active);
   private GetGroupRequest getGroupRequest = new GetGroupRequest(groupId);
-  private GetGroupChangeRequest getGroupRequest = new GetGroupChangeRequest(groupChangeId);
+  private GetGroupChangeRequest getGroupChangeRequest = new GetGroupChangeRequest(groupChangeId);
   private DeleteGroupRequest deleteGroupRequest = new DeleteGroupRequest(groupId);
 
   private List<Group> groupList = Collections.singletonList(group);
@@ -1791,13 +1790,13 @@ public void listRecordSetGlobalFailure() {
       new ListRecordSetChangesResponse(zoneId, recordSetChangeList, 2, 1, 1);
 
   private SearchRecordSetsResponse searchRecordSetsResponse =
-          new SearchRecordSetsResponse(
-                  Collections.EMPTY_LIST,
-                  "startFrom",
-                  "nextId",
-                  55,
-                  "recordNameFilter",
-                  Collections.EMPTY_LIST,
-                  "recordOwnerGroupFilter",
-                  "nameSort");
+      new SearchRecordSetsResponse(
+          Collections.EMPTY_LIST,
+          "startFrom",
+          "nextId",
+          55,
+          "recordNameFilter",
+          Collections.EMPTY_LIST,
+          "recordOwnerGroupFilter",
+          "nameSort");
 }
diff --git a/src/test/java/io/vinyldns/java/models/batch/ChangeInputTest.java b/src/test/java/io/vinyldns/java/models/batch/ChangeInputTest.java
index 2b77935..05d6d91 100644
--- a/src/test/java/io/vinyldns/java/models/batch/ChangeInputTest.java
+++ b/src/test/java/io/vinyldns/java/models/batch/ChangeInputTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2018 Comcast Cable Communications Management, LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package io.vinyldns.java.models.batch;
 
 import static org.testng.Assert.*;
@@ -9,26 +24,34 @@
 import org.testng.annotations.Test;
 
 public class ChangeInputTest {
-    @Test
-    public void testEquality() {
-        // Add change input
-        AddChangeInput addChange1 = new AddChangeInput("equality.test.", RecordType.A, 300L, new AData("1.2.3.4"));
-        AddChangeInput addChange2 = new AddChangeInput("equality.test.", RecordType.A, 300L, new AData("1.2.3.4"));
-        AddChangeInput addChange3 = new AddChangeInput("an.equality.test.", RecordType.A, 300L, new AData("1.2.3.4"));
-        AddChangeInput addChange4 = new AddChangeInput("equality.test.", RecordType.A, 300L, new AData("1.2.3.5"));
-        assertEquals(addChange1, addChange2);
-        assertNotEquals(addChange1, addChange3);
-        assertNotEquals(addChange1, addChange4);
+  @Test
+  public void testEquality() {
+    // Add change input
+    AddChangeInput addChange1 =
+        new AddChangeInput("equality.test.", RecordType.A, 300L, new AData("1.2.3.4"));
+    AddChangeInput addChange2 =
+        new AddChangeInput("equality.test.", RecordType.A, 300L, new AData("1.2.3.4"));
+    AddChangeInput addChange3 =
+        new AddChangeInput("an.equality.test.", RecordType.A, 300L, new AData("1.2.3.4"));
+    AddChangeInput addChange4 =
+        new AddChangeInput("equality.test.", RecordType.A, 300L, new AData("1.2.3.5"));
+    assertEquals(addChange1, addChange2);
+    assertNotEquals(addChange1, addChange3);
+    assertNotEquals(addChange1, addChange4);
 
-        // Delete change input
-        DeleteRecordSetChangeInput deleteChange1 = new DeleteRecordSetChangeInput("equality.test.", RecordType.A, new AData("1.2.3.4"));
-        DeleteRecordSetChangeInput deleteChange2 = new DeleteRecordSetChangeInput("equality.test.", RecordType.A, new AData("1.2.3.4"));
-        DeleteRecordSetChangeInput deleteChange3 = new DeleteRecordSetChangeInput("an.equality.test.", RecordType.A, new AData("1.2.3.4"));
-        DeleteRecordSetChangeInput deleteChange4 = new DeleteRecordSetChangeInput("equality.test.", RecordType.A, new AData("1.2.3.5"));
-        assertEquals(deleteChange1, deleteChange2);
-        assertNotEquals(deleteChange1, deleteChange3);
-        assertNotEquals(deleteChange1, deleteChange4);
+    // Delete change input
+    DeleteRecordSetChangeInput deleteChange1 =
+        new DeleteRecordSetChangeInput("equality.test.", RecordType.A, new AData("1.2.3.4"));
+    DeleteRecordSetChangeInput deleteChange2 =
+        new DeleteRecordSetChangeInput("equality.test.", RecordType.A, new AData("1.2.3.4"));
+    DeleteRecordSetChangeInput deleteChange3 =
+        new DeleteRecordSetChangeInput("an.equality.test.", RecordType.A, new AData("1.2.3.4"));
+    DeleteRecordSetChangeInput deleteChange4 =
+        new DeleteRecordSetChangeInput("equality.test.", RecordType.A, new AData("1.2.3.5"));
+    assertEquals(deleteChange1, deleteChange2);
+    assertNotEquals(deleteChange1, deleteChange3);
+    assertNotEquals(deleteChange1, deleteChange4);
 
-        assertNotEquals(addChange1, deleteChange1);
-    }
+    assertNotEquals(addChange1, deleteChange1);
+  }
 }
diff --git a/src/test/java/io/vinyldns/java/serializers/SerializationFactoryTest.java b/src/test/java/io/vinyldns/java/serializers/SerializationFactoryTest.java
index 1f68cae..b50d338 100644
--- a/src/test/java/io/vinyldns/java/serializers/SerializationFactoryTest.java
+++ b/src/test/java/io/vinyldns/java/serializers/SerializationFactoryTest.java
@@ -1,14 +1,16 @@
-/**
+/*
  * Copyright 2018 Comcast Cable Communications Management, LLC
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package io.vinyldns.java.serializers;