Refactor model classes

Author: tadayosi

src/main/java/com/github/tadayosi/torchserve/client/impl/DefaultManagement.java

@@ -6,6 +6,7 @@
 import com.github.tadayosi.torchserve.client.Management;
 import com.github.tadayosi.torchserve.client.management.api.DefaultApi;
 import com.github.tadayosi.torchserve.client.management.invoker.ApiClient;
+import com.github.tadayosi.torchserve.client.management.model.DescribeModel200ResponseInner;
 import com.github.tadayosi.torchserve.client.model.Api;
 import com.github.tadayosi.torchserve.client.model.ApiException;
 import com.github.tadayosi.torchserve.client.model.ModelDetail;
@@ -91,7 +92,8 @@ public Response setAutoScale(String modelName, String modelVersion, SetAutoScale
     @Override
     public List<ModelDetail> describeModel(String modelName) throws ApiException {
         try {
-            return ModelDetail.fromList(api.describeModel(modelName));
+            List<DescribeModel200ResponseInner> response = api.describeModel(modelName);
+            return response.stream().map(ModelDetail::from).toList();
         } catch (com.github.tadayosi.torchserve.client.management.invoker.ApiException e) {
             throw new ApiException(e);
         }
@@ -100,7 +102,8 @@ public List<ModelDetail> describeModel(String modelName) throws ApiException {
     @Override
     public List<ModelDetail> describeModel(String modelName, String modelVersion) throws ApiException {
         try {
-            return ModelDetail.fromList(api.versionDescribeModel(modelName, modelVersion));
+            List<DescribeModel200ResponseInner> response = api.versionDescribeModel(modelName, modelVersion);
+            return response.stream().map(ModelDetail::from).toList();
         } catch (com.github.tadayosi.torchserve.client.management.invoker.ApiException e) {
             throw new ApiException(e);
         }

src/main/java/com/github/tadayosi/torchserve/client/model/Model.java

@@ -1,8 +1,5 @@
 package com.github.tadayosi.torchserve.client.model;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 import com.github.tadayosi.torchserve.client.management.model.ListModels200ResponseModelsInner;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -24,10 +21,6 @@ public static Model from(ListModels200ResponseModelsInner src) {
         return model;
     }
 
-    public static List<Model> from(List<ListModels200ResponseModelsInner> src) {
-        return src.stream().map(Model::from).collect(Collectors.toList());
-    }
-
     public String getModelName() {
         return modelName;
     }

src/main/java/com/github/tadayosi/torchserve/client/model/ModelDetail.java

@@ -2,7 +2,8 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
+
+import com.github.tadayosi.torchserve.client.management.model.DescribeModel200ResponseInner;
 
 public class ModelDetail extends Model {
 
@@ -19,7 +20,7 @@ public class ModelDetail extends Model {
     public ModelDetail() {
     }
 
-    public static ModelDetail from(com.github.tadayosi.torchserve.client.management.model.DescribeModel200ResponseInner src) {
+    public static ModelDetail from(DescribeModel200ResponseInner src) {
         ModelDetail model = new ModelDetail();
         model.setModelName(src.getModelName());
         model.setModelVersion(src.getModelVersion());
@@ -29,16 +30,12 @@ public static ModelDetail from(com.github.tadayosi.torchserve.client.management.
         model.setBatchSize(src.getBatchSize());
         model.setMaxBatchDelay(src.getMaxBatchDelay());
         model.setStatus(src.getStatus());
-        model.setWorkers(Worker.from(src.getWorkers()));
+        model.setWorkers(src.getWorkers().stream().map(Worker::from).toList());
         model.setMetrics(Metrics.from(src.getMetrics()));
         model.setJobQueueStatus(JobQueueStatus.from(src.getJobQueueStatus()));
         return model;
     }
 
-    public static List<ModelDetail> fromList(List<com.github.tadayosi.torchserve.client.management.model.DescribeModel200ResponseInner> src) {
-        return src.stream().map(ModelDetail::from).collect(Collectors.toList());
-    }
-
     public String getModelVersion() {
         return modelVersion;
     }

src/main/java/com/github/tadayosi/torchserve/client/model/ModelList.java

@@ -16,7 +16,7 @@ public ModelList() {
     public static ModelList from(ListModels200Response inlineResponse2001) {
         ModelList modelList = new ModelList();
         modelList.setNextPageToken(inlineResponse2001.getNextPageToken());
-        modelList.setModels(Model.from(inlineResponse2001.getModels()));
+        modelList.setModels(inlineResponse2001.getModels().stream().map(Model::from).toList());
         return modelList;
     }
 

src/main/java/com/github/tadayosi/torchserve/client/model/Response.java

@@ -1,19 +1,22 @@
 package com.github.tadayosi.torchserve.client.model;
 
+import com.github.tadayosi.torchserve.client.inference.model.Ping200Response;
+import com.github.tadayosi.torchserve.client.management.model.RegisterModel200Response;
+
 public class Response {
 
     private String status;
 
     public Response() {
     }
 
-    public static Response from(com.github.tadayosi.torchserve.client.inference.model.Ping200Response src) {
+    public static Response from(Ping200Response src) {
         Response response = new Response();
         response.setStatus(src.getStatus());
         return response;
     }
 
-    public static Response from(com.github.tadayosi.torchserve.client.management.model.RegisterModel200Response src) {
+    public static Response from(RegisterModel200Response src) {
         Response response = new Response();
         response.setStatus(src.getStatus());
         return response;

src/main/java/com/github/tadayosi/torchserve/client/model/Worker.java

@@ -1,8 +1,5 @@
 package com.github.tadayosi.torchserve.client.model;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 import com.github.tadayosi.torchserve.client.management.model.DescribeModel200ResponseInnerWorkersInner;
 
 public class Worker {
@@ -28,10 +25,6 @@ public static Worker from(DescribeModel200ResponseInnerWorkersInner src) {
         return worker;
     }
 
-    public static List<Worker> from(List<DescribeModel200ResponseInnerWorkersInner> src) {
-        return src.stream().map(Worker::from).collect(Collectors.toList());
-    }
-
     public String getId() {
         return id;
     }