From c6916032d124066c6009e0db070a0cebb9c1ea5f Mon Sep 17 00:00:00 2001 From: PatrikBuhr Date: Mon, 22 Nov 2021 16:12:27 +0100 Subject: [PATCH] Rename enrichment coordinator service to information coordinator service Signed-off-by: PatrikBuhr Issue-ID: NONRTRIC-625 Change-Id: I2825aa9a3e429cf92be7e8ba34bce04bf8f4cf7f --- docs/api-docs.rst | 10 +-- docs/conf.py | 2 +- docs/developer-guide.rst | 16 ++--- docs/overview.rst | 14 ++-- enrichment-coordinator-service | 1 + .../.gitignore | 0 .../Dockerfile | 22 +++---- .../api/ics-api.json | 0 .../api/ics-api.yaml | 0 .../config/README | 0 .../config/application.yaml | 10 +-- .../config/keystore.jks | Bin .../config/truststore.jks | Bin .../eclipse-formatter.xml | 0 .../pom.xml | 16 ++--- .../src/main/java/org/oransc/ics}/Application.java | 2 +- .../src/main/java/org/oransc/ics}/BeanFactory.java | 10 +-- .../main/java/org/oransc/ics}/SwaggerConfig.java | 10 +-- .../org/oransc/ics}/clients/AsyncRestClient.java | 4 +- .../ics}/clients/AsyncRestClientFactory.java | 6 +- .../ics}/configuration/ApplicationConfig.java | 4 +- .../oransc/ics}/configuration/WebClientConfig.java | 2 +- .../org/oransc/ics}/controllers/ErrorResponse.java | 4 +- .../oransc/ics}/controllers/StatusController.java | 8 +-- .../org/oransc/ics}/controllers/VoidResponse.java | 2 +- .../oransc/ics}/controllers/a1e/A1eCallbacks.java | 16 ++--- .../org/oransc/ics}/controllers/a1e/A1eConsts.java | 2 +- .../oransc/ics}/controllers/a1e/A1eController.java | 22 +++---- .../oransc/ics}/controllers/a1e/A1eEiJobInfo.java | 2 +- .../ics}/controllers/a1e/A1eEiJobStatus.java | 2 +- .../oransc/ics}/controllers/a1e/A1eEiTypeInfo.java | 2 +- .../controllers/r1consumer/ConsumerCallbacks.java | 12 ++-- .../controllers/r1consumer/ConsumerConsts.java | 2 +- .../controllers/r1consumer/ConsumerController.java | 24 +++---- .../r1consumer/ConsumerInfoTypeInfo.java | 2 +- .../controllers/r1consumer/ConsumerJobInfo.java | 2 +- .../controllers/r1consumer/ConsumerJobStatus.java | 2 +- .../r1consumer/ConsumerTypeRegistrationInfo.java | 2 +- .../r1consumer/ConsumerTypeSubscriptionInfo.java | 2 +- .../controllers/r1producer/ProducerCallbacks.java | 16 ++--- .../controllers/r1producer/ProducerConsts.java | 2 +- .../controllers/r1producer/ProducerController.java | 22 +++---- .../r1producer/ProducerInfoTypeInfo.java | 2 +- .../controllers/r1producer/ProducerJobInfo.java | 4 +- .../r1producer/ProducerRegistrationInfo.java | 2 +- .../controllers/r1producer/ProducerStatusInfo.java | 2 +- .../oransc/ics}/exceptions/ServiceException.java | 2 +- .../java/org/oransc/ics}/repository/InfoJob.java | 2 +- .../java/org/oransc/ics}/repository/InfoJobs.java | 8 +-- .../org/oransc/ics}/repository/InfoProducer.java | 2 +- .../org/oransc/ics}/repository/InfoProducers.java | 8 +-- .../java/org/oransc/ics}/repository/InfoType.java | 2 +- .../ics}/repository/InfoTypeSubscriptions.java | 6 +- .../java/org/oransc/ics}/repository/InfoTypes.java | 6 +- .../java/org/oransc/ics}/repository/MultiMap.java | 2 +- .../org/oransc/ics}/tasks/ProducerSupervision.java | 16 ++--- .../test/java/org/oransc/ics}/ApplicationTest.java | 72 ++++++++++----------- .../org/oransc/ics}/MockEnrichmentService.java | 2 +- .../oransc/ics}/clients/AsyncRestClientTest.java | 2 +- .../controller/ConsumerSimulatorController.java | 12 ++-- .../controller/ProducerSimulatorController.java | 10 +-- pom.xml | 2 +- 62 files changed, 221 insertions(+), 220 deletions(-) create mode 120000 enrichment-coordinator-service rename {enrichment-coordinator-service => information-coordinator-service}/.gitignore (100%) rename {enrichment-coordinator-service => information-coordinator-service}/Dockerfile (53%) rename enrichment-coordinator-service/api/ecs-api.json => information-coordinator-service/api/ics-api.json (100%) rename enrichment-coordinator-service/api/ecs-api.yaml => information-coordinator-service/api/ics-api.yaml (100%) rename {enrichment-coordinator-service => information-coordinator-service}/config/README (100%) rename {enrichment-coordinator-service => information-coordinator-service}/config/application.yaml (81%) rename {enrichment-coordinator-service => information-coordinator-service}/config/keystore.jks (100%) rename {enrichment-coordinator-service => information-coordinator-service}/config/truststore.jks (100%) rename {enrichment-coordinator-service => information-coordinator-service}/eclipse-formatter.xml (100%) rename {enrichment-coordinator-service => information-coordinator-service}/pom.xml (96%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/Application.java (97%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/BeanFactory.java (93%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/SwaggerConfig.java (94%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/clients/AsyncRestClient.java (98%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/clients/AsyncRestClientFactory.java (97%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/configuration/ApplicationConfig.java (96%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/configuration/WebClientConfig.java (96%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/controllers/ErrorResponse.java (97%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/controllers/StatusController.java (95%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/controllers/VoidResponse.java (95%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/controllers/a1e/A1eCallbacks.java (88%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/controllers/a1e/A1eConsts.java (97%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/controllers/a1e/A1eController.java (96%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/controllers/a1e/A1eEiJobInfo.java (98%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/controllers/a1e/A1eEiJobStatus.java (97%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/controllers/a1e/A1eEiTypeInfo.java (95%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/controllers/r1consumer/ConsumerCallbacks.java (88%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/controllers/r1consumer/ConsumerConsts.java (97%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/controllers/r1consumer/ConsumerController.java (97%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/controllers/r1consumer/ConsumerInfoTypeInfo.java (97%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/controllers/r1consumer/ConsumerJobInfo.java (98%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/controllers/r1consumer/ConsumerJobStatus.java (97%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/controllers/r1consumer/ConsumerTypeRegistrationInfo.java (97%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/controllers/r1consumer/ConsumerTypeSubscriptionInfo.java (97%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/controllers/r1producer/ProducerCallbacks.java (91%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/controllers/r1producer/ProducerConsts.java (95%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/controllers/r1producer/ProducerController.java (96%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/controllers/r1producer/ProducerInfoTypeInfo.java (97%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/controllers/r1producer/ProducerJobInfo.java (96%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/controllers/r1producer/ProducerRegistrationInfo.java (97%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/controllers/r1producer/ProducerStatusInfo.java (97%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/exceptions/ServiceException.java (97%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/repository/InfoJob.java (97%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/repository/InfoJobs.java (96%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/repository/InfoProducer.java (98%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/repository/InfoProducers.java (96%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/repository/InfoType.java (96%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/repository/InfoTypeSubscriptions.java (98%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/repository/InfoTypes.java (96%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/repository/MultiMap.java (97%) rename {enrichment-coordinator-service/src/main/java/org/oransc/enrichment => information-coordinator-service/src/main/java/org/oransc/ics}/tasks/ProducerSupervision.java (90%) rename {enrichment-coordinator-service/src/test/java/org/oransc/enrichment => information-coordinator-service/src/test/java/org/oransc/ics}/ApplicationTest.java (95%) rename {enrichment-coordinator-service/src/test/java/org/oransc/enrichment => information-coordinator-service/src/test/java/org/oransc/ics}/MockEnrichmentService.java (98%) rename {enrichment-coordinator-service/src/test/java/org/oransc/enrichment => information-coordinator-service/src/test/java/org/oransc/ics}/clients/AsyncRestClientTest.java (99%) rename {enrichment-coordinator-service/src/test/java/org/oransc/enrichment => information-coordinator-service/src/test/java/org/oransc/ics}/controller/ConsumerSimulatorController.java (93%) rename {enrichment-coordinator-service/src/test/java/org/oransc/enrichment => information-coordinator-service/src/test/java/org/oransc/ics}/controller/ProducerSimulatorController.java (96%) diff --git a/docs/api-docs.rst b/docs/api-docs.rst index ef234a56..51d18ee8 100644 --- a/docs/api-docs.rst +++ b/docs/api-docs.rst @@ -20,7 +20,7 @@ Here we describe the APIs to access the Non-RT RIC functions. The core Non-RT RIC consists of several parts, with available APIs described in the sections below: * The A1 Policy Management Service -* The Enrichment Coordinator Service +* The Information Coordinator Service * The Non-RT-RIC App Catalogue * K8S Helm Chart LCM Manager (Initial) **** @@ -29,10 +29,10 @@ A1 Policy Management Service For information about the A1 Policy Management Service that is implemented in ONAP, see `ONAP docs `_ and `wiki `_. -Enrichment Coordinator Service -============================== +Information Coordinator Service +=============================== -See `A1 Enrichment Information Coordination Service API <./ecs-api.html>`_ for full details of the API. +See `A1 Information Information Coordination Service API <./ics-api.html>`_ for full details of the API. The API is also described in Swagger-JSON and YAML: @@ -40,7 +40,7 @@ The API is also described in Swagger-JSON and YAML: :header: "API name", "|swagger-icon|", "|yaml-icon|" :widths: 10,5,5 - "A1 Enrichment Information Coordination Service API", ":download:`link <../enrichment-coordinator-service/api/ecs-api.json>`", ":download:`link <../enrichment-coordinator-service/api/ecs-api.yaml>`" + "A1 Enrichment Information Coordination Service API", ":download:`link <../information-coordinator-service/api/ics-api.json>`", ":download:`link <../information-coordinator-service/api/ics-api.yaml>`" Non-RT-RIC App Catalogue (Initial) ================================== diff --git a/docs/conf.py b/docs/conf.py index 85721c6a..ff5fcc99 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -24,7 +24,7 @@ redoc = [ { 'name': 'ECS API', 'page': 'ecs-api', - 'spec': '../enrichment-coordinator-service/api/ecs-api.json', + 'spec': '../information-coordinator-service/api/ics-api.json', 'embed': True, } ] diff --git a/docs/developer-guide.rst b/docs/developer-guide.rst index 43ac2d15..e0cb0809 100644 --- a/docs/developer-guide.rst +++ b/docs/developer-guide.rst @@ -15,21 +15,21 @@ A1 Policy Management Service & SDNC/A1 Controller & A1 Adapter The A1 Policy Management Service is implemented in ONAP. For documentation see `ONAP CCSDK documentation `_ and `wiki `_. -Enrichment Coordinator Service ------------------------------- -The Enrichment Coordinator Service is a Java 11 web application built using the Spring Framework. Using Spring Boot +Information Coordinator Service +------------------------------- +The Information Coordinator Service is a Java 11 web application built using the Spring Framework. Using Spring Boot dependencies, it runs as a standalone application. Its main functionality is to act as a data subscription broker and to decouple data producer from data consumers. -See the ./config/README file in the *enrichment-coordinator-service* directory Gerrit repo on how to create and setup +See the ./config/README file in the *information-coordinator-service* directory Gerrit repo on how to create and setup the certificates and private keys needed for HTTPS. Start standalone ++++++++++++++++ -The project uses Maven. To start the Enrichment Coordinator Service as a freestanding application, run the following -command in the *enrichment-coordinator-service* directory: +The project uses Maven. To start the Information Coordinator Service as a freestanding application, run the following +command in the *information-coordinator-service* directory: +-----------------------------+ | mvn spring-boot:run | @@ -38,7 +38,7 @@ command in the *enrichment-coordinator-service* directory: Start in Docker +++++++++++++++ -To build and deploy the Enrichment Coordinator Service, go to the "enrichment-coordinator-service" folder and run the +To build and deploy the Information Coordinator Service, go to the "information-coordinator-service" folder and run the following command: +-----------------------------+ @@ -48,7 +48,7 @@ following command: Then start the container by running the following command: +--------------------------------------------------------------------+ - | docker run nonrtric-enrichment-coordinator-service | + | docker run nonrtric-information-coordinator-service | +--------------------------------------------------------------------+ Initial Non-RT-RIC App Catalogue diff --git a/docs/overview.rst b/docs/overview.rst index 8645a189..e8169758 100644 --- a/docs/overview.rst +++ b/docs/overview.rst @@ -24,7 +24,7 @@ These are the components that make up the Non-RT-RIC: * Non-RT-RIC Control Panel / Dashboard * A1 Policy Management Service (developed in ONAP) * A1/SDNC Controller & A1 Adapter (Controller plugin) -* Enrichment Information Coordinator +* Information Coordinator Service * Non-RT-RIC (Spring Cloud) Service Gateway * Non-RT-RIC (Kong) Service Exposure Prototyping * Initial Non-RT-RIC App Catalogue @@ -40,7 +40,7 @@ Graphical user interface * View and Manage A1 policies in the RAN (near-RT-RICs) * Interacts with the Policy agent’s NBI (REST API) * Graphical A1 policy creation/editing is model-driven, based on policy type’s JSON schema -* View and manage producers and jobs for the Enrichment coordinator service +* View and manage producers and jobs for the Information coordinator service * Configure A1 Policy Management Service (e.g. add/remove near-rt-rics) * Interacts with the A1-PolicyManagementService & A1-EI-Coordinator (REST NBIs) via Service Exposure gateway @@ -90,8 +90,8 @@ Mediation point for A1 interface termination in SMO/NONRTRIC See also: `A1 Adapter/Controller Functions in ONAP `_ -Enrichment Information Job Coordination Service -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Information Job Coordination Service +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Coordinate/Register A1-EI Types, Producers, Consumers, and Jobs. @@ -106,14 +106,14 @@ Coordinate/Register A1-EI Types, Producers, Consumers, and Jobs. * Query status of A1-EI jobs * Monitors all near-RT-RICs and recovers from inconsistencies * After EI-type/Producer/Consumer/Job is successfully registered delivery/flow can happen directly between A1-EI Producers (in SMO/NONRTRIC domain) and A1-EI consumers (near-RT-RICs in RAN domain) -* *Being extended to coordinate non-A1 Enrichment Information exchange between NONRTRIC Apps* +* *Being extended to coordinate non-A1 Information exchange between NONRTRIC Apps* Non-RT-RIC (Spring Cloud) Service Gateway ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Support Apps to use A1 Services * `Spring Cloud Gateway `_ provides the library to build a basic API gateway -* Exposes A1 Policy Management Service & Enrichment Coordinator Service. +* Exposes A1 Policy Management Service & Information Coordinator Service. * Additional predicates can be added in code or preferably in the Gateway yaml configuration. Implementation: @@ -162,7 +162,7 @@ A1 Interface / Near-RT-RIC Simulator Stateful A1 test stub. * Used to create multiple stateful A1 providers (simulated near-rt-rics) -* Supports A1-Policy and A1-EnrichmentInformation +* Supports A1-Policy and A1-Enrichment Information * Swagger-based northbound interface, so easy to change the A1 profile exposed (e.g. A1 version, A1 Policy Types, A1-E1 consumers, etc) * All A1-AP versions supported diff --git a/enrichment-coordinator-service b/enrichment-coordinator-service new file mode 120000 index 00000000..750df396 --- /dev/null +++ b/enrichment-coordinator-service @@ -0,0 +1 @@ +information-coordinator-service \ No newline at end of file diff --git a/enrichment-coordinator-service/.gitignore b/information-coordinator-service/.gitignore similarity index 100% rename from enrichment-coordinator-service/.gitignore rename to information-coordinator-service/.gitignore diff --git a/enrichment-coordinator-service/Dockerfile b/information-coordinator-service/Dockerfile similarity index 53% rename from enrichment-coordinator-service/Dockerfile rename to information-coordinator-service/Dockerfile index 744a237a..e9d179df 100644 --- a/enrichment-coordinator-service/Dockerfile +++ b/information-coordinator-service/Dockerfile @@ -21,23 +21,23 @@ FROM openjdk:11-jre-slim ARG JAR -WORKDIR /opt/app/enrichment-coordinator-service -RUN mkdir -p /var/log/enrichment-coordinator-service -RUN mkdir -p /opt/app/enrichment-coordinator-service/etc/cert/ -RUN mkdir -p /var/enrichment-coordinator-service -RUN chmod -R 777 /var/enrichment-coordinator-service +WORKDIR /opt/app/information-coordinator-service +RUN mkdir -p /var/log/information-coordinator-service +RUN mkdir -p /opt/app/information-coordinator-service/etc/cert/ +RUN mkdir -p /var/information-coordinator-service +RUN chmod -R 777 /var/information-coordinator-service EXPOSE 8083 8434 -ADD /config/application.yaml /opt/app/enrichment-coordinator-service/config/application.yaml -ADD target/${JAR} /opt/app/enrichment-coordinator-service/enrichment-coordinator-service.jar -ADD /config/keystore.jks /opt/app/enrichment-coordinator-service/etc/cert/keystore.jks -ADD /config/truststore.jks /opt/app/enrichment-coordinator-service/etc/cert/truststore.jks +ADD /config/application.yaml /opt/app/information-coordinator-service/config/application.yaml +ADD target/${JAR} /opt/app/information-coordinator-service/information-coordinator-service.jar +ADD /config/keystore.jks /opt/app/information-coordinator-service/etc/cert/keystore.jks +ADD /config/truststore.jks /opt/app/information-coordinator-service/etc/cert/truststore.jks -RUN chmod -R 777 /opt/app/enrichment-coordinator-service/config/ +RUN chmod -R 777 /opt/app/information-coordinator-service/config/ -CMD ["java", "-jar", "/opt/app/enrichment-coordinator-service/enrichment-coordinator-service.jar"] +CMD ["java", "-jar", "/opt/app/information-coordinator-service/information-coordinator-service.jar"] diff --git a/enrichment-coordinator-service/api/ecs-api.json b/information-coordinator-service/api/ics-api.json similarity index 100% rename from enrichment-coordinator-service/api/ecs-api.json rename to information-coordinator-service/api/ics-api.json diff --git a/enrichment-coordinator-service/api/ecs-api.yaml b/information-coordinator-service/api/ics-api.yaml similarity index 100% rename from enrichment-coordinator-service/api/ecs-api.yaml rename to information-coordinator-service/api/ics-api.yaml diff --git a/enrichment-coordinator-service/config/README b/information-coordinator-service/config/README similarity index 100% rename from enrichment-coordinator-service/config/README rename to information-coordinator-service/config/README diff --git a/enrichment-coordinator-service/config/application.yaml b/information-coordinator-service/config/application.yaml similarity index 81% rename from enrichment-coordinator-service/config/application.yaml rename to information-coordinator-service/config/application.yaml index 5900d63d..e1a417ce 100644 --- a/enrichment-coordinator-service/config/application.yaml +++ b/information-coordinator-service/config/application.yaml @@ -19,9 +19,9 @@ logging: org.springframework: ERROR org.springframework.data: ERROR org.springframework.web.reactive.function.client.ExchangeFunctions: ERROR - org.oransc.enrichment: INFO + org.oransc.ics: INFO file: - name: /var/log/enrichment-coordinator-service/application.log + name: /var/log/information-coordinator-service/application.log server: # Configuration of the HTTP/REST server. The parameters are defined and handeled by the springboot framework. # See springboot documentation. @@ -30,7 +30,7 @@ server: ssl: key-store-type: JKS key-store-password: policy_agent - key-store: /opt/app/enrichment-coordinator-service/etc/cert/keystore.jks + key-store: /opt/app/information-coordinator-service/etc/cert/keystore.jks key-password: policy_agent key-alias: policy_agent app: @@ -40,10 +40,10 @@ app: # Note that the same keystore as for the server is used. trust-store-used: false trust-store-password: policy_agent - trust-store: /opt/app/enrichment-coordinator-service/etc/cert/truststore.jks + trust-store: /opt/app/information-coordinator-service/etc/cert/truststore.jks # Configuration of usage of HTTP Proxy for the southbound accesses. # The HTTP proxy (if configured) will only be used for accessing NearRT RIC:s http.proxy-host: http.proxy-port: 0 - vardata-directory: /var/enrichment-coordinator-service + vardata-directory: /var/information-coordinator-service diff --git a/enrichment-coordinator-service/config/keystore.jks b/information-coordinator-service/config/keystore.jks similarity index 100% rename from enrichment-coordinator-service/config/keystore.jks rename to information-coordinator-service/config/keystore.jks diff --git a/enrichment-coordinator-service/config/truststore.jks b/information-coordinator-service/config/truststore.jks similarity index 100% rename from enrichment-coordinator-service/config/truststore.jks rename to information-coordinator-service/config/truststore.jks diff --git a/enrichment-coordinator-service/eclipse-formatter.xml b/information-coordinator-service/eclipse-formatter.xml similarity index 100% rename from enrichment-coordinator-service/eclipse-formatter.xml rename to information-coordinator-service/eclipse-formatter.xml diff --git a/enrichment-coordinator-service/pom.xml b/information-coordinator-service/pom.xml similarity index 96% rename from enrichment-coordinator-service/pom.xml rename to information-coordinator-service/pom.xml index 4edf4d42..2de2bf2a 100644 --- a/enrichment-coordinator-service/pom.xml +++ b/information-coordinator-service/pom.xml @@ -30,7 +30,7 @@ org.o-ran-sc.nonrtric - enrichment-coordinator-service + information-coordinator-service 1.2.0-SNAPSHOT @@ -297,11 +297,11 @@ generate - ${project.basedir}/api/ecs-api.json + ${project.basedir}/api/ics-api.json openapi-yaml ${project.basedir}/api - ecs-api.yaml + ics-api.yaml @@ -314,7 +314,7 @@ false - generate-enrichment-coordinator-service-image + generate-information-coordinator-service-image package build @@ -323,7 +323,7 @@ ${env.CONTAINER_PULL_REGISTRY} - o-ran-sc/nonrtric-enrichment-coordinator-service:${project.version} + o-ran-sc/nonrtric-information-coordinator-service:${project.version} try ${basedir} @@ -340,7 +340,7 @@ - push-enrichment-coordinator-service-image + push-information-coordinator-service-image build push @@ -350,7 +350,7 @@ ${env.CONTAINER_PUSH_REGISTRY} - o-ran-sc/nonrtric-enrichment-coordinator-service:${project.version} + o-ran-sc/nonrtric-information-coordinator-service:${project.version} ${basedir} Dockerfile @@ -380,4 +380,4 @@ JIRA https://jira.o-ran-sc.org/ - + \ No newline at end of file diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/Application.java b/information-coordinator-service/src/main/java/org/oransc/ics/Application.java similarity index 97% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/Application.java rename to information-coordinator-service/src/main/java/org/oransc/ics/Application.java index 3c0156cb..46caac11 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/Application.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/Application.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment; +package org.oransc.ics; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/BeanFactory.java b/information-coordinator-service/src/main/java/org/oransc/ics/BeanFactory.java similarity index 93% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/BeanFactory.java rename to information-coordinator-service/src/main/java/org/oransc/ics/BeanFactory.java index 1d493bb1..6adf8ad8 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/BeanFactory.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/BeanFactory.java @@ -18,17 +18,17 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment; +package org.oransc.ics; import com.fasterxml.jackson.databind.ObjectMapper; import java.lang.invoke.MethodHandles; import org.apache.catalina.connector.Connector; -import org.oransc.enrichment.configuration.ApplicationConfig; -import org.oransc.enrichment.controllers.r1producer.ProducerCallbacks; -import org.oransc.enrichment.repository.InfoJobs; -import org.oransc.enrichment.repository.InfoTypes; +import org.oransc.ics.configuration.ApplicationConfig; +import org.oransc.ics.controllers.r1producer.ProducerCallbacks; +import org.oransc.ics.repository.InfoJobs; +import org.oransc.ics.repository.InfoTypes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/SwaggerConfig.java b/information-coordinator-service/src/main/java/org/oransc/ics/SwaggerConfig.java similarity index 94% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/SwaggerConfig.java rename to information-coordinator-service/src/main/java/org/oransc/ics/SwaggerConfig.java index 5f61e312..42ffe83f 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/SwaggerConfig.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/SwaggerConfig.java @@ -18,17 +18,17 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment; +package org.oransc.ics; import io.swagger.v3.oas.annotations.OpenAPIDefinition; import io.swagger.v3.oas.annotations.info.Info; import io.swagger.v3.oas.annotations.info.License; import io.swagger.v3.oas.annotations.tags.Tag; -import org.oransc.enrichment.controllers.StatusController; -import org.oransc.enrichment.controllers.a1e.A1eConsts; -import org.oransc.enrichment.controllers.r1consumer.ConsumerConsts; -import org.oransc.enrichment.controllers.r1producer.ProducerConsts; +import org.oransc.ics.controllers.StatusController; +import org.oransc.ics.controllers.a1e.A1eConsts; +import org.oransc.ics.controllers.r1consumer.ConsumerConsts; +import org.oransc.ics.controllers.r1producer.ProducerConsts; /** * Swagger configuration class that uses swagger documentation type and scans diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/clients/AsyncRestClient.java b/information-coordinator-service/src/main/java/org/oransc/ics/clients/AsyncRestClient.java similarity index 98% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/clients/AsyncRestClient.java rename to information-coordinator-service/src/main/java/org/oransc/ics/clients/AsyncRestClient.java index b7f23b1f..1de74377 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/clients/AsyncRestClient.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/clients/AsyncRestClient.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.clients; +package org.oransc.ics.clients; import io.netty.channel.ChannelOption; import io.netty.handler.ssl.SslContext; @@ -28,7 +28,7 @@ import io.netty.handler.timeout.WriteTimeoutHandler; import java.lang.invoke.MethodHandles; import java.util.concurrent.atomic.AtomicInteger; -import org.oransc.enrichment.configuration.WebClientConfig.HttpProxyConfig; +import org.oransc.ics.configuration.WebClientConfig.HttpProxyConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.MediaType; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/clients/AsyncRestClientFactory.java b/information-coordinator-service/src/main/java/org/oransc/ics/clients/AsyncRestClientFactory.java similarity index 97% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/clients/AsyncRestClientFactory.java rename to information-coordinator-service/src/main/java/org/oransc/ics/clients/AsyncRestClientFactory.java index 4865df56..cfac5cf1 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/clients/AsyncRestClientFactory.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/clients/AsyncRestClientFactory.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.clients; +package org.oransc.ics.clients; import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.SslContextBuilder; @@ -41,8 +41,8 @@ import java.util.stream.Collectors; import javax.net.ssl.KeyManagerFactory; -import org.oransc.enrichment.configuration.WebClientConfig; -import org.oransc.enrichment.configuration.WebClientConfig.HttpProxyConfig; +import org.oransc.ics.configuration.WebClientConfig; +import org.oransc.ics.configuration.WebClientConfig.HttpProxyConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.util.ResourceUtils; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/configuration/ApplicationConfig.java b/information-coordinator-service/src/main/java/org/oransc/ics/configuration/ApplicationConfig.java similarity index 96% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/configuration/ApplicationConfig.java rename to information-coordinator-service/src/main/java/org/oransc/ics/configuration/ApplicationConfig.java index 5493fd80..0a63d423 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/configuration/ApplicationConfig.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/configuration/ApplicationConfig.java @@ -18,11 +18,11 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.configuration; +package org.oransc.ics.configuration; import lombok.Getter; -import org.oransc.enrichment.configuration.WebClientConfig.HttpProxyConfig; +import org.oransc.ics.configuration.WebClientConfig.HttpProxyConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/configuration/WebClientConfig.java b/information-coordinator-service/src/main/java/org/oransc/ics/configuration/WebClientConfig.java similarity index 96% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/configuration/WebClientConfig.java rename to information-coordinator-service/src/main/java/org/oransc/ics/configuration/WebClientConfig.java index 0b682486..12e9cfd8 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/configuration/WebClientConfig.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/configuration/WebClientConfig.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.configuration; +package org.oransc.ics.configuration; import org.immutables.value.Value; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/ErrorResponse.java b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/ErrorResponse.java similarity index 97% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/ErrorResponse.java rename to information-coordinator-service/src/main/java/org/oransc/ics/controllers/ErrorResponse.java index 1539d8c2..25b0c165 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/ErrorResponse.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/ErrorResponse.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.controllers; +package org.oransc.ics.controllers; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -26,7 +26,7 @@ import com.google.gson.annotations.SerializedName; import io.swagger.v3.oas.annotations.media.Schema; -import org.oransc.enrichment.exceptions.ServiceException; +import org.oransc.ics.exceptions.ServiceException; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/StatusController.java b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/StatusController.java similarity index 95% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/StatusController.java rename to information-coordinator-service/src/main/java/org/oransc/ics/controllers/StatusController.java index 9e215486..1e9cc980 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/StatusController.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/StatusController.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.controllers; +package org.oransc.ics.controllers; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.annotations.SerializedName; @@ -31,9 +31,9 @@ import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.tags.Tag; import org.immutables.gson.Gson; -import org.oransc.enrichment.repository.InfoJobs; -import org.oransc.enrichment.repository.InfoProducers; -import org.oransc.enrichment.repository.InfoTypes; +import org.oransc.ics.repository.InfoJobs; +import org.oransc.ics.repository.InfoProducers; +import org.oransc.ics.repository.InfoTypes; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/VoidResponse.java b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/VoidResponse.java similarity index 95% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/VoidResponse.java rename to information-coordinator-service/src/main/java/org/oransc/ics/controllers/VoidResponse.java index b7c2673c..8fb810d7 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/VoidResponse.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/VoidResponse.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.controllers; +package org.oransc.ics.controllers; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/a1e/A1eCallbacks.java b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/a1e/A1eCallbacks.java similarity index 88% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/a1e/A1eCallbacks.java rename to information-coordinator-service/src/main/java/org/oransc/ics/controllers/a1e/A1eCallbacks.java index 59ac8925..d0fda941 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/a1e/A1eCallbacks.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/a1e/A1eCallbacks.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.controllers.a1e; +package org.oransc.ics.controllers.a1e; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -26,13 +26,13 @@ import com.google.gson.GsonBuilder; import java.lang.invoke.MethodHandles; import java.util.Collection; -import org.oransc.enrichment.clients.AsyncRestClient; -import org.oransc.enrichment.clients.AsyncRestClientFactory; -import org.oransc.enrichment.configuration.ApplicationConfig; -import org.oransc.enrichment.repository.InfoJob; -import org.oransc.enrichment.repository.InfoJobs; -import org.oransc.enrichment.repository.InfoProducers; -import org.oransc.enrichment.repository.InfoType; +import org.oransc.ics.clients.AsyncRestClient; +import org.oransc.ics.clients.AsyncRestClientFactory; +import org.oransc.ics.configuration.ApplicationConfig; +import org.oransc.ics.repository.InfoJob; +import org.oransc.ics.repository.InfoJobs; +import org.oransc.ics.repository.InfoProducers; +import org.oransc.ics.repository.InfoType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/a1e/A1eConsts.java b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/a1e/A1eConsts.java similarity index 97% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/a1e/A1eConsts.java rename to information-coordinator-service/src/main/java/org/oransc/ics/controllers/a1e/A1eConsts.java index 4c1509f8..03d8ce2b 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/a1e/A1eConsts.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/a1e/A1eConsts.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.controllers.a1e; +package org.oransc.ics.controllers.a1e; public class A1eConsts { diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/a1e/A1eController.java b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/a1e/A1eController.java similarity index 96% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/a1e/A1eController.java rename to information-coordinator-service/src/main/java/org/oransc/ics/controllers/a1e/A1eController.java index 8c056fc6..d6e7dc08 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/a1e/A1eController.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/a1e/A1eController.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.controllers.a1e; +package org.oransc.ics.controllers.a1e; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.Gson; @@ -40,16 +40,16 @@ import java.util.ArrayList; import java.util.List; import org.json.JSONObject; -import org.oransc.enrichment.configuration.ApplicationConfig; -import org.oransc.enrichment.controllers.ErrorResponse; -import org.oransc.enrichment.controllers.VoidResponse; -import org.oransc.enrichment.controllers.r1producer.ProducerCallbacks; -import org.oransc.enrichment.exceptions.ServiceException; -import org.oransc.enrichment.repository.InfoJob; -import org.oransc.enrichment.repository.InfoJobs; -import org.oransc.enrichment.repository.InfoProducers; -import org.oransc.enrichment.repository.InfoType; -import org.oransc.enrichment.repository.InfoTypes; +import org.oransc.ics.configuration.ApplicationConfig; +import org.oransc.ics.controllers.ErrorResponse; +import org.oransc.ics.controllers.VoidResponse; +import org.oransc.ics.controllers.r1producer.ProducerCallbacks; +import org.oransc.ics.exceptions.ServiceException; +import org.oransc.ics.repository.InfoJob; +import org.oransc.ics.repository.InfoJobs; +import org.oransc.ics.repository.InfoProducers; +import org.oransc.ics.repository.InfoType; +import org.oransc.ics.repository.InfoTypes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/a1e/A1eEiJobInfo.java b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/a1e/A1eEiJobInfo.java similarity index 98% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/a1e/A1eEiJobInfo.java rename to information-coordinator-service/src/main/java/org/oransc/ics/controllers/a1e/A1eEiJobInfo.java index 61038c3d..e677496d 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/a1e/A1eEiJobInfo.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/a1e/A1eEiJobInfo.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.controllers.a1e; +package org.oransc.ics.controllers.a1e; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.annotations.SerializedName; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/a1e/A1eEiJobStatus.java b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/a1e/A1eEiJobStatus.java similarity index 97% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/a1e/A1eEiJobStatus.java rename to information-coordinator-service/src/main/java/org/oransc/ics/controllers/a1e/A1eEiJobStatus.java index dff0bf3a..65930510 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/a1e/A1eEiJobStatus.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/a1e/A1eEiJobStatus.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.controllers.a1e; +package org.oransc.ics.controllers.a1e; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.annotations.SerializedName; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/a1e/A1eEiTypeInfo.java b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/a1e/A1eEiTypeInfo.java similarity index 95% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/a1e/A1eEiTypeInfo.java rename to information-coordinator-service/src/main/java/org/oransc/ics/controllers/a1e/A1eEiTypeInfo.java index 6202d24b..be5499f1 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/a1e/A1eEiTypeInfo.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/a1e/A1eEiTypeInfo.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.controllers.a1e; +package org.oransc.ics.controllers.a1e; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1consumer/ConsumerCallbacks.java b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerCallbacks.java similarity index 88% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1consumer/ConsumerCallbacks.java rename to information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerCallbacks.java index a57eeeb3..b96c160a 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1consumer/ConsumerCallbacks.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerCallbacks.java @@ -18,16 +18,16 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.controllers.r1consumer; +package org.oransc.ics.controllers.r1consumer; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import org.oransc.enrichment.clients.AsyncRestClient; -import org.oransc.enrichment.clients.AsyncRestClientFactory; -import org.oransc.enrichment.configuration.ApplicationConfig; -import org.oransc.enrichment.repository.InfoType; -import org.oransc.enrichment.repository.InfoTypeSubscriptions; +import org.oransc.ics.clients.AsyncRestClient; +import org.oransc.ics.clients.AsyncRestClientFactory; +import org.oransc.ics.configuration.ApplicationConfig; +import org.oransc.ics.repository.InfoType; +import org.oransc.ics.repository.InfoTypeSubscriptions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import reactor.core.publisher.Mono; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1consumer/ConsumerConsts.java b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerConsts.java similarity index 97% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1consumer/ConsumerConsts.java rename to information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerConsts.java index 2fa00e1f..30095798 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1consumer/ConsumerConsts.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerConsts.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.controllers.r1consumer; +package org.oransc.ics.controllers.r1consumer; public class ConsumerConsts { diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1consumer/ConsumerController.java b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerController.java similarity index 97% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1consumer/ConsumerController.java rename to information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerController.java index b108380b..1a193693 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1consumer/ConsumerController.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerController.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.controllers.r1consumer; +package org.oransc.ics.controllers.r1consumer; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.Gson; @@ -41,17 +41,17 @@ import java.util.Collection; import java.util.List; import org.json.JSONObject; -import org.oransc.enrichment.controllers.ErrorResponse; -import org.oransc.enrichment.controllers.VoidResponse; -import org.oransc.enrichment.controllers.r1producer.ProducerCallbacks; -import org.oransc.enrichment.exceptions.ServiceException; -import org.oransc.enrichment.repository.InfoJob; -import org.oransc.enrichment.repository.InfoJobs; -import org.oransc.enrichment.repository.InfoProducer; -import org.oransc.enrichment.repository.InfoProducers; -import org.oransc.enrichment.repository.InfoType; -import org.oransc.enrichment.repository.InfoTypeSubscriptions; -import org.oransc.enrichment.repository.InfoTypes; +import org.oransc.ics.controllers.ErrorResponse; +import org.oransc.ics.controllers.VoidResponse; +import org.oransc.ics.controllers.r1producer.ProducerCallbacks; +import org.oransc.ics.exceptions.ServiceException; +import org.oransc.ics.repository.InfoJob; +import org.oransc.ics.repository.InfoJobs; +import org.oransc.ics.repository.InfoProducer; +import org.oransc.ics.repository.InfoProducers; +import org.oransc.ics.repository.InfoType; +import org.oransc.ics.repository.InfoTypeSubscriptions; +import org.oransc.ics.repository.InfoTypes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1consumer/ConsumerInfoTypeInfo.java b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerInfoTypeInfo.java similarity index 97% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1consumer/ConsumerInfoTypeInfo.java rename to information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerInfoTypeInfo.java index 92ee19bd..682c62b6 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1consumer/ConsumerInfoTypeInfo.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerInfoTypeInfo.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.controllers.r1consumer; +package org.oransc.ics.controllers.r1consumer; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.annotations.SerializedName; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1consumer/ConsumerJobInfo.java b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerJobInfo.java similarity index 98% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1consumer/ConsumerJobInfo.java rename to information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerJobInfo.java index 4f91d640..f90c0be6 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1consumer/ConsumerJobInfo.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerJobInfo.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.controllers.r1consumer; +package org.oransc.ics.controllers.r1consumer; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.annotations.SerializedName; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1consumer/ConsumerJobStatus.java b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerJobStatus.java similarity index 97% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1consumer/ConsumerJobStatus.java rename to information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerJobStatus.java index 3e8bb884..12d05ed2 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1consumer/ConsumerJobStatus.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerJobStatus.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.controllers.r1consumer; +package org.oransc.ics.controllers.r1consumer; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.annotations.SerializedName; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1consumer/ConsumerTypeRegistrationInfo.java b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerTypeRegistrationInfo.java similarity index 97% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1consumer/ConsumerTypeRegistrationInfo.java rename to information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerTypeRegistrationInfo.java index 3d1533fc..73263ec1 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1consumer/ConsumerTypeRegistrationInfo.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerTypeRegistrationInfo.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.controllers.r1consumer; +package org.oransc.ics.controllers.r1consumer; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.annotations.SerializedName; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1consumer/ConsumerTypeSubscriptionInfo.java b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerTypeSubscriptionInfo.java similarity index 97% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1consumer/ConsumerTypeSubscriptionInfo.java rename to information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerTypeSubscriptionInfo.java index a0c4722d..d420c574 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1consumer/ConsumerTypeSubscriptionInfo.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerTypeSubscriptionInfo.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.controllers.r1consumer; +package org.oransc.ics.controllers.r1consumer; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.annotations.SerializedName; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1producer/ProducerCallbacks.java b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1producer/ProducerCallbacks.java similarity index 91% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1producer/ProducerCallbacks.java rename to information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1producer/ProducerCallbacks.java index 558ae799..c861d203 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1producer/ProducerCallbacks.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1producer/ProducerCallbacks.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.controllers.r1producer; +package org.oransc.ics.controllers.r1producer; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -27,13 +27,13 @@ import java.lang.invoke.MethodHandles; import java.time.Duration; import java.util.Collection; -import org.oransc.enrichment.clients.AsyncRestClient; -import org.oransc.enrichment.clients.AsyncRestClientFactory; -import org.oransc.enrichment.configuration.ApplicationConfig; -import org.oransc.enrichment.repository.InfoJob; -import org.oransc.enrichment.repository.InfoJobs; -import org.oransc.enrichment.repository.InfoProducer; -import org.oransc.enrichment.repository.InfoProducers; +import org.oransc.ics.clients.AsyncRestClient; +import org.oransc.ics.clients.AsyncRestClientFactory; +import org.oransc.ics.configuration.ApplicationConfig; +import org.oransc.ics.repository.InfoJob; +import org.oransc.ics.repository.InfoJobs; +import org.oransc.ics.repository.InfoProducer; +import org.oransc.ics.repository.InfoProducers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1producer/ProducerConsts.java b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1producer/ProducerConsts.java similarity index 95% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1producer/ProducerConsts.java rename to information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1producer/ProducerConsts.java index a1be7c62..fee05e37 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1producer/ProducerConsts.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1producer/ProducerConsts.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.controllers.r1producer; +package org.oransc.ics.controllers.r1producer; public class ProducerConsts { public static final String PRODUCER_API_NAME = "Data producer (registration)"; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1producer/ProducerController.java b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1producer/ProducerController.java similarity index 96% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1producer/ProducerController.java rename to information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1producer/ProducerController.java index cad6a042..5229176b 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1producer/ProducerController.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1producer/ProducerController.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.controllers.r1producer; +package org.oransc.ics.controllers.r1producer; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -38,16 +38,16 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.oransc.enrichment.controllers.ErrorResponse; -import org.oransc.enrichment.controllers.VoidResponse; -import org.oransc.enrichment.exceptions.ServiceException; -import org.oransc.enrichment.repository.InfoJob; -import org.oransc.enrichment.repository.InfoJobs; -import org.oransc.enrichment.repository.InfoProducer; -import org.oransc.enrichment.repository.InfoProducers; -import org.oransc.enrichment.repository.InfoType; -import org.oransc.enrichment.repository.InfoTypeSubscriptions; -import org.oransc.enrichment.repository.InfoTypes; +import org.oransc.ics.controllers.ErrorResponse; +import org.oransc.ics.controllers.VoidResponse; +import org.oransc.ics.exceptions.ServiceException; +import org.oransc.ics.repository.InfoJob; +import org.oransc.ics.repository.InfoJobs; +import org.oransc.ics.repository.InfoProducer; +import org.oransc.ics.repository.InfoProducers; +import org.oransc.ics.repository.InfoType; +import org.oransc.ics.repository.InfoTypeSubscriptions; +import org.oransc.ics.repository.InfoTypes; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1producer/ProducerInfoTypeInfo.java b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1producer/ProducerInfoTypeInfo.java similarity index 97% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1producer/ProducerInfoTypeInfo.java rename to information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1producer/ProducerInfoTypeInfo.java index 311b8a7d..64f17f9b 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1producer/ProducerInfoTypeInfo.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1producer/ProducerInfoTypeInfo.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.controllers.r1producer; +package org.oransc.ics.controllers.r1producer; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.annotations.SerializedName; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1producer/ProducerJobInfo.java b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1producer/ProducerJobInfo.java similarity index 96% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1producer/ProducerJobInfo.java rename to information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1producer/ProducerJobInfo.java index 1cd3734f..8b42ea8f 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1producer/ProducerJobInfo.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1producer/ProducerJobInfo.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.controllers.r1producer; +package org.oransc.ics.controllers.r1producer; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.annotations.SerializedName; @@ -26,7 +26,7 @@ import com.google.gson.annotations.SerializedName; import io.swagger.v3.oas.annotations.media.Schema; import org.immutables.gson.Gson; -import org.oransc.enrichment.repository.InfoJob; +import org.oransc.ics.repository.InfoJob; @Gson.TypeAdapters @Schema( diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1producer/ProducerRegistrationInfo.java b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1producer/ProducerRegistrationInfo.java similarity index 97% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1producer/ProducerRegistrationInfo.java rename to information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1producer/ProducerRegistrationInfo.java index 28a84035..2e395dc7 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1producer/ProducerRegistrationInfo.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1producer/ProducerRegistrationInfo.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.controllers.r1producer; +package org.oransc.ics.controllers.r1producer; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.annotations.SerializedName; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1producer/ProducerStatusInfo.java b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1producer/ProducerStatusInfo.java similarity index 97% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1producer/ProducerStatusInfo.java rename to information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1producer/ProducerStatusInfo.java index 3bb2a051..f4c49cd1 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/r1producer/ProducerStatusInfo.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/controllers/r1producer/ProducerStatusInfo.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.controllers.r1producer; +package org.oransc.ics.controllers.r1producer; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.annotations.SerializedName; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/exceptions/ServiceException.java b/information-coordinator-service/src/main/java/org/oransc/ics/exceptions/ServiceException.java similarity index 97% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/exceptions/ServiceException.java rename to information-coordinator-service/src/main/java/org/oransc/ics/exceptions/ServiceException.java index bce786f9..e6b0cc81 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/exceptions/ServiceException.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/exceptions/ServiceException.java @@ -16,7 +16,7 @@ * ============LICENSE_END======================================================================== */ -package org.oransc.enrichment.exceptions; +package org.oransc.ics.exceptions; import lombok.Getter; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/InfoJob.java b/information-coordinator-service/src/main/java/org/oransc/ics/repository/InfoJob.java similarity index 97% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/InfoJob.java rename to information-coordinator-service/src/main/java/org/oransc/ics/repository/InfoJob.java index 9d679be9..ffecdc9d 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/InfoJob.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/repository/InfoJob.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.repository; +package org.oransc.ics.repository; import java.lang.invoke.MethodHandles; import java.time.Instant; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/InfoJobs.java b/information-coordinator-service/src/main/java/org/oransc/ics/repository/InfoJobs.java similarity index 96% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/InfoJobs.java rename to information-coordinator-service/src/main/java/org/oransc/ics/repository/InfoJobs.java index 7469e08f..1654e1f5 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/InfoJobs.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/repository/InfoJobs.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.repository; +package org.oransc.ics.repository; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -38,9 +38,9 @@ import java.util.Map; import java.util.ServiceLoader; import java.util.Vector; -import org.oransc.enrichment.configuration.ApplicationConfig; -import org.oransc.enrichment.controllers.r1producer.ProducerCallbacks; -import org.oransc.enrichment.exceptions.ServiceException; +import org.oransc.ics.configuration.ApplicationConfig; +import org.oransc.ics.controllers.r1producer.ProducerCallbacks; +import org.oransc.ics.exceptions.ServiceException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/InfoProducer.java b/information-coordinator-service/src/main/java/org/oransc/ics/repository/InfoProducer.java similarity index 98% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/InfoProducer.java rename to information-coordinator-service/src/main/java/org/oransc/ics/repository/InfoProducer.java index 41d1c0b8..01ec2636 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/InfoProducer.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/repository/InfoProducer.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.repository; +package org.oransc.ics.repository; import java.util.Collection; import java.util.HashSet; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/InfoProducers.java b/information-coordinator-service/src/main/java/org/oransc/ics/repository/InfoProducers.java similarity index 96% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/InfoProducers.java rename to information-coordinator-service/src/main/java/org/oransc/ics/repository/InfoProducers.java index 1102e36a..9d98eaad 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/InfoProducers.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/repository/InfoProducers.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.repository; +package org.oransc.ics.repository; import java.lang.invoke.MethodHandles; import java.util.ArrayList; @@ -30,9 +30,9 @@ import java.util.Vector; import lombok.Builder; import lombok.Getter; -import org.oransc.enrichment.controllers.a1e.A1eCallbacks; -import org.oransc.enrichment.controllers.r1producer.ProducerCallbacks; -import org.oransc.enrichment.exceptions.ServiceException; +import org.oransc.ics.controllers.a1e.A1eCallbacks; +import org.oransc.ics.controllers.r1producer.ProducerCallbacks; +import org.oransc.ics.exceptions.ServiceException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/InfoType.java b/information-coordinator-service/src/main/java/org/oransc/ics/repository/InfoType.java similarity index 96% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/InfoType.java rename to information-coordinator-service/src/main/java/org/oransc/ics/repository/InfoType.java index 3f8dd9c2..69ae67c7 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/InfoType.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/repository/InfoType.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.repository; +package org.oransc.ics.repository; import lombok.Getter; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/InfoTypeSubscriptions.java b/information-coordinator-service/src/main/java/org/oransc/ics/repository/InfoTypeSubscriptions.java similarity index 98% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/InfoTypeSubscriptions.java rename to information-coordinator-service/src/main/java/org/oransc/ics/repository/InfoTypeSubscriptions.java index 533199ff..a72a259b 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/InfoTypeSubscriptions.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/repository/InfoTypeSubscriptions.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.repository; +package org.oransc.ics.repository; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -41,8 +41,8 @@ import java.util.function.Function; import lombok.Builder; import lombok.Getter; -import org.oransc.enrichment.configuration.ApplicationConfig; -import org.oransc.enrichment.exceptions.ServiceException; +import org.oransc.ics.configuration.ApplicationConfig; +import org.oransc.ics.exceptions.ServiceException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/InfoTypes.java b/information-coordinator-service/src/main/java/org/oransc/ics/repository/InfoTypes.java similarity index 96% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/InfoTypes.java rename to information-coordinator-service/src/main/java/org/oransc/ics/repository/InfoTypes.java index c23875b6..9d2abc22 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/InfoTypes.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/repository/InfoTypes.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.repository; +package org.oransc.ics.repository; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -38,8 +38,8 @@ import java.util.Map; import java.util.ServiceLoader; import java.util.Vector; -import org.oransc.enrichment.configuration.ApplicationConfig; -import org.oransc.enrichment.exceptions.ServiceException; +import org.oransc.ics.configuration.ApplicationConfig; +import org.oransc.ics.exceptions.ServiceException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/MultiMap.java b/information-coordinator-service/src/main/java/org/oransc/ics/repository/MultiMap.java similarity index 97% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/MultiMap.java rename to information-coordinator-service/src/main/java/org/oransc/ics/repository/MultiMap.java index 25e559ce..0f3be0a2 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/MultiMap.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/repository/MultiMap.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.repository; +package org.oransc.ics.repository; import java.util.Collection; import java.util.Collections; diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/tasks/ProducerSupervision.java b/information-coordinator-service/src/main/java/org/oransc/ics/tasks/ProducerSupervision.java similarity index 90% rename from enrichment-coordinator-service/src/main/java/org/oransc/enrichment/tasks/ProducerSupervision.java rename to information-coordinator-service/src/main/java/org/oransc/ics/tasks/ProducerSupervision.java index 08c5fc85..690f47cd 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/tasks/ProducerSupervision.java +++ b/information-coordinator-service/src/main/java/org/oransc/ics/tasks/ProducerSupervision.java @@ -18,15 +18,15 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.tasks; +package org.oransc.ics.tasks; -import org.oransc.enrichment.configuration.ApplicationConfig; -import org.oransc.enrichment.controllers.a1e.A1eCallbacks; -import org.oransc.enrichment.controllers.r1producer.ProducerCallbacks; -import org.oransc.enrichment.repository.InfoJob; -import org.oransc.enrichment.repository.InfoJobs; -import org.oransc.enrichment.repository.InfoProducer; -import org.oransc.enrichment.repository.InfoProducers; +import org.oransc.ics.configuration.ApplicationConfig; +import org.oransc.ics.controllers.a1e.A1eCallbacks; +import org.oransc.ics.controllers.r1producer.ProducerCallbacks; +import org.oransc.ics.repository.InfoJob; +import org.oransc.ics.repository.InfoJobs; +import org.oransc.ics.repository.InfoProducer; +import org.oransc.ics.repository.InfoProducers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/enrichment-coordinator-service/src/test/java/org/oransc/enrichment/ApplicationTest.java b/information-coordinator-service/src/test/java/org/oransc/ics/ApplicationTest.java similarity index 95% rename from enrichment-coordinator-service/src/test/java/org/oransc/enrichment/ApplicationTest.java rename to information-coordinator-service/src/test/java/org/oransc/ics/ApplicationTest.java index 8c8ce5f1..1d53403a 100644 --- a/enrichment-coordinator-service/src/test/java/org/oransc/enrichment/ApplicationTest.java +++ b/information-coordinator-service/src/test/java/org/oransc/ics/ApplicationTest.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment; +package org.oransc.ics; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -41,40 +41,40 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.oransc.enrichment.clients.AsyncRestClient; -import org.oransc.enrichment.clients.AsyncRestClientFactory; -import org.oransc.enrichment.configuration.ApplicationConfig; -import org.oransc.enrichment.configuration.ImmutableHttpProxyConfig; -import org.oransc.enrichment.configuration.ImmutableWebClientConfig; -import org.oransc.enrichment.configuration.WebClientConfig; -import org.oransc.enrichment.configuration.WebClientConfig.HttpProxyConfig; -import org.oransc.enrichment.controller.ConsumerSimulatorController; -import org.oransc.enrichment.controller.ProducerSimulatorController; -import org.oransc.enrichment.controllers.a1e.A1eConsts; -import org.oransc.enrichment.controllers.a1e.A1eEiJobInfo; -import org.oransc.enrichment.controllers.a1e.A1eEiJobStatus; -import org.oransc.enrichment.controllers.a1e.A1eEiTypeInfo; -import org.oransc.enrichment.controllers.r1consumer.ConsumerConsts; -import org.oransc.enrichment.controllers.r1consumer.ConsumerInfoTypeInfo; -import org.oransc.enrichment.controllers.r1consumer.ConsumerJobInfo; -import org.oransc.enrichment.controllers.r1consumer.ConsumerJobStatus; -import org.oransc.enrichment.controllers.r1consumer.ConsumerTypeRegistrationInfo; -import org.oransc.enrichment.controllers.r1consumer.ConsumerTypeSubscriptionInfo; -import org.oransc.enrichment.controllers.r1producer.ProducerCallbacks; -import org.oransc.enrichment.controllers.r1producer.ProducerConsts; -import org.oransc.enrichment.controllers.r1producer.ProducerInfoTypeInfo; -import org.oransc.enrichment.controllers.r1producer.ProducerJobInfo; -import org.oransc.enrichment.controllers.r1producer.ProducerRegistrationInfo; -import org.oransc.enrichment.controllers.r1producer.ProducerStatusInfo; -import org.oransc.enrichment.exceptions.ServiceException; -import org.oransc.enrichment.repository.InfoJob; -import org.oransc.enrichment.repository.InfoJobs; -import org.oransc.enrichment.repository.InfoProducer; -import org.oransc.enrichment.repository.InfoProducers; -import org.oransc.enrichment.repository.InfoType; -import org.oransc.enrichment.repository.InfoTypeSubscriptions; -import org.oransc.enrichment.repository.InfoTypes; -import org.oransc.enrichment.tasks.ProducerSupervision; +import org.oransc.ics.clients.AsyncRestClient; +import org.oransc.ics.clients.AsyncRestClientFactory; +import org.oransc.ics.configuration.ApplicationConfig; +import org.oransc.ics.configuration.ImmutableHttpProxyConfig; +import org.oransc.ics.configuration.ImmutableWebClientConfig; +import org.oransc.ics.configuration.WebClientConfig; +import org.oransc.ics.configuration.WebClientConfig.HttpProxyConfig; +import org.oransc.ics.controller.ConsumerSimulatorController; +import org.oransc.ics.controller.ProducerSimulatorController; +import org.oransc.ics.controllers.a1e.A1eConsts; +import org.oransc.ics.controllers.a1e.A1eEiJobInfo; +import org.oransc.ics.controllers.a1e.A1eEiJobStatus; +import org.oransc.ics.controllers.a1e.A1eEiTypeInfo; +import org.oransc.ics.controllers.r1consumer.ConsumerConsts; +import org.oransc.ics.controllers.r1consumer.ConsumerInfoTypeInfo; +import org.oransc.ics.controllers.r1consumer.ConsumerJobInfo; +import org.oransc.ics.controllers.r1consumer.ConsumerJobStatus; +import org.oransc.ics.controllers.r1consumer.ConsumerTypeRegistrationInfo; +import org.oransc.ics.controllers.r1consumer.ConsumerTypeSubscriptionInfo; +import org.oransc.ics.controllers.r1producer.ProducerCallbacks; +import org.oransc.ics.controllers.r1producer.ProducerConsts; +import org.oransc.ics.controllers.r1producer.ProducerInfoTypeInfo; +import org.oransc.ics.controllers.r1producer.ProducerJobInfo; +import org.oransc.ics.controllers.r1producer.ProducerRegistrationInfo; +import org.oransc.ics.controllers.r1producer.ProducerStatusInfo; +import org.oransc.ics.exceptions.ServiceException; +import org.oransc.ics.repository.InfoJob; +import org.oransc.ics.repository.InfoJobs; +import org.oransc.ics.repository.InfoProducer; +import org.oransc.ics.repository.InfoProducers; +import org.oransc.ics.repository.InfoType; +import org.oransc.ics.repository.InfoTypeSubscriptions; +import org.oransc.ics.repository.InfoTypes; +import org.oransc.ics.tasks.ProducerSupervision; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -182,7 +182,7 @@ class ApplicationTest { assertThat(jsonObj.remove("servers")).isNotNull(); String indented = jsonObj.toString(4); - try (PrintStream out = new PrintStream(new FileOutputStream("api/ecs-api.json"))) { + try (PrintStream out = new PrintStream(new FileOutputStream("api/ics-api.json"))) { out.print(indented); } } diff --git a/enrichment-coordinator-service/src/test/java/org/oransc/enrichment/MockEnrichmentService.java b/information-coordinator-service/src/test/java/org/oransc/ics/MockEnrichmentService.java similarity index 98% rename from enrichment-coordinator-service/src/test/java/org/oransc/enrichment/MockEnrichmentService.java rename to information-coordinator-service/src/test/java/org/oransc/ics/MockEnrichmentService.java index 47df78a2..7c296ec0 100644 --- a/enrichment-coordinator-service/src/test/java/org/oransc/enrichment/MockEnrichmentService.java +++ b/information-coordinator-service/src/test/java/org/oransc/ics/MockEnrichmentService.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment; +package org.oransc.ics; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/enrichment-coordinator-service/src/test/java/org/oransc/enrichment/clients/AsyncRestClientTest.java b/information-coordinator-service/src/test/java/org/oransc/ics/clients/AsyncRestClientTest.java similarity index 99% rename from enrichment-coordinator-service/src/test/java/org/oransc/enrichment/clients/AsyncRestClientTest.java rename to information-coordinator-service/src/test/java/org/oransc/ics/clients/AsyncRestClientTest.java index 364203a2..67354478 100644 --- a/enrichment-coordinator-service/src/test/java/org/oransc/enrichment/clients/AsyncRestClientTest.java +++ b/information-coordinator-service/src/test/java/org/oransc/ics/clients/AsyncRestClientTest.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.clients; +package org.oransc.ics.clients; import io.netty.util.internal.logging.InternalLoggerFactory; import io.netty.util.internal.logging.JdkLoggerFactory; diff --git a/enrichment-coordinator-service/src/test/java/org/oransc/enrichment/controller/ConsumerSimulatorController.java b/information-coordinator-service/src/test/java/org/oransc/ics/controller/ConsumerSimulatorController.java similarity index 93% rename from enrichment-coordinator-service/src/test/java/org/oransc/enrichment/controller/ConsumerSimulatorController.java rename to information-coordinator-service/src/test/java/org/oransc/ics/controller/ConsumerSimulatorController.java index 27160f13..3d69ee69 100644 --- a/enrichment-coordinator-service/src/test/java/org/oransc/enrichment/controller/ConsumerSimulatorController.java +++ b/information-coordinator-service/src/test/java/org/oransc/ics/controller/ConsumerSimulatorController.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.controller; +package org.oransc.ics.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; @@ -34,11 +34,11 @@ import java.util.List; import lombok.Getter; -import org.oransc.enrichment.controllers.VoidResponse; -import org.oransc.enrichment.controllers.a1e.A1eConsts; -import org.oransc.enrichment.controllers.a1e.A1eEiJobStatus; -import org.oransc.enrichment.controllers.r1consumer.ConsumerConsts; -import org.oransc.enrichment.controllers.r1consumer.ConsumerTypeRegistrationInfo; +import org.oransc.ics.controllers.VoidResponse; +import org.oransc.ics.controllers.a1e.A1eConsts; +import org.oransc.ics.controllers.a1e.A1eEiJobStatus; +import org.oransc.ics.controllers.r1consumer.ConsumerConsts; +import org.oransc.ics.controllers.r1consumer.ConsumerTypeRegistrationInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; diff --git a/enrichment-coordinator-service/src/test/java/org/oransc/enrichment/controller/ProducerSimulatorController.java b/information-coordinator-service/src/test/java/org/oransc/ics/controller/ProducerSimulatorController.java similarity index 96% rename from enrichment-coordinator-service/src/test/java/org/oransc/enrichment/controller/ProducerSimulatorController.java rename to information-coordinator-service/src/test/java/org/oransc/ics/controller/ProducerSimulatorController.java index 66af67cb..55d32b02 100644 --- a/enrichment-coordinator-service/src/test/java/org/oransc/enrichment/controller/ProducerSimulatorController.java +++ b/information-coordinator-service/src/test/java/org/oransc/ics/controller/ProducerSimulatorController.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oransc.enrichment.controller; +package org.oransc.ics.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; @@ -34,10 +34,10 @@ import java.util.List; import lombok.Getter; -import org.oransc.enrichment.controllers.ErrorResponse; -import org.oransc.enrichment.controllers.VoidResponse; -import org.oransc.enrichment.controllers.r1producer.ProducerConsts; -import org.oransc.enrichment.controllers.r1producer.ProducerJobInfo; +import org.oransc.ics.controllers.ErrorResponse; +import org.oransc.ics.controllers.VoidResponse; +import org.oransc.ics.controllers.r1producer.ProducerConsts; +import org.oransc.ics.controllers.r1producer.ProducerJobInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; diff --git a/pom.xml b/pom.xml index e0665a11..d4f55002 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ policy-agent - enrichment-coordinator-service + information-coordinator-service r-app-catalogue helm-manager dmaap-adaptor-java -- 2.16.6