GH2883 Move ServiceInfo Model to common-service-core

Signed-off-by: alexandr cumarav <[email protected]>
zowe · Sep 4, 2023 · 93af4cb · 93af4cb
1 parent 8cb1223
commit 93af4cb
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 12 deletions.
diff --git a/...e/apiml/product/services/ServiceInfo.java → .../org/zowe/apiml/services/ServiceInfo.java b/...e/apiml/product/services/ServiceInfo.java → .../org/zowe/apiml/services/ServiceInfo.java
@@ -8,13 +8,15 @@
  * Copyright Contributors to the Zowe Project.
  */
 
-package org.zowe.apiml.product.services;
+package org.zowe.apiml.services;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.netflix.appinfo.InstanceInfo;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import org.zowe.apiml.auth.Authentication;
 import org.zowe.apiml.config.ApiInfo;
@@ -31,6 +33,8 @@ public class ServiceInfo {
     private Apiml apiml;
     private Map<String, Instances> instances;
 
+    @NoArgsConstructor
+    @AllArgsConstructor
     @Data
     @Builder
     @JsonInclude(JsonInclude.Include.NON_NULL)
@@ -40,6 +44,8 @@ public static class Apiml {
         private List<Authentication> authentication;
     }
 
+    @NoArgsConstructor
+    @AllArgsConstructor
     @Data
     @Builder
     @JsonInclude(JsonInclude.Include.NON_NULL)
@@ -55,6 +61,8 @@ public static class Instances {
         private Map<String, String> customMetadata;
     }
 
+    @NoArgsConstructor
+    @AllArgsConstructor
     @Data
     @Builder
     @JsonInclude(JsonInclude.Include.NON_NULL)
@@ -64,6 +72,8 @@ public static class Service {
         private String homePageUrl;
     }
 
+    @NoArgsConstructor
+    @AllArgsConstructor
     @Data
     @SuperBuilder
     @EqualsAndHashCode(callSuper = true)

diff --git a/gateway-service/src/main/java/org/zowe/apiml/gateway/services/ServerInfoConfig.java b/gateway-service/src/main/java/org/zowe/apiml/gateway/services/ServerInfoConfig.java
@@ -16,7 +16,6 @@
 import org.zowe.apiml.eurekaservice.client.util.EurekaMetadataParser;
 import org.zowe.apiml.product.gateway.GatewayConfigProperties;
 import org.zowe.apiml.product.routing.transform.TransformService;
-import org.zowe.apiml.product.services.ServicesInfoService;
 
 @Configuration
 public class ServerInfoConfig {

diff --git a/gateway-service/src/main/java/org/zowe/apiml/gateway/services/ServicesInfoController.java b/gateway-service/src/main/java/org/zowe/apiml/gateway/services/ServicesInfoController.java
@@ -22,13 +22,12 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import org.zowe.apiml.product.services.ServiceInfo;
-import org.zowe.apiml.product.services.ServicesInfoService;
+import org.zowe.apiml.services.ServiceInfo;
 
 import java.util.List;
 
-import static org.zowe.apiml.product.services.ServicesInfoService.CURRENT_VERSION;
-import static org.zowe.apiml.product.services.ServicesInfoService.VERSION_HEADER;
+import static org.zowe.apiml.gateway.services.ServicesInfoService.CURRENT_VERSION;
+import static org.zowe.apiml.gateway.services.ServicesInfoService.VERSION_HEADER;
 
 
 @RestController

diff --git a/...product/services/ServicesInfoService.java → ...gateway/services/ServicesInfoService.java b/...product/services/ServicesInfoService.java → ...gateway/services/ServicesInfoService.java
@@ -8,7 +8,7 @@
  * Copyright Contributors to the Zowe Project.
  */
 
-package org.zowe.apiml.product.services;
+package org.zowe.apiml.gateway.services;
 
 import com.fasterxml.jackson.core.Version;
 import com.netflix.appinfo.InstanceInfo;
@@ -26,6 +26,7 @@
 import org.zowe.apiml.product.routing.ServiceType;
 import org.zowe.apiml.product.routing.transform.TransformService;
 import org.zowe.apiml.product.routing.transform.URLTransformationException;
+import org.zowe.apiml.services.ServiceInfo;
 
 import java.util.AbstractMap;
 import java.util.ArrayList;

diff --git a/...way-service/src/test/java/org/zowe/apiml/gateway/services/ServicesInfoControllerTest.java b/...way-service/src/test/java/org/zowe/apiml/gateway/services/ServicesInfoControllerTest.java
@@ -16,8 +16,7 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.http.HttpStatus;
-import org.zowe.apiml.product.services.ServiceInfo;
-import org.zowe.apiml.product.services.ServicesInfoService;
+import org.zowe.apiml.services.ServiceInfo;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -26,8 +25,8 @@
 import static org.hamcrest.core.Is.is;
 import static org.mockito.Mockito.when;
 import static org.zowe.apiml.gateway.services.ServicesInfoController.SERVICES_URL;
-import static org.zowe.apiml.product.services.ServicesInfoService.CURRENT_VERSION;
-import static org.zowe.apiml.product.services.ServicesInfoService.VERSION_HEADER;
+import static org.zowe.apiml.gateway.services.ServicesInfoService.CURRENT_VERSION;
+import static org.zowe.apiml.gateway.services.ServicesInfoService.VERSION_HEADER;
 
 @ExtendWith(MockitoExtension.class)
 class ServicesInfoControllerTest {

diff --git a/...uct/services/ServicesInfoServiceTest.java → ...way/services/ServicesInfoServiceTest.java b/...uct/services/ServicesInfoServiceTest.java → ...way/services/ServicesInfoServiceTest.java
@@ -8,7 +8,7 @@
  * Copyright Contributors to the Zowe Project.
  */
 
-package org.zowe.apiml.product.services;
+package org.zowe.apiml.gateway.services;
 
 import com.netflix.appinfo.InstanceInfo;
 import com.netflix.discovery.EurekaClient;
@@ -27,6 +27,7 @@
 import org.zowe.apiml.product.gateway.GatewayClient;
 import org.zowe.apiml.product.gateway.GatewayConfigProperties;
 import org.zowe.apiml.product.routing.transform.TransformService;
+import org.zowe.apiml.services.ServiceInfo;
 
 import java.util.Arrays;
 import java.util.Collections;