From af68c0dbf2ff42f25c034d33e693187d888f9b77 Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 18 Mar 2021 10:21:03 -0700 Subject: [PATCH 1/3] refactor to use the shared client --- src/libs/vips-ords-client/pom.xml | 234 ------------------ .../ords/client/VipsOrdsClientConstants.java | 19 -- .../ords/client/document/DocumentService.java | 14 -- .../client/document/DocumentServiceImpl.java | 47 ---- .../client/document/VipsDocumentResponse.java | 62 ----- .../ords/client/health/HealthResponse.java | 51 ---- .../ords/client/health/HealthService.java | 8 - .../ords/client/health/HealthServiceImpl.java | 33 --- .../document/DocumentServiceImplTest.java | 129 ---------- .../client/health/HealthServiceImplTest.java | 56 ----- src/libs/vips-ords-client/vipsords.yaml | 122 --------- src/pom.xml | 2 - src/report/pom.xml | 5 - src/vips-notification-worker/pom.xml | 14 +- 14 files changed, 11 insertions(+), 785 deletions(-) delete mode 100644 src/libs/vips-ords-client/pom.xml delete mode 100644 src/libs/vips-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/VipsOrdsClientConstants.java delete mode 100644 src/libs/vips-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/document/DocumentService.java delete mode 100644 src/libs/vips-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/document/DocumentServiceImpl.java delete mode 100644 src/libs/vips-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/document/VipsDocumentResponse.java delete mode 100644 src/libs/vips-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/health/HealthResponse.java delete mode 100644 src/libs/vips-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/health/HealthService.java delete mode 100644 src/libs/vips-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/health/HealthServiceImpl.java delete mode 100644 src/libs/vips-ords-client/src/test/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/document/DocumentServiceImplTest.java delete mode 100644 src/libs/vips-ords-client/src/test/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/health/HealthServiceImplTest.java delete mode 100644 src/libs/vips-ords-client/vipsords.yaml diff --git a/src/libs/vips-ords-client/pom.xml b/src/libs/vips-ords-client/pom.xml deleted file mode 100644 index 78c24012..00000000 --- a/src/libs/vips-ords-client/pom.xml +++ /dev/null @@ -1,234 +0,0 @@ - - - - org.springframework.boot - spring-boot-starter-parent - 2.2.4.RELEASE - - - 4.0.0 - - ca.bc.gov.open.pssg.rsbc - vips-ords-client - 0.4.0-SNAPSHOT - - - - ca.bc.gov.open.ords.vips.client - 1.0.0 - - - - - - io.swagger - swagger-annotations - - - org.glassfish.jersey.core - jersey-client - - - org.glassfish.jersey.media - jersey-media-multipart - - - org.glassfish.jersey.media - jersey-media-json-jackson - - - - org.glassfish.jersey.inject - jersey-hk2 - - - - - com.google.code.findbugs - jsr305 - - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - - - - ch.qos.logback - logback-classic - - - ch.qos.logback - logback-core - - - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-base - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - - - org.openapitools - jackson-databind-nullable - - - - - com.fasterxml.jackson.datatype - jackson-datatype-joda - - - joda-time - joda-time - - - - - com.brsanthu - migbase64 - - - - - org.junit.jupiter - junit-jupiter-api - test - - - - org.junit.jupiter - junit-jupiter-api - test - - - org.junit.jupiter - junit-jupiter-engine - test - - - org.mockito - mockito-core - test - - - - - - - ca.bc.gov.open.pssg.rsbc - dps-bom - 0.4.0-SNAPSHOT - pom - import - - - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.0 - - - - org.apache.maven.plugins - maven-failsafe-plugin - 2.22.0 - - - - org.openapitools - openapi-generator-maven-plugin - 3.3.4 - - - spring-boot-api - - generate - - - ${project.basedir}/vipsords.yaml - java - - joda - - jersey2 - ${default-package}.api - ${default-package}.api.model - ${default-package}.api.handler - false - false - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - - maven-deploy-plugin - - - default-deploy - deploy - - deploy - - - - - - - - - org.jacoco - jacoco-maven-plugin - 0.8.2 - - - - prepare-agent - - - - - report - test - - report - - - - - - - - \ No newline at end of file diff --git a/src/libs/vips-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/VipsOrdsClientConstants.java b/src/libs/vips-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/VipsOrdsClientConstants.java deleted file mode 100644 index 9e00ffe9..00000000 --- a/src/libs/vips-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/VipsOrdsClientConstants.java +++ /dev/null @@ -1,19 +0,0 @@ -package ca.bc.gov.open.pssg.rsbc.vips.ords.client; - -/** - * - * VIPS Ords constants. - * - * @author carolcarpenterjustice - * - */ -public class VipsOrdsClientConstants { - - private VipsOrdsClientConstants() {} - - // Response code types; anything >= 0 is good, anything < 0 is bad. - public static final int SERVICE_FAILURE_CD = -1; - public static final int SERVICE_SUCCESS_CD = 0; - -} - diff --git a/src/libs/vips-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/document/DocumentService.java b/src/libs/vips-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/document/DocumentService.java deleted file mode 100644 index 1f114cdf..00000000 --- a/src/libs/vips-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/document/DocumentService.java +++ /dev/null @@ -1,14 +0,0 @@ -package ca.bc.gov.open.pssg.rsbc.vips.ords.client.document; - -import java.io.File; - -/** - * Collection of services for documents. - * - * @author carolcarpenterjustice - */ -public interface DocumentService { - - VipsDocumentResponse vipsDocument(String typeCode, String metadata, String mimeType, String mimeSubType, String authGuid, File body); - -} diff --git a/src/libs/vips-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/document/DocumentServiceImpl.java b/src/libs/vips-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/document/DocumentServiceImpl.java deleted file mode 100644 index 8c95d61f..00000000 --- a/src/libs/vips-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/document/DocumentServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package ca.bc.gov.open.pssg.rsbc.vips.ords.client.document; - -import ca.bc.gov.open.ords.vips.client.api.DocumentApi; -import ca.bc.gov.open.ords.vips.client.api.handler.ApiException; -import ca.bc.gov.open.ords.vips.client.api.model.VipsDocumentOrdsResponse; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.File; - - -/** - * Document Service Implementation using ORDS services. - * - * @author carolcarpenterjustice - */ -public class DocumentServiceImpl implements DocumentService { - - private final DocumentApi documentApi; - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - public DocumentServiceImpl(DocumentApi documentApi) { - this.documentApi = documentApi; - } - - @Override - public VipsDocumentResponse vipsDocument(String typeCode, String metadata, String mimeType, String mimeSubType, String authGuid, File body) { - - try { - VipsDocumentOrdsResponse response = this.documentApi.vipsDocumentPost(typeCode, sanitizeBase64(metadata), mimeType, mimeSubType, authGuid, body); - return VipsDocumentResponse.successResponse(response.getDocumentId(), response.getStatusCode(), response.getStatusMessage()); - - } catch (ApiException ex) { - - logger.error("Document Service did throw exception: " + ex.getMessage(), ex); - return VipsDocumentResponse.errorResponse(ex.getMessage()); - } - } - - private String sanitizeBase64(String value) { - return value - .replace('/', '_') - .replace('+', '-') - .replaceAll("\r\n", ""); - } - -} diff --git a/src/libs/vips-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/document/VipsDocumentResponse.java b/src/libs/vips-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/document/VipsDocumentResponse.java deleted file mode 100644 index 36c58f37..00000000 --- a/src/libs/vips-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/document/VipsDocumentResponse.java +++ /dev/null @@ -1,62 +0,0 @@ -package ca.bc.gov.open.pssg.rsbc.vips.ords.client.document; - -import ca.bc.gov.open.pssg.rsbc.vips.ords.client.VipsOrdsClientConstants; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; - -import java.text.MessageFormat; - -/** - * - * Represents the VIPS document Response - * - * @author carolcarpenterjustice - * - */ -@JacksonXmlRootElement(localName = "vipsDocumentResponse") -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public class VipsDocumentResponse { - - private String documentId; - private int respCode; - private String respMsg; - - private VipsDocumentResponse(int respCode, String respMsg) { - this.respCode = respCode; - this.respMsg = respMsg; - } - - private VipsDocumentResponse(String documentId, int respCode, String respMsg) { - this(respCode, respMsg); - this.documentId = documentId; - } - - public String getDocumentId() { return documentId; } - - public void setDocumentId(String documentId) { this.documentId = documentId; } - - public int getRespCode() { - return respCode; - } - - public String getRespMsg() { - return respMsg; - } - - public static VipsDocumentResponse errorResponse(String errorMessage) { - return new VipsDocumentResponse( - VipsOrdsClientConstants.SERVICE_FAILURE_CD, - errorMessage); - } - - public static VipsDocumentResponse successResponse(String documentIdStr, String respCodeStr, String respMsg) { - - return new VipsDocumentResponse(documentIdStr, Integer.parseInt(respCodeStr), respMsg); - } - - @Override - public String toString() { - return MessageFormat.format("VipsDocumentResponse: documentId [{0}], respCode [{1}], respMsg [{2}]", this.documentId, this.respCode, this.respMsg); - } - -} diff --git a/src/libs/vips-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/health/HealthResponse.java b/src/libs/vips-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/health/HealthResponse.java deleted file mode 100644 index 39f74a05..00000000 --- a/src/libs/vips-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/health/HealthResponse.java +++ /dev/null @@ -1,51 +0,0 @@ -package ca.bc.gov.open.pssg.rsbc.vips.ords.client.health; - -/** - * Represents a Health Response - * - * @author carolcarpenterjustice - * - */ -public class HealthResponse { - - private String appid; - private String method; - private String status; - private String host; - private String instance; - - public HealthResponse(String appid, String method, String status, - String host, String instance) { - this.appid = appid; - this.method = method; - this.status = status; - this.host = host; - this.instance = instance; - } - - public String getAppid() { - return appid; - } - - public String getMethod() { - return method; - } - - public String getStatus() { - return status; - } - - public String getHost() { - return host; - } - - public String getInstance() { - return instance; - } - - public static HealthResponse successResponse(String appid, String method, String status, - String host, String instance) { - - return new HealthResponse(appid, method, status, host, instance); - } -} diff --git a/src/libs/vips-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/health/HealthService.java b/src/libs/vips-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/health/HealthService.java deleted file mode 100644 index 68fb7c7f..00000000 --- a/src/libs/vips-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/health/HealthService.java +++ /dev/null @@ -1,8 +0,0 @@ -package ca.bc.gov.open.pssg.rsbc.vips.ords.client.health; - -import ca.bc.gov.open.ords.vips.client.api.handler.ApiException; - -public interface HealthService { - - HealthResponse health() throws ApiException; -} diff --git a/src/libs/vips-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/health/HealthServiceImpl.java b/src/libs/vips-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/health/HealthServiceImpl.java deleted file mode 100644 index 9fbf11fa..00000000 --- a/src/libs/vips-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/health/HealthServiceImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -package ca.bc.gov.open.pssg.rsbc.vips.ords.client.health; - -import ca.bc.gov.open.ords.vips.client.api.HealthApi; -import ca.bc.gov.open.ords.vips.client.api.handler.ApiException; -import ca.bc.gov.open.ords.vips.client.api.model.HealthOrdsResponse; - -/** - * Health Service Implementation using ORDS api - * - * @author carolcarpenterjustice - * - */ -public class HealthServiceImpl implements HealthService { - - private final HealthApi healthApi; - - public HealthServiceImpl(HealthApi healthApi) { - this.healthApi = healthApi; - } - - /** - * health check for the endpoint - * - * @return - * @throws ApiException - */ - @Override - public HealthResponse health() throws ApiException { - - HealthOrdsResponse response = healthApi.health(); - return HealthResponse.successResponse(response.getAppid(), response.getMethod(), response.getStatus(), response.getHost(), response.getInstance()); - } -} diff --git a/src/libs/vips-ords-client/src/test/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/document/DocumentServiceImplTest.java b/src/libs/vips-ords-client/src/test/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/document/DocumentServiceImplTest.java deleted file mode 100644 index 427d032f..00000000 --- a/src/libs/vips-ords-client/src/test/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/document/DocumentServiceImplTest.java +++ /dev/null @@ -1,129 +0,0 @@ -package ca.bc.gov.open.pssg.rsbc.vips.ords.client.document; - -import ca.bc.gov.open.ords.vips.client.api.DocumentApi; -import ca.bc.gov.open.ords.vips.client.api.HealthApi; -import ca.bc.gov.open.ords.vips.client.api.handler.ApiException; -import ca.bc.gov.open.ords.vips.client.api.model.HealthOrdsResponse; -import ca.bc.gov.open.ords.vips.client.api.model.VipsDocumentOrdsResponse; -import ca.bc.gov.open.pssg.rsbc.vips.ords.client.VipsOrdsClientConstants; -import ca.bc.gov.open.pssg.rsbc.vips.ords.client.health.HealthResponse; -import ca.bc.gov.open.pssg.rsbc.vips.ords.client.health.HealthServiceImpl; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestInstance; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.MockitoAnnotations; - -@TestInstance(TestInstance.Lifecycle.PER_CLASS) -public class DocumentServiceImplTest { - - public static final String API_EXCEPTION = "api exception"; - private DocumentServiceImpl sut; - - private static final String DOCUMENT_ID = "123"; - private static final String TYPE_CODE_SUCCESS = "1"; - private static final String TYPE_CODE_FAIL = "2"; - private static final String TYPE_CODE_EXCEPTION = "3"; - private static final String STATUS_CODE = "0"; - private static final String STATUS_MESSAGE = "success"; - private static final String ERROR_MESSAGE = "error"; - private static final String ERROR_CODE = "-2"; - - @Mock - private DocumentApi documentApiMock; - - @BeforeAll - public void setup() throws ApiException { - MockitoAnnotations.initMocks(this); - - VipsDocumentOrdsResponse successResponse = new VipsDocumentOrdsResponse(); - successResponse.setDocumentId(DOCUMENT_ID); - successResponse.setStatusMessage(STATUS_MESSAGE); - successResponse.setStatusCode(STATUS_CODE); - - VipsDocumentOrdsResponse errorResponse = new VipsDocumentOrdsResponse(); - errorResponse.setDocumentId(""); - errorResponse.setStatusMessage(ERROR_MESSAGE); - errorResponse.setStatusCode(ERROR_CODE); - - Mockito.when(documentApiMock.vipsDocumentPost(Mockito.eq(TYPE_CODE_SUCCESS), Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.any())).thenReturn(successResponse); - Mockito.when(documentApiMock.vipsDocumentPost(Mockito.eq(TYPE_CODE_FAIL), Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.any())).thenReturn(errorResponse); - Mockito.when(documentApiMock.vipsDocumentPost(Mockito.eq(TYPE_CODE_EXCEPTION), Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.any())).thenThrow(new ApiException(API_EXCEPTION)); - - sut = new DocumentServiceImpl(documentApiMock); - } - - @Test - public void withValidResponseShouldReturnValidResponse() { - - VipsDocumentResponse result = sut.vipsDocument(TYPE_CODE_SUCCESS, "a", "b", "c", "d", null); - - Assertions.assertEquals(DOCUMENT_ID, result.getDocumentId()); - Assertions.assertEquals(0, result.getRespCode()); - Assertions.assertEquals(STATUS_MESSAGE, result.getRespMsg()); - } - - @Test - public void withInvalidResponseShouldReturnValid() { - - VipsDocumentResponse result = sut.vipsDocument(TYPE_CODE_FAIL, "a", "b", "c", "d", null); - - Assertions.assertEquals(-2, result.getRespCode()); - Assertions.assertEquals(ERROR_MESSAGE, result.getRespMsg()); - } - - @Test - public void withApiExceptionShouldReturnValid() { - - VipsDocumentResponse result = sut.vipsDocument(TYPE_CODE_EXCEPTION, "a", "b", "c", "d", null); - - Assertions.assertEquals(VipsOrdsClientConstants.SERVICE_FAILURE_CD, result.getRespCode()); - Assertions.assertEquals(API_EXCEPTION, result.getRespMsg()); - } - - @TestInstance(TestInstance.Lifecycle.PER_CLASS) - public static class HealthServiceImplTest { - - public static final String API_EXCEPTION = "api exception"; - private HealthServiceImpl sut; - - private static final String APP_ID = "FIGCRP"; - private static final String METHOD = "health_check"; - private static final String STATUS = "success"; - private static final String HOST = "devdb"; - private static final String INSTANCE = "deva"; - - @Mock - private HealthApi healthApiMock; - - @BeforeAll - public void setup() throws ApiException { - MockitoAnnotations.initMocks(this); - - sut = new HealthServiceImpl(healthApiMock); - } - - @Test - public void withHealthReturnValidResponse() throws ApiException { - - HealthOrdsResponse successResponse = new HealthOrdsResponse(); - successResponse.setAppid(APP_ID); - successResponse.setMethod(METHOD); - successResponse.setStatus(STATUS); - successResponse.setHost(HOST); - successResponse.setInstance(INSTANCE); - - Mockito.when(healthApiMock.health()).thenReturn(successResponse); - - HealthResponse result = sut.health(); - - Assertions.assertEquals(APP_ID, result.getAppid()); - Assertions.assertEquals(METHOD, result.getMethod()); - Assertions.assertEquals(STATUS, result.getStatus()); - Assertions.assertEquals(HOST, result.getHost()); - Assertions.assertEquals(INSTANCE, result.getInstance()); - } - } -} diff --git a/src/libs/vips-ords-client/src/test/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/health/HealthServiceImplTest.java b/src/libs/vips-ords-client/src/test/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/health/HealthServiceImplTest.java deleted file mode 100644 index 6fbfeb71..00000000 --- a/src/libs/vips-ords-client/src/test/java/ca/bc/gov/open/pssg/rsbc/vips/ords/client/health/HealthServiceImplTest.java +++ /dev/null @@ -1,56 +0,0 @@ -package ca.bc.gov.open.pssg.rsbc.vips.ords.client.health; - -import ca.bc.gov.open.ords.vips.client.api.HealthApi; -import ca.bc.gov.open.ords.vips.client.api.handler.ApiException; -import ca.bc.gov.open.ords.vips.client.api.model.HealthOrdsResponse; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestInstance; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.MockitoAnnotations; - -@TestInstance(TestInstance.Lifecycle.PER_CLASS) -public class HealthServiceImplTest { - - public static final String API_EXCEPTION = "api exception"; - private HealthServiceImpl sut; - - private static final String APP_ID = "VIPS"; - private static final String METHOD = "health_check"; - private static final String STATUS = "success"; - private static final String HOST = "devdb"; - private static final String INSTANCE = "deva"; - - @Mock - private HealthApi healthApiMock; - - @BeforeAll - public void setup() throws ApiException { - MockitoAnnotations.initMocks(this); - - sut = new HealthServiceImpl(healthApiMock); - } - - @Test - public void withHealthReturnValidResponse() throws ApiException { - - HealthOrdsResponse successResponse = new HealthOrdsResponse(); - successResponse.setAppid(APP_ID); - successResponse.setMethod(METHOD); - successResponse.setStatus(STATUS); - successResponse.setHost(HOST); - successResponse.setInstance(INSTANCE); - - Mockito.when(healthApiMock.health()).thenReturn(successResponse); - - HealthResponse result = sut.health(); - - Assertions.assertEquals(APP_ID, result.getAppid()); - Assertions.assertEquals(METHOD, result.getMethod()); - Assertions.assertEquals(STATUS, result.getStatus()); - Assertions.assertEquals(HOST, result.getHost()); - Assertions.assertEquals(INSTANCE, result.getInstance()); - } -} diff --git a/src/libs/vips-ords-client/vipsords.yaml b/src/libs/vips-ords-client/vipsords.yaml deleted file mode 100644 index fe486dc7..00000000 --- a/src/libs/vips-ords-client/vipsords.yaml +++ /dev/null @@ -1,122 +0,0 @@ -swagger: '2.0' -info: - title: ORDS generated API for web - version: 1.0.0 -host: dev.jag.gov.bc.ca -basePath: /ords/deva/vipsords/web -schemes: -- http -produces: -- application/json -securityDefinitions: - basicAuth: - type: basic - description: HTTP Basic Authentication. -tags: -- name: Document -- name: Health -paths: - /health: - get: - tags: - - Health - security: - - basicAuth: [] - operationId: health - description: Dummy endpoint to check that API calls are working - responses: - '200': - description: output of the endpoint - schema: - $ref: '#/definitions/healthOrdsResponse' - /vipsDocument: - post: - tags: - - Document - security: - - basicAuth: [] - description: Store a VIPS document - responses: - '200': - description: output of the endpoint - schema: - $ref: '#/definitions/vipsDocumentOrdsResponse' - '400': - description: output of the endpoint - schema: - $ref: '#/definitions/errorMessage' - parameters: - - name: type_code - in: query - type: string - required: true - description: Implicit parameter - - name: metadata - in: query - type: string - required: true - description: Implicit parameter - - name: mime_type - in: query - type: string - required: true - description: Implicit parameter - - name: mime_sub_type - in: query - type: string - required: true - description: Implicit parameter - - name: auth_guid - in: query - type: string - required: true - description: Implicit parameter - - name: file_object - in: body - required: true - schema: - type: string - format: binary -definitions: - healthOrdsResponse: - type: object - required: - - appid - - method - - status - - host - - instance - properties: - appid: - type: string - method: - type: string - status: - type: string - host: - type: string - instance: - type: string - vipsDocumentOrdsResponse: - type: object - required: - - document_id - - status_code - - status_message - properties: - document_id: - type: string - status_code: - type: string - status_message: - type: string - errorMessage: - type: object - required: - - status_code - - status_message - properties: - status_code: - type: string - status_message: - type: string diff --git a/src/pom.xml b/src/pom.xml index 723d8c75..0c5e10c8 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -29,7 +29,6 @@ libs/dps-notification libs/figaro-ords-client libs/otssoa-ords-client - libs/vips-ords-client libs/dps-sftp-starter libs/dps-email-client libs/dps-monitoring @@ -45,7 +44,6 @@ libs/dps-messaging-starter libs/dps-notification libs/figaro-ords-client - libs/vips-ords-client libs/dps-sftp-starter libs/dps-commons libs/dps-email-client diff --git a/src/report/pom.xml b/src/report/pom.xml index 2f9ce726..6b127c59 100644 --- a/src/report/pom.xml +++ b/src/report/pom.xml @@ -99,11 +99,6 @@ figaro-ords-client 0.4.0-SNAPSHOT - - ca.bc.gov.open.pssg.rsbc - vips-ords-client - 0.4.0-SNAPSHOT - ca.bc.gov.open.pssg.rsbc dps-email-client diff --git a/src/vips-notification-worker/pom.xml b/src/vips-notification-worker/pom.xml index 1970fc6d..f4f601c8 100644 --- a/src/vips-notification-worker/pom.xml +++ b/src/vips-notification-worker/pom.xml @@ -19,6 +19,14 @@ 1.8 + + + dps-group + http://nexus-043918-tools.apps.silver.devops.gov.bc.ca/repository/dps-group/ + + + + @@ -77,9 +85,9 @@ - ca.bc.gov.open.pssg.rsbc - vips-ords-client - 0.4.0-SNAPSHOT + ca.bc.gov.open + jag-vips-client + 0.1.0 From cc04ce501718b136a1f6c264ec0075349ddd9314 Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 18 Mar 2021 10:27:11 -0700 Subject: [PATCH 2/3] fix issues with deps --- .../vips/notification/worker/OutputNotificationConsumer.java | 4 ++-- .../notification/worker/OutputNotificationConsumerTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vips-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/OutputNotificationConsumer.java b/src/vips-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/OutputNotificationConsumer.java index 0d8c364e..78ddb987 100644 --- a/src/vips-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/OutputNotificationConsumer.java +++ b/src/vips-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/OutputNotificationConsumer.java @@ -2,14 +2,14 @@ import ca.bc.gov.dps.monitoring.NotificationService; import ca.bc.gov.dps.monitoring.SystemNotification; +import ca.bc.gov.open.jagvipsclient.document.DocumentService; +import ca.bc.gov.open.jagvipsclient.document.VipsDocumentResponse; import ca.bc.gov.open.pssg.rsbc.dps.files.FileInfo; import ca.bc.gov.open.pssg.rsbc.dps.files.FileService; import ca.bc.gov.open.pssg.rsbc.dps.notification.OutputNotificationMessage; import ca.bc.gov.open.pssg.rsbc.dps.sftp.starter.DpsSftpException; import ca.bc.gov.open.pssg.rsbc.dps.sftp.starter.SftpProperties; import ca.bc.gov.open.pssg.rsbc.dps.vips.notification.worker.generated.models.Data; -import ca.bc.gov.open.pssg.rsbc.vips.ords.client.document.DocumentService; -import ca.bc.gov.open.pssg.rsbc.vips.ords.client.document.VipsDocumentResponse; import com.migcomponents.migbase64.Base64; import org.apache.commons.io.IOUtils; import org.slf4j.Logger; diff --git a/src/vips-notification-worker/src/test/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/OutputNotificationConsumerTest.java b/src/vips-notification-worker/src/test/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/OutputNotificationConsumerTest.java index 777bb8b6..5f618242 100644 --- a/src/vips-notification-worker/src/test/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/OutputNotificationConsumerTest.java +++ b/src/vips-notification-worker/src/test/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/OutputNotificationConsumerTest.java @@ -1,13 +1,13 @@ package ca.bc.gov.open.pssg.rsbc.vips.notification.worker; +import ca.bc.gov.open.jagvipsclient.document.DocumentService; +import ca.bc.gov.open.jagvipsclient.document.VipsDocumentResponse; import ca.bc.gov.open.pssg.rsbc.dps.files.FileInfo; import ca.bc.gov.open.pssg.rsbc.dps.files.FileService; import ca.bc.gov.open.pssg.rsbc.dps.notification.OutputNotificationMessage; import ca.bc.gov.open.pssg.rsbc.dps.sftp.starter.DpsSftpException; import ca.bc.gov.open.pssg.rsbc.dps.sftp.starter.SftpProperties; import ca.bc.gov.open.pssg.rsbc.dps.vips.notification.worker.generated.models.Data; -import ca.bc.gov.open.pssg.rsbc.vips.ords.client.document.DocumentService; -import ca.bc.gov.open.pssg.rsbc.vips.ords.client.document.VipsDocumentResponse; import com.migcomponents.migbase64.Base64; import org.junit.jupiter.api.*; import org.mockito.ArgumentMatchers; From 4dcc6b9f5ce814c770e759be7aa9b96e8601bb2d Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 18 Mar 2021 10:28:23 -0700 Subject: [PATCH 3/3] fix pr feedback --- .../rsbc/vips/notification/worker/health/HealthCheck.java | 4 ++-- .../vips/notification/worker/health/HealthCheckTest.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/vips-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/health/HealthCheck.java b/src/vips-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/health/HealthCheck.java index 0564dd2f..3985ab8a 100644 --- a/src/vips-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/health/HealthCheck.java +++ b/src/vips-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/health/HealthCheck.java @@ -1,8 +1,8 @@ package ca.bc.gov.open.pssg.rsbc.vips.notification.worker.health; -import ca.bc.gov.open.ords.vips.client.api.handler.ApiException; -import ca.bc.gov.open.pssg.rsbc.vips.ords.client.health.HealthService; +import ca.bc.gov.open.jag.ordsvipsclient.api.handler.ApiException; +import ca.bc.gov.open.jagvipsclient.health.HealthService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.actuate.health.Health; diff --git a/src/vips-notification-worker/src/test/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/health/HealthCheckTest.java b/src/vips-notification-worker/src/test/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/health/HealthCheckTest.java index c640d2b4..2a0b0c92 100644 --- a/src/vips-notification-worker/src/test/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/health/HealthCheckTest.java +++ b/src/vips-notification-worker/src/test/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/health/HealthCheckTest.java @@ -1,9 +1,9 @@ package ca.bc.gov.open.pssg.rsbc.vips.notification.worker.health; -import ca.bc.gov.open.ords.vips.client.api.HealthApi; -import ca.bc.gov.open.ords.vips.client.api.handler.ApiException; -import ca.bc.gov.open.ords.vips.client.api.model.HealthOrdsResponse; -import ca.bc.gov.open.pssg.rsbc.vips.ords.client.health.HealthService; +import ca.bc.gov.open.jag.ordsvipsclient.api.HealthApi; +import ca.bc.gov.open.jag.ordsvipsclient.api.handler.ApiException; +import ca.bc.gov.open.jag.ordsvipsclient.api.model.HealthOrdsResponse; +import ca.bc.gov.open.jagvipsclient.health.HealthService; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test;