Rename classes -Dto -> -DTO (#674)

zaldis · Denys Zaluzhnyi · web-flow · commit 9750cbefd625 · 2024-12-16T12:29:02.000+01:00
Achieve name consistency.

Co-authored-by: Denys Zaluzhnyi &lt;dzaluzhnyi@google.com&gt;
diff --git a/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/cloudera/manager/AbstractClouderaTimeSeriesTask.java b/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/cloudera/manager/AbstractClouderaTimeSeriesTask.java
@@ -32,8 +32,8 @@ abstract class AbstractClouderaTimeSeriesTask extends AbstractClouderaManagerTas
   private static final DateTimeFormatter isoDateTimeFormatter =
       DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
   private final ObjectMapper objectMapper = new ObjectMapper();
-  protected final int includedLastDays;
-  protected final TimeSeriesAggregation tsAggregation;
+  private final int includedLastDays;
+  private final TimeSeriesAggregation tsAggregation;
 
   public AbstractClouderaTimeSeriesTask(
       String targetPath, int includedLastDays, TimeSeriesAggregation tsAggregation) {
diff --git a/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/cloudera/manager/ClouderaAPIHostsTask.java b/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/cloudera/manager/ClouderaAPIHostsTask.java
@@ -22,8 +22,8 @@
 import com.google.edwmigration.dumper.application.dumper.MetadataDumperUsageException;
 import com.google.edwmigration.dumper.application.dumper.connector.cloudera.manager.ClouderaManagerHandle.ClouderaClusterDTO;
 import com.google.edwmigration.dumper.application.dumper.connector.cloudera.manager.ClouderaManagerHandle.ClouderaHostDTO;
-import com.google.edwmigration.dumper.application.dumper.connector.cloudera.manager.dto.ApiHostDto;
-import com.google.edwmigration.dumper.application.dumper.connector.cloudera.manager.dto.ApiHostListDto;
+import com.google.edwmigration.dumper.application.dumper.connector.cloudera.manager.dto.ApiHostDTO;
+import com.google.edwmigration.dumper.application.dumper.connector.cloudera.manager.dto.ApiHostListDTO;
 import com.google.edwmigration.dumper.application.dumper.task.TaskRunContext;
 import java.io.Writer;
 import java.nio.charset.StandardCharsets;
@@ -72,8 +72,8 @@ protected Void doRun(
         writer.write(stringifiedHosts);
         writer.write('\n');
 
-        ApiHostListDto apiHosts = objectMapper.readValue(stringifiedHosts, ApiHostListDto.class);
-        for (ApiHostDto apiHost : apiHosts.getHosts()) {
+        ApiHostListDTO apiHosts = objectMapper.readValue(stringifiedHosts, ApiHostListDTO.class);
+        for (ApiHostDTO apiHost : apiHosts.getHosts()) {
           hosts.add(ClouderaHostDTO.create(apiHost.getId(), apiHost.getName()));
         }
       }
diff --git a/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/cloudera/manager/ClouderaCMFHostsTask.java b/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/cloudera/manager/ClouderaCMFHostsTask.java
@@ -23,8 +23,8 @@
 import com.google.edwmigration.dumper.application.dumper.MetadataDumperUsageException;
 import com.google.edwmigration.dumper.application.dumper.connector.cloudera.manager.ClouderaManagerHandle.ClouderaClusterDTO;
 import com.google.edwmigration.dumper.application.dumper.connector.cloudera.manager.ClouderaManagerHandle.ClouderaHostDTO;
-import com.google.edwmigration.dumper.application.dumper.connector.cloudera.manager.dto.CMFHostDto;
-import com.google.edwmigration.dumper.application.dumper.connector.cloudera.manager.dto.CMFHostListDto;
+import com.google.edwmigration.dumper.application.dumper.connector.cloudera.manager.dto.CMFHostDTO;
+import com.google.edwmigration.dumper.application.dumper.connector.cloudera.manager.dto.CMFHostListDTO;
 import com.google.edwmigration.dumper.application.dumper.task.TaskRunContext;
 import java.io.Writer;
 import java.net.URI;
@@ -88,8 +88,8 @@ protected Void doRun(
         writer.write(stringifiedHosts);
         writer.write('\n');
 
-        CMFHostListDto apiHosts = objectMapper.readValue(stringifiedHosts, CMFHostListDto.class);
-        for (CMFHostDto apiHost : apiHosts.getHosts()) {
+        CMFHostListDTO apiHosts = objectMapper.readValue(stringifiedHosts, CMFHostListDTO.class);
+        for (CMFHostDTO apiHost : apiHosts.getHosts()) {
           hosts.add(ClouderaHostDTO.create(apiHost.getId(), apiHost.getName()));
         }
       }
diff --git a/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/cloudera/manager/ClouderaClustersTask.java b/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/cloudera/manager/ClouderaClustersTask.java
@@ -21,8 +21,8 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.ByteSink;
 import com.google.edwmigration.dumper.application.dumper.connector.cloudera.manager.ClouderaManagerHandle.ClouderaClusterDTO;
-import com.google.edwmigration.dumper.application.dumper.connector.cloudera.manager.dto.ApiClusterDto;
-import com.google.edwmigration.dumper.application.dumper.connector.cloudera.manager.dto.ApiClusterListDto;
+import com.google.edwmigration.dumper.application.dumper.connector.cloudera.manager.dto.ApiClusterDTO;
+import com.google.edwmigration.dumper.application.dumper.connector.cloudera.manager.dto.ApiClusterListDTO;
 import com.google.edwmigration.dumper.application.dumper.task.TaskRunContext;
 import java.io.Writer;
 import java.net.URI;
@@ -57,18 +57,18 @@ protected Void doRun(
       throws Exception {
     CloseableHttpClient httpClient = handle.getHttpClient();
 
-    ApiClusterListDto clusterList;
+    ApiClusterListDTO clusterList;
 
     if (context.getArguments().getCluster() != null) {
       final String clusterName = context.getArguments().getCluster();
       try (CloseableHttpResponse clusterResponse =
           httpClient.execute(new HttpGet(handle.getApiURI() + "/clusters/" + clusterName))) {
 
-        ApiClusterDto cluster =
+        ApiClusterDTO cluster =
             objectMapper.readValue(
-                EntityUtils.toString(clusterResponse.getEntity()), ApiClusterDto.class);
+                EntityUtils.toString(clusterResponse.getEntity()), ApiClusterDTO.class);
 
-        clusterList = new ApiClusterListDto();
+        clusterList = new ApiClusterListDTO();
         clusterList.setClusters(ImmutableList.of(cluster));
       }
     } else {
@@ -78,7 +78,7 @@ protected Void doRun(
           httpClient.execute(new HttpGet(handle.getApiURI() + "/clusters"))) {
         String clustersJson = EntityUtils.toString(clustersResponse.getEntity());
 
-        clusterList = objectMapper.readValue(clustersJson, ApiClusterListDto.class);
+        clusterList = objectMapper.readValue(clustersJson, ApiClusterListDTO.class);
       }
     }
 
@@ -87,7 +87,7 @@ protected Void doRun(
     }
 
     List<ClouderaClusterDTO> clusters = new ArrayList<>();
-    for (ApiClusterDto item : clusterList.getClusters()) {
+    for (ApiClusterDTO item : clusterList.getClusters()) {
       String clusterId = requestClusterIdByName(httpClient, handle.getBaseURI(), item.getName());
       clusters.add(ClouderaClusterDTO.create(clusterId, item.getName()));
     }
diff --git a/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/cloudera/manager/dto/ApiClusterDTO.java b/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/cloudera/manager/dto/ApiClusterDTO.java
@@ -29,7 +29,7 @@
  * code is unclear, the own model for public schema used instead of it.
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-public final class ApiClusterDto {
+public final class ApiClusterDTO {
   @JsonProperty(required = true)
   private String name;
 
diff --git a/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/cloudera/manager/dto/ApiClusterListDTO.java b/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/cloudera/manager/dto/ApiClusterListDTO.java
@@ -29,16 +29,16 @@
  * code is unclear, the own model for public schema used instead of it.
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-public final class ApiClusterListDto {
+public final class ApiClusterListDTO {
 
   @JsonProperty(required = true)
-  private List<ApiClusterDto> items;
+  private List<ApiClusterDTO> items;
 
-  public List<ApiClusterDto> getClusters() {
+  public List<ApiClusterDTO> getClusters() {
     return items;
   }
 
-  public void setClusters(List<ApiClusterDto> items) {
+  public void setClusters(List<ApiClusterDTO> items) {
     this.items = items;
   }
 }
diff --git a/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/cloudera/manager/dto/ApiHostDTO.java b/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/cloudera/manager/dto/ApiHostDTO.java
@@ -28,7 +28,7 @@
  * code is unclear, the own model for public schema used instead of it.
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ApiHostDto {
+public class ApiHostDTO {
 
   @JsonProperty(required = true)
   private String hostname;
diff --git a/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/cloudera/manager/dto/ApiHostListDTO.java b/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/cloudera/manager/dto/ApiHostListDTO.java
@@ -30,15 +30,15 @@
  * code is unclear, the own model for public schema used instead of it.
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ApiHostListDto {
-  private final List<ApiHostDto> hosts;
+public class ApiHostListDTO {
+  private final List<ApiHostDTO> hosts;
 
   @JsonCreator
-  public ApiHostListDto(@JsonProperty(value = "items", required = true) List<ApiHostDto> hosts) {
+  public ApiHostListDTO(@JsonProperty(value = "items", required = true) List<ApiHostDTO> hosts) {
     this.hosts = hosts;
   }
 
-  public List<ApiHostDto> getHosts() {
+  public List<ApiHostDTO> getHosts() {
     return hosts;
   }
 }
diff --git a/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/cloudera/manager/dto/CMFHostDTO.java b/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/cloudera/manager/dto/CMFHostDTO.java
@@ -24,7 +24,7 @@
  * chart.
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class CMFHostDto {
+public class CMFHostDTO {
   @JsonProperty(required = true)
   private String hostName;
 
diff --git a/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/cloudera/manager/dto/CMFHostListDTO.java b/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/cloudera/manager/dto/CMFHostListDTO.java
@@ -26,15 +26,15 @@
  * Usage chart.
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class CMFHostListDto {
-  private final List<CMFHostDto> hosts;
+public class CMFHostListDTO {
+  private final List<CMFHostDTO> hosts;
 
   @JsonCreator
-  public CMFHostListDto(@JsonProperty(value = "hosts", required = true) List<CMFHostDto> hosts) {
+  public CMFHostListDTO(@JsonProperty(value = "hosts", required = true) List<CMFHostDTO> hosts) {
     this.hosts = hosts;
   }
 
-  public List<CMFHostDto> getHosts() {
+  public List<CMFHostDTO> getHosts() {
     return hosts;
   }
 }
diff --git a/dumper/app/src/test/java/com/google/edwmigration/dumper/application/dumper/connector/cloudera/manager/ClouderaClustersTaskTest.java b/dumper/app/src/test/java/com/google/edwmigration/dumper/application/dumper/connector/cloudera/manager/ClouderaClustersTaskTest.java
@@ -31,7 +31,7 @@
 import com.google.common.io.CharSink;
 import com.google.edwmigration.dumper.application.dumper.ConnectorArguments;
 import com.google.edwmigration.dumper.application.dumper.connector.cloudera.manager.ClouderaManagerHandle.ClouderaClusterDTO;
-import com.google.edwmigration.dumper.application.dumper.connector.cloudera.manager.dto.ApiClusterListDto;
+import com.google.edwmigration.dumper.application.dumper.connector.cloudera.manager.dto.ApiClusterListDTO;
 import com.google.edwmigration.dumper.application.dumper.task.TaskRunContext;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -138,8 +138,8 @@ public void clusterNotProvided_success() throws Exception {
                 argThat(
                     content -> {
                       try {
-                        ApiClusterListDto listDto =
-                            objectMapper.readValue((String) content, ApiClusterListDto.class);
+                        ApiClusterListDTO listDto =
+                            objectMapper.readValue((String) content, ApiClusterListDTO.class);
                         assertNotNull(listDto.getClusters());
                       } catch (JsonProcessingException e) {
                         throw new RuntimeException(e);
@@ -225,8 +225,8 @@ public void clusterProvided_success() throws Exception {
                 argThat(
                     content -> {
                       try {
-                        ApiClusterListDto listDto =
-                            objectMapper.readValue((String) content, ApiClusterListDto.class);
+                        ApiClusterListDTO listDto =
+                            objectMapper.readValue((String) content, ApiClusterListDTO.class);
                         assertNotNull(listDto.getClusters());
                       } catch (JsonProcessingException e) {
                         throw new RuntimeException(e);

Original file line number	Diff line number	Diff line change
`@@ -29,16 +29,16 @@`
`29`	`29`	`* code is unclear, the own model for public schema used instead of it.`
`30`	`30`	`*/`
`31`	`31`	`@JsonIgnoreProperties(ignoreUnknown = true)`
`32`		`-public final class ApiClusterListDto {`
	`32`	`+public final class ApiClusterListDTO {`
`33`	`33`
`34`	`34`	`@JsonProperty(required = true)`
`35`		`- private List<ApiClusterDto> items;`
	`35`	`+ private List<ApiClusterDTO> items;`
`36`	`36`
`37`		`- public List<ApiClusterDto> getClusters() {`
	`37`	`+ public List<ApiClusterDTO> getClusters() {`
`38`	`38`	`return items;`
`39`	`39`	`}`
`40`	`40`
`41`		`- public void setClusters(List<ApiClusterDto> items) {`
	`41`	`+ public void setClusters(List<ApiClusterDTO> items) {`
`42`	`42`	`this.items = items;`
`43`	`43`	`}`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,15 +30,15 @@`
`30`	`30`	`* code is unclear, the own model for public schema used instead of it.`
`31`	`31`	`*/`
`32`	`32`	`@JsonIgnoreProperties(ignoreUnknown = true)`
`33`		`-public class ApiHostListDto {`
`34`		`- private final List<ApiHostDto> hosts;`
	`33`	`+public class ApiHostListDTO {`
	`34`	`+ private final List<ApiHostDTO> hosts;`
`35`	`35`
`36`	`36`	`@JsonCreator`
`37`		`- public ApiHostListDto(@JsonProperty(value = "items", required = true) List<ApiHostDto> hosts) {`
	`37`	`+ public ApiHostListDTO(@JsonProperty(value = "items", required = true) List<ApiHostDTO> hosts) {`
`38`	`38`	`this.hosts = hosts;`
`39`	`39`	`}`
`40`	`40`
`41`		`- public List<ApiHostDto> getHosts() {`
	`41`	`+ public List<ApiHostDTO> getHosts() {`
`42`	`42`	`return hosts;`
`43`	`43`	`}`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,15 +26,15 @@`
`26`	`26`	`* Usage chart.`
`27`	`27`	`*/`
`28`	`28`	`@JsonIgnoreProperties(ignoreUnknown = true)`
`29`		`-public class CMFHostListDto {`
`30`		`- private final List<CMFHostDto> hosts;`
	`29`	`+public class CMFHostListDTO {`
	`30`	`+ private final List<CMFHostDTO> hosts;`
`31`	`31`
`32`	`32`	`@JsonCreator`
`33`		`- public CMFHostListDto(@JsonProperty(value = "hosts", required = true) List<CMFHostDto> hosts) {`
	`33`	`+ public CMFHostListDTO(@JsonProperty(value = "hosts", required = true) List<CMFHostDTO> hosts) {`
`34`	`34`	`this.hosts = hosts;`
`35`	`35`	`}`
`36`	`36`
`37`		`- public List<CMFHostDto> getHosts() {`
	`37`	`+ public List<CMFHostDTO> getHosts() {`
`38`	`38`	`return hosts;`
`39`	`39`	`}`
`40`	`40`	`}`