diff options
Diffstat (limited to 'src/main/java/org')
67 files changed, 166 insertions, 179 deletions
diff --git a/src/main/java/org/onap/pnfsimulator/Main.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/Main.java index 708f27f..17ff65b 100644 --- a/src/main/java/org/onap/pnfsimulator/Main.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/Main.java @@ -18,12 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator; +package org.onap.integration.simulators.nfsimulator.vesclient; import javax.annotation.PostConstruct; -import org.onap.pnfsimulator.filesystem.WatcherService; -import org.onap.pnfsimulator.template.FsToDbTemplateSynchronizer; +import org.onap.integration.simulators.nfsimulator.vesclient.template.FsToDbTemplateSynchronizer; +import org.onap.integration.simulators.nfsimulator.vesclient.filesystem.WatcherService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/src/main/java/org/onap/pnfsimulator/SwaggerConfig.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/SwaggerConfig.java index b6c6187..c709729 100644 --- a/src/main/java/org/onap/pnfsimulator/SwaggerConfig.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/SwaggerConfig.java @@ -18,9 +18,9 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator; +package org.onap.integration.simulators.nfsimulator.vesclient; -import org.onap.pnfsimulator.simulator.client.utils.ssl.SslAuthenticationHelper; +import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl.SslAuthenticationHelper; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/org/onap/pnfsimulator/db/Row.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/db/Row.java index 12745bf..cd9edff 100644 --- a/src/main/java/org/onap/pnfsimulator/db/Row.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/db/Row.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.db; +package org.onap.integration.simulators.nfsimulator.vesclient.db; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/org/onap/pnfsimulator/db/Storage.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/db/Storage.java index ad98ce0..7e9a378 100644 --- a/src/main/java/org/onap/pnfsimulator/db/Storage.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/db/Storage.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.db; +package org.onap.integration.simulators.nfsimulator.vesclient.db; import com.google.gson.JsonObject; diff --git a/src/main/java/org/onap/pnfsimulator/event/EventData.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/event/EventData.java index ff85367..7ebdfba 100644 --- a/src/main/java/org/onap/pnfsimulator/event/EventData.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/event/EventData.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.event; +package org.onap.integration.simulators.nfsimulator.vesclient.event; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Builder; diff --git a/src/main/java/org/onap/pnfsimulator/event/EventDataRepository.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/event/EventDataRepository.java index d1a66ab..67f4e2f 100644 --- a/src/main/java/org/onap/pnfsimulator/event/EventDataRepository.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/event/EventDataRepository.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.event; +package org.onap.integration.simulators.nfsimulator.vesclient.event; import org.springframework.data.mongodb.repository.MongoRepository; diff --git a/src/main/java/org/onap/pnfsimulator/event/EventDataService.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/event/EventDataService.java index 266d56b..638afee 100644 --- a/src/main/java/org/onap/pnfsimulator/event/EventDataService.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/event/EventDataService.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.event; +package org.onap.integration.simulators.nfsimulator.vesclient.event; import com.google.gson.JsonObject; diff --git a/src/main/java/org/onap/pnfsimulator/filesystem/WatcherConfig.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/filesystem/WatcherConfig.java index 3535e33..3d99a03 100644 --- a/src/main/java/org/onap/pnfsimulator/filesystem/WatcherConfig.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/filesystem/WatcherConfig.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.filesystem; +package org.onap.integration.simulators.nfsimulator.vesclient.filesystem; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/org/onap/pnfsimulator/filesystem/WatcherEventProcessor.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/filesystem/WatcherEventProcessor.java index c03491a..15c5d7b 100644 --- a/src/main/java/org/onap/pnfsimulator/filesystem/WatcherEventProcessor.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/filesystem/WatcherEventProcessor.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.filesystem; +package org.onap.integration.simulators.nfsimulator.vesclient.filesystem; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -36,8 +36,8 @@ import java.util.stream.Stream; import lombok.extern.slf4j.Slf4j; import org.bson.BSONException; import org.bson.json.JsonParseException; -import org.onap.pnfsimulator.db.Storage; -import org.onap.pnfsimulator.template.Template; +import org.onap.integration.simulators.nfsimulator.vesclient.db.Storage; +import org.onap.integration.simulators.nfsimulator.vesclient.template.Template; import org.bson.Document; @Slf4j diff --git a/src/main/java/org/onap/pnfsimulator/filesystem/WatcherService.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/filesystem/WatcherService.java index 26b684d..3d1a9cf 100644 --- a/src/main/java/org/onap/pnfsimulator/filesystem/WatcherService.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/filesystem/WatcherService.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.filesystem; +package org.onap.integration.simulators.nfsimulator.vesclient.filesystem; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; diff --git a/src/main/java/org/onap/pnfsimulator/filesystem/WatcherThread.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/filesystem/WatcherThread.java index a202b1f..4695ff4 100644 --- a/src/main/java/org/onap/pnfsimulator/filesystem/WatcherThread.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/filesystem/WatcherThread.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.filesystem; +package org.onap.integration.simulators.nfsimulator.vesclient.filesystem; import java.io.IOException; import java.nio.file.FileSystems; @@ -29,8 +29,8 @@ import java.nio.file.WatchEvent; import java.nio.file.WatchKey; import java.nio.file.WatchService; import lombok.extern.slf4j.Slf4j; -import org.onap.pnfsimulator.db.Storage; -import org.onap.pnfsimulator.template.Template; +import org.onap.integration.simulators.nfsimulator.vesclient.db.Storage; +import org.onap.integration.simulators.nfsimulator.vesclient.template.Template; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/onap/pnfsimulator/logging/MdcVariables.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/logging/MdcVariables.java index 4feb168..eb41df5 100644 --- a/src/main/java/org/onap/pnfsimulator/logging/MdcVariables.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/logging/MdcVariables.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.logging; +package org.onap.integration.simulators.nfsimulator.vesclient.logging; public final class MdcVariables { diff --git a/src/main/java/org/onap/pnfsimulator/rest/SimulatorController.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/SimulatorController.java index f2c70dd..d9aebe3 100644 --- a/src/main/java/org/onap/pnfsimulator/rest/SimulatorController.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/SimulatorController.java @@ -18,20 +18,21 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.rest; +package org.onap.integration.simulators.nfsimulator.vesclient.rest; import com.google.common.collect.ImmutableMap; import com.google.gson.JsonSyntaxException; import org.json.JSONException; -import org.onap.pnfsimulator.event.EventData; -import org.onap.pnfsimulator.event.EventDataService; -import org.onap.pnfsimulator.rest.model.FullEvent; -import org.onap.pnfsimulator.rest.model.SimulatorRequest; -import org.onap.pnfsimulator.rest.util.DateUtil; -import org.onap.pnfsimulator.rest.util.ResponseBuilder; -import org.onap.pnfsimulator.simulator.SimulatorService; -import org.onap.pnfsimulator.simulator.client.HttpResponseAdapter; -import org.onap.pnfsimulator.simulatorconfig.SimulatorConfig; +import org.onap.integration.simulators.nfsimulator.vesclient.event.EventData; +import org.onap.integration.simulators.nfsimulator.vesclient.event.EventDataService; +import org.onap.integration.simulators.nfsimulator.vesclient.logging.MdcVariables; +import org.onap.integration.simulators.nfsimulator.vesclient.rest.model.FullEvent; +import org.onap.integration.simulators.nfsimulator.vesclient.rest.model.SimulatorRequest; +import org.onap.integration.simulators.nfsimulator.vesclient.simulator.SimulatorService; +import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpResponseAdapter; +import org.onap.integration.simulators.nfsimulator.vesclient.simulatorconfig.SimulatorConfig; +import org.onap.integration.simulators.nfsimulator.vesclient.rest.util.DateUtil; +import org.onap.integration.simulators.nfsimulator.vesclient.rest.util.ResponseBuilder; import org.quartz.SchedulerException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -60,15 +61,8 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import static org.onap.pnfsimulator.logging.MdcVariables.INSTANCE_UUID; -import static org.onap.pnfsimulator.logging.MdcVariables.INVOCATION_ID; -import static org.onap.pnfsimulator.logging.MdcVariables.REQUEST_ID; -import static org.onap.pnfsimulator.logging.MdcVariables.RESPONSE_CODE; -import static org.onap.pnfsimulator.logging.MdcVariables.SERVICE_NAME; -import static org.onap.pnfsimulator.logging.MdcVariables.X_INVOCATION_ID; -import static org.onap.pnfsimulator.logging.MdcVariables.X_ONAP_REQUEST_ID; -import static org.onap.pnfsimulator.rest.util.ResponseBuilder.MESSAGE; -import static org.onap.pnfsimulator.rest.util.ResponseBuilder.TIMESTAMP; +import static org.onap.integration.simulators.nfsimulator.vesclient.rest.util.ResponseBuilder.MESSAGE; +import static org.onap.integration.simulators.nfsimulator.vesclient.rest.util.ResponseBuilder.TIMESTAMP; import static org.springframework.http.HttpStatus.BAD_REQUEST; import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; import static org.springframework.http.HttpStatus.NOT_FOUND; @@ -116,24 +110,24 @@ public class SimulatorController { return processRequest(triggerEventRequest); } catch (JSONException | JsonSyntaxException e) { - MDC.put(RESPONSE_CODE, BAD_REQUEST.toString()); + MDC.put(MdcVariables.RESPONSE_CODE, BAD_REQUEST.toString()); LOGGER.warn("Cannot trigger event, invalid json format: {}", e.getMessage()); LOGGER.debug("Received json has invalid format", e); return buildResponse(BAD_REQUEST, ImmutableMap.of(MESSAGE, String .format(INCORRECT_TEMPLATE_MESSAGE, triggerEventRequest.getTemplateName(), e.getMessage()))); } catch (GeneralSecurityException e) { - MDC.put(RESPONSE_CODE, INTERNAL_SERVER_ERROR.toString()); + MDC.put(MdcVariables.RESPONSE_CODE, INTERNAL_SERVER_ERROR.toString()); LOGGER.error("Client certificate validation failed: {}", e.getMessage()); return buildResponse(INTERNAL_SERVER_ERROR, ImmutableMap.of(MESSAGE, "Invalid or misconfigured client certificate")); } catch (IOException e) { - MDC.put(RESPONSE_CODE, BAD_REQUEST.toString()); + MDC.put(MdcVariables.RESPONSE_CODE, BAD_REQUEST.toString()); LOGGER.warn("Json validation failed: {}", e.getMessage()); return buildResponse(BAD_REQUEST, ImmutableMap.of(MESSAGE, String.format(NOT_EXISTING_TEMPLATE, triggerEventRequest.getTemplateName()))); } catch (Exception e) { - MDC.put(RESPONSE_CODE, INTERNAL_SERVER_ERROR.toString()); + MDC.put(MdcVariables.RESPONSE_CODE, INTERNAL_SERVER_ERROR.toString()); LOGGER.error("Cannot trigger event - unexpected exception", e); return buildResponse(INTERNAL_SERVER_ERROR, ImmutableMap.of(MESSAGE, "Unexpected exception: " + e.getMessage())); @@ -201,7 +195,7 @@ public class SimulatorController { throws IOException, SchedulerException, GeneralSecurityException { String jobName = simulatorService.triggerEvent(triggerEventRequest); - MDC.put(RESPONSE_CODE, OK.toString()); + MDC.put(MdcVariables.RESPONSE_CODE, OK.toString()); return buildResponse(OK, ImmutableMap.of(MESSAGE, "Request started", "jobName", jobName)); } @@ -225,10 +219,10 @@ public class SimulatorController { } private void logContextHeaders(HttpHeaders headers, String serviceName) { - MDC.put(REQUEST_ID, headers.getFirst(X_ONAP_REQUEST_ID)); - MDC.put(INVOCATION_ID, headers.getFirst(X_INVOCATION_ID)); - MDC.put(INSTANCE_UUID, UUID.randomUUID().toString()); - MDC.put(SERVICE_NAME, serviceName); + MDC.put(MdcVariables.REQUEST_ID, headers.getFirst(MdcVariables.X_ONAP_REQUEST_ID)); + MDC.put(MdcVariables.INVOCATION_ID, headers.getFirst(MdcVariables.X_INVOCATION_ID)); + MDC.put(MdcVariables.INSTANCE_UUID, UUID.randomUUID().toString()); + MDC.put(MdcVariables.SERVICE_NAME, serviceName); } private ResponseEntity<Map<String, Object>> createCancelEventResponse(boolean isCancelled) { diff --git a/src/main/java/org/onap/pnfsimulator/rest/TemplateController.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/TemplateController.java index 8f8fee7..120b24d 100644 --- a/src/main/java/org/onap/pnfsimulator/rest/TemplateController.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/TemplateController.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.rest; +package org.onap.integration.simulators.nfsimulator.vesclient.rest; import java.time.Instant; import java.util.List; @@ -26,11 +26,11 @@ import java.util.Optional; import javax.validation.Valid; import com.google.gson.Gson; -import org.onap.pnfsimulator.db.Storage; -import org.onap.pnfsimulator.rest.model.TemplateRequest; -import org.onap.pnfsimulator.rest.model.SearchExp; -import org.onap.pnfsimulator.template.Template; -import org.onap.pnfsimulator.template.search.IllegalJsonValueException; +import org.onap.integration.simulators.nfsimulator.vesclient.db.Storage; +import org.onap.integration.simulators.nfsimulator.vesclient.rest.model.TemplateRequest; +import org.onap.integration.simulators.nfsimulator.vesclient.template.Template; +import org.onap.integration.simulators.nfsimulator.vesclient.template.search.IllegalJsonValueException; +import org.onap.integration.simulators.nfsimulator.vesclient.rest.model.SearchExp; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; diff --git a/src/main/java/org/onap/pnfsimulator/rest/model/FullEvent.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/model/FullEvent.java index 77d9b3d..7ed1fb5 100644 --- a/src/main/java/org/onap/pnfsimulator/rest/model/FullEvent.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/model/FullEvent.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.rest.model; +package org.onap.integration.simulators.nfsimulator.vesclient.rest.model; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.google.gson.JsonObject; @@ -27,7 +27,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; -import org.onap.pnfsimulator.rest.util.JsonObjectDeserializer; +import org.onap.integration.simulators.nfsimulator.vesclient.rest.util.JsonObjectDeserializer; import org.springframework.lang.Nullable; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/onap/pnfsimulator/rest/model/SearchExp.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/model/SearchExp.java index 41d112f..1ff57da 100644 --- a/src/main/java/org/onap/pnfsimulator/rest/model/SearchExp.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/model/SearchExp.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.rest.model; +package org.onap.integration.simulators.nfsimulator.vesclient.rest.model; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.google.gson.JsonObject; @@ -26,7 +26,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; -import org.onap.pnfsimulator.rest.util.JsonObjectDeserializer; +import org.onap.integration.simulators.nfsimulator.vesclient.rest.util.JsonObjectDeserializer; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/onap/pnfsimulator/rest/model/SimulatorParams.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/model/SimulatorParams.java index 787583e..20b695e 100644 --- a/src/main/java/org/onap/pnfsimulator/rest/model/SimulatorParams.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/model/SimulatorParams.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.rest.model; +package org.onap.integration.simulators.nfsimulator.vesclient.rest.model; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/src/main/java/org/onap/pnfsimulator/rest/model/SimulatorRequest.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/model/SimulatorRequest.java index d00b311..167c479 100644 --- a/src/main/java/org/onap/pnfsimulator/rest/model/SimulatorRequest.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/model/SimulatorRequest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.rest.model; +package org.onap.integration.simulators.nfsimulator.vesclient.rest.model; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.google.gson.JsonObject; @@ -28,7 +28,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; -import org.onap.pnfsimulator.rest.util.JsonObjectDeserializer; +import org.onap.integration.simulators.nfsimulator.vesclient.rest.util.JsonObjectDeserializer; import org.springframework.lang.Nullable; @Getter diff --git a/src/main/java/org/onap/pnfsimulator/rest/model/TemplateRequest.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/model/TemplateRequest.java index f1e0243..3c66b23 100644 --- a/src/main/java/org/onap/pnfsimulator/rest/model/TemplateRequest.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/model/TemplateRequest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.rest.model; +package org.onap.integration.simulators.nfsimulator.vesclient.rest.model; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/onap/pnfsimulator/rest/util/DateUtil.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/util/DateUtil.java index 9a5c9ca..5afea02 100644 --- a/src/main/java/org/onap/pnfsimulator/rest/util/DateUtil.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/util/DateUtil.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.rest.util; +package org.onap.integration.simulators.nfsimulator.vesclient.rest.util; import java.text.DateFormat; import java.util.Date; diff --git a/src/main/java/org/onap/pnfsimulator/rest/util/JsonObjectDeserializer.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/util/JsonObjectDeserializer.java index f89c4a7..aba1e5b 100644 --- a/src/main/java/org/onap/pnfsimulator/rest/util/JsonObjectDeserializer.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/util/JsonObjectDeserializer.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.rest.util; +package org.onap.integration.simulators.nfsimulator.vesclient.rest.util; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/src/main/java/org/onap/pnfsimulator/rest/util/ResponseBuilder.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/util/ResponseBuilder.java index 1fdd7cf..5f0c809 100644 --- a/src/main/java/org/onap/pnfsimulator/rest/util/ResponseBuilder.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/util/ResponseBuilder.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.rest.util; +package org.onap.integration.simulators.nfsimulator.vesclient.rest.util; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/main/java/org/onap/pnfsimulator/simulator/DbTemplateReader.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/DbTemplateReader.java index 878591b..4175a1c 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/DbTemplateReader.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/DbTemplateReader.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator; import com.google.gson.Gson; import com.google.gson.JsonElement; @@ -26,8 +26,8 @@ import com.google.gson.JsonObject; import java.io.IOException; -import org.onap.pnfsimulator.template.Template; -import org.onap.pnfsimulator.template.TemplateService; +import org.onap.integration.simulators.nfsimulator.vesclient.template.Template; +import org.onap.integration.simulators.nfsimulator.vesclient.template.TemplateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/onap/pnfsimulator/simulator/EventNotFoundException.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/EventNotFoundException.java index 01f6508..45bb630 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/EventNotFoundException.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/EventNotFoundException.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator; public class EventNotFoundException extends RuntimeException { private static final String NOT_FOUND = "Not found an event with id: "; diff --git a/src/main/java/org/onap/pnfsimulator/simulator/FilesystemTemplateReader.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/FilesystemTemplateReader.java index a405a2e..699e570 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/FilesystemTemplateReader.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/FilesystemTemplateReader.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator; import com.google.gson.Gson; import com.google.gson.JsonObject; diff --git a/src/main/java/org/onap/pnfsimulator/simulator/IncrementProvider.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/IncrementProvider.java index 4a7cf02..e304795 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/IncrementProvider.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/IncrementProvider.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator; @FunctionalInterface public interface IncrementProvider { diff --git a/src/main/java/org/onap/pnfsimulator/simulator/IncrementProviderImpl.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/IncrementProviderImpl.java index 9d4d3ec..92ebbd1 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/IncrementProviderImpl.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/IncrementProviderImpl.java @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator; -import org.onap.pnfsimulator.event.EventData; -import org.onap.pnfsimulator.event.EventDataRepository; +import org.onap.integration.simulators.nfsimulator.vesclient.event.EventData; +import org.onap.integration.simulators.nfsimulator.vesclient.event.EventDataRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/onap/pnfsimulator/simulator/JsonTokenProcessor.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/JsonTokenProcessor.java index da0026a..25399e7 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/JsonTokenProcessor.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/JsonTokenProcessor.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonToken; diff --git a/src/main/java/org/onap/pnfsimulator/simulator/KeywordsExtractor.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractor.java index 2dc52a1..3d6b5d6 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/KeywordsExtractor.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractor.java @@ -17,27 +17,20 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator; import static io.vavr.API.$; import static io.vavr.API.Case; import static io.vavr.API.Match; -import static org.onap.pnfsimulator.simulator.KeywordsValueProvider.getEpochSecond; -import static org.onap.pnfsimulator.simulator.KeywordsValueProvider.getRandomLimitedInteger; -import static org.onap.pnfsimulator.simulator.KeywordsValueProvider.getRandomInteger; -import static org.onap.pnfsimulator.simulator.KeywordsValueProvider.getRandomLimitedString; -import static org.onap.pnfsimulator.simulator.KeywordsValueProvider.getRandomString; -import static org.onap.pnfsimulator.simulator.KeywordsValueProvider.getRandomPrimitiveInteger; -import static org.onap.pnfsimulator.simulator.KeywordsValueProvider.getTimestampPrimitive; -import static org.onap.pnfsimulator.simulator.keywords.NonParameterKeywordPatterns.$nonParameterKeyword; -import static org.onap.pnfsimulator.simulator.keywords.SingleParameterKeywordPatterns.$singleParameterKeyword; -import static org.onap.pnfsimulator.simulator.keywords.TwoParameterKeywordPatterns.$twoParameterKeyword; +import static org.onap.integration.simulators.nfsimulator.vesclient.simulator.keywords.NonParameterKeywordPatterns.$nonParameterKeyword; +import static org.onap.integration.simulators.nfsimulator.vesclient.simulator.keywords.SingleParameterKeywordPatterns.$singleParameterKeyword; +import static org.onap.integration.simulators.nfsimulator.vesclient.simulator.keywords.TwoParameterKeywordPatterns.$twoParameterKeyword; import io.vavr.API.Match.Pattern1; -import org.onap.pnfsimulator.simulator.keywords.Keyword; -import org.onap.pnfsimulator.simulator.keywords.NonParameterKeyword; -import org.onap.pnfsimulator.simulator.keywords.SingleParameterKeyword; -import org.onap.pnfsimulator.simulator.keywords.TwoParameterKeyword; +import org.onap.integration.simulators.nfsimulator.vesclient.simulator.keywords.Keyword; +import org.onap.integration.simulators.nfsimulator.vesclient.simulator.keywords.NonParameterKeyword; +import org.onap.integration.simulators.nfsimulator.vesclient.simulator.keywords.SingleParameterKeyword; +import org.onap.integration.simulators.nfsimulator.vesclient.simulator.keywords.TwoParameterKeyword; import org.springframework.stereotype.Component; @Component @@ -46,26 +39,26 @@ public class KeywordsExtractor { String substituteStringKeyword(String text, int increment) { return Match(text).of( Case(isRandomStringParamKeyword(), - spk -> spk.substituteKeyword(getRandomString().apply(spk.getAdditionalParameter())) + spk -> spk.substituteKeyword(KeywordsValueProvider.getRandomString().apply(spk.getAdditionalParameter())) ), Case(isRandomStringNonParamKeyword(), - npk -> npk.substituteKeyword(getRandomLimitedString().apply()) + npk -> npk.substituteKeyword(KeywordsValueProvider.getRandomLimitedString().apply()) ), Case(isRandomIntegerParamKeyword(), - tpk -> tpk.substituteKeyword(getRandomInteger().apply( + tpk -> tpk.substituteKeyword(KeywordsValueProvider.getRandomInteger().apply( tpk.getAdditionalParameter1(), tpk.getAdditionalParameter2() ) ) ), Case(isRandomIntegerNonParamKeyword(), - npk -> npk.substituteKeyword(getRandomLimitedInteger().apply()) + npk -> npk.substituteKeyword(KeywordsValueProvider.getRandomLimitedInteger().apply()) ), Case(isIncrementKeyword(), ik -> ik.substituteKeyword(String.valueOf(increment)) ), Case(isTimestampNonParamKeyword(), - npk -> npk.substituteKeyword(getEpochSecond().apply()) + npk -> npk.substituteKeyword(KeywordsValueProvider.getEpochSecond().apply()) ), Case( $(), @@ -77,10 +70,10 @@ public class KeywordsExtractor { return Match(text).of( Case(isRandomPrimitiveIntegerParamKeyword(), tpk -> - getRandomPrimitiveInteger().apply(tpk.getAdditionalParameter1(), tpk.getAdditionalParameter2())), + KeywordsValueProvider.getRandomPrimitiveInteger().apply(tpk.getAdditionalParameter1(), tpk.getAdditionalParameter2())), Case(isTimestampPrimitiveNonParamKeyword(), tpk -> - getTimestampPrimitive().apply()), + KeywordsValueProvider.getTimestampPrimitive().apply()), Case( $(), () -> 0L diff --git a/src/main/java/org/onap/pnfsimulator/simulator/KeywordsHandler.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsHandler.java index ac80647..b37e21a 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/KeywordsHandler.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsHandler.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator; import com.google.gson.Gson; import com.google.gson.JsonElement; diff --git a/src/main/java/org/onap/pnfsimulator/simulator/KeywordsHandlerException.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsHandlerException.java index 9685bc3..ff892e0 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/KeywordsHandlerException.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsHandlerException.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator; public class KeywordsHandlerException extends RuntimeException { diff --git a/src/main/java/org/onap/pnfsimulator/simulator/KeywordsValueProvider.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsValueProvider.java index 3bcfa5b..5c46edd 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/KeywordsValueProvider.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsValueProvider.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator; import io.vavr.Function0; import io.vavr.Function1; diff --git a/src/main/java/org/onap/pnfsimulator/simulator/SimulatorService.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/SimulatorService.java index 218dbc8..19685b6 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/SimulatorService.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/SimulatorService.java @@ -18,22 +18,22 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator; import com.google.common.base.Strings; import com.google.gson.JsonObject; -import org.onap.pnfsimulator.event.EventData; -import org.onap.pnfsimulator.event.EventDataService; -import org.onap.pnfsimulator.rest.model.FullEvent; -import org.onap.pnfsimulator.rest.model.SimulatorParams; -import org.onap.pnfsimulator.rest.model.SimulatorRequest; -import org.onap.pnfsimulator.simulator.client.HttpClientAdapter; -import org.onap.pnfsimulator.simulator.client.HttpClientAdapterImpl; -import org.onap.pnfsimulator.simulator.client.HttpResponseAdapter; -import org.onap.pnfsimulator.simulator.client.utils.ssl.SslAuthenticationHelper; -import org.onap.pnfsimulator.simulator.scheduler.EventScheduler; -import org.onap.pnfsimulator.simulatorconfig.SimulatorConfig; -import org.onap.pnfsimulator.simulatorconfig.SimulatorConfigService; +import org.onap.integration.simulators.nfsimulator.vesclient.rest.model.FullEvent; +import org.onap.integration.simulators.nfsimulator.vesclient.rest.model.SimulatorParams; +import org.onap.integration.simulators.nfsimulator.vesclient.rest.model.SimulatorRequest; +import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpClientAdapterImpl; +import org.onap.integration.simulators.nfsimulator.vesclient.event.EventData; +import org.onap.integration.simulators.nfsimulator.vesclient.event.EventDataService; +import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpClientAdapter; +import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpResponseAdapter; +import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl.SslAuthenticationHelper; +import org.onap.integration.simulators.nfsimulator.vesclient.simulator.scheduler.EventScheduler; +import org.onap.integration.simulators.nfsimulator.vesclient.simulatorconfig.SimulatorConfig; +import org.onap.integration.simulators.nfsimulator.vesclient.simulatorconfig.SimulatorConfigService; import org.quartz.SchedulerException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/onap/pnfsimulator/simulator/TemplatePatcher.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/TemplatePatcher.java index 1114d3c..921eab6 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/TemplatePatcher.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/TemplatePatcher.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator; import com.google.gson.JsonElement; import com.google.gson.JsonObject; diff --git a/src/main/java/org/onap/pnfsimulator/simulator/TemplateReader.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/TemplateReader.java index 2471c08..25cc1e6 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/TemplateReader.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/TemplateReader.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator; import com.google.gson.JsonObject; diff --git a/src/main/java/org/onap/pnfsimulator/simulator/TemplateVariablesReplacer.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/TemplateVariablesReplacer.java index eb0b141..b441782 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/TemplateVariablesReplacer.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/TemplateVariablesReplacer.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator; import com.google.gson.Gson; import com.google.gson.JsonElement; diff --git a/src/main/java/org/onap/pnfsimulator/simulator/client/HttpApacheResponseAdapterFactory.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpApacheResponseAdapterFactory.java index 36ba922..d77d4c9 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/client/HttpApacheResponseAdapterFactory.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpApacheResponseAdapterFactory.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator.client; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client; import org.apache.http.HttpResponse; import org.apache.http.util.EntityUtils; diff --git a/src/main/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapter.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpClientAdapter.java index 8cb6aa2..2f716c2 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapter.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpClientAdapter.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator.client; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client; public interface HttpClientAdapter { diff --git a/src/main/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapterImpl.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpClientAdapterImpl.java index ba668fc..6cddc18 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapterImpl.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpClientAdapterImpl.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator.client; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client; import org.apache.commons.codec.binary.Base64; import org.apache.http.HttpHeaders; @@ -27,8 +27,8 @@ import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.StringEntity; import org.apache.http.util.EntityUtils; -import org.onap.pnfsimulator.simulator.client.utils.ssl.HttpClientFactoryFacade; -import org.onap.pnfsimulator.simulator.client.utils.ssl.SslAuthenticationHelper; +import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl.HttpClientFactoryFacade; +import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl.SslAuthenticationHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.MDC; @@ -43,9 +43,9 @@ import java.nio.charset.StandardCharsets; import java.security.GeneralSecurityException; import java.util.UUID; -import static org.onap.pnfsimulator.logging.MdcVariables.REQUEST_ID; -import static org.onap.pnfsimulator.logging.MdcVariables.X_INVOCATION_ID; -import static org.onap.pnfsimulator.logging.MdcVariables.X_ONAP_REQUEST_ID; +import static org.onap.integration.simulators.nfsimulator.vesclient.logging.MdcVariables.REQUEST_ID; +import static org.onap.integration.simulators.nfsimulator.vesclient.logging.MdcVariables.X_INVOCATION_ID; +import static org.onap.integration.simulators.nfsimulator.vesclient.logging.MdcVariables.X_ONAP_REQUEST_ID; public class HttpClientAdapterImpl implements HttpClientAdapter { diff --git a/src/main/java/org/onap/pnfsimulator/simulator/client/HttpResponseAdapter.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpResponseAdapter.java index e78b8a3..976a972 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/client/HttpResponseAdapter.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpResponseAdapter.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator.client; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client; public class HttpResponseAdapter { diff --git a/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/CertAuthSslContextFactory.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/CertAuthSslContextFactory.java index 72af9e5..4257f9e 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/CertAuthSslContextFactory.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/CertAuthSslContextFactory.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator.client.utils.ssl; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl; import java.io.IOException; import java.security.GeneralSecurityException; diff --git a/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/CertificateReader.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/CertificateReader.java index a42114b..0d22d0e 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/CertificateReader.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/CertificateReader.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator.client.utils.ssl; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl; import java.io.FileInputStream; import java.io.IOException; diff --git a/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/HttpClientFactory.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/HttpClientFactory.java index ca57a64..7237203 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/HttpClientFactory.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/HttpClientFactory.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator.client.utils.ssl; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl; import io.vavr.control.Try; import org.apache.http.client.HttpClient; diff --git a/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/HttpClientFactoryFacade.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/HttpClientFactoryFacade.java index dffd635..2ed1ff9 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/HttpClientFactoryFacade.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/HttpClientFactoryFacade.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator.client.utils.ssl; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl; import java.io.IOException; import java.security.GeneralSecurityException; diff --git a/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/PasswordConverter.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/PasswordConverter.java index 7a645ae..b29963c 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/PasswordConverter.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/PasswordConverter.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator.client.utils.ssl; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl; import java.util.Optional; diff --git a/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/SSLContextFactory.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/SSLContextFactory.java index b8dfe6f..e54b4c0 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/SSLContextFactory.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/SSLContextFactory.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator.client.utils.ssl; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl; import java.io.IOException; import java.security.GeneralSecurityException; diff --git a/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/SslAuthenticationHelper.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/SslAuthenticationHelper.java index 271ad93..c72cb3c 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/SslAuthenticationHelper.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/SslAuthenticationHelper.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator.client.utils.ssl; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl; import java.io.Serializable; diff --git a/src/main/java/org/onap/pnfsimulator/simulator/keywords/Keyword.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/keywords/Keyword.java index 1bb1332..115ef85 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/keywords/Keyword.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/keywords/Keyword.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator.keywords; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator.keywords; import io.vavr.Function1; import io.vavr.Function2; diff --git a/src/main/java/org/onap/pnfsimulator/simulator/keywords/NonParameterKeyword.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/keywords/NonParameterKeyword.java index 5e44550..f850f69 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/keywords/NonParameterKeyword.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/keywords/NonParameterKeyword.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator.keywords; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator.keywords; import io.vavr.Tuple; import io.vavr.Tuple1; diff --git a/src/main/java/org/onap/pnfsimulator/simulator/keywords/SingleParameterKeyword.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/keywords/SingleParameterKeyword.java index b1c38c8..a4ea5b9 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/keywords/SingleParameterKeyword.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/keywords/SingleParameterKeyword.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator.keywords; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator.keywords; import io.vavr.Tuple; import io.vavr.Tuple1; diff --git a/src/main/java/org/onap/pnfsimulator/simulator/keywords/TwoParameterKeyword.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/keywords/TwoParameterKeyword.java index 6fecfa6..f1f1a76 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/keywords/TwoParameterKeyword.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/keywords/TwoParameterKeyword.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator.keywords; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator.keywords; import io.vavr.Tuple; import io.vavr.Tuple1; diff --git a/src/main/java/org/onap/pnfsimulator/simulator/scheduler/EventJob.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/scheduler/EventJob.java index a467370..cf3a514 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/scheduler/EventJob.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/scheduler/EventJob.java @@ -18,14 +18,14 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator.scheduler; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator.scheduler; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import org.onap.pnfsimulator.simulator.KeywordsHandler; -import org.onap.pnfsimulator.simulator.client.HttpClientAdapter; -import org.onap.pnfsimulator.simulator.client.HttpClientAdapterImpl; -import org.onap.pnfsimulator.simulator.client.utils.ssl.SslAuthenticationHelper; +import org.onap.integration.simulators.nfsimulator.vesclient.simulator.KeywordsHandler; +import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpClientAdapterImpl; +import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpClientAdapter; +import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl.SslAuthenticationHelper; import org.quartz.Job; import org.quartz.JobDataMap; import org.quartz.JobExecutionContext; diff --git a/src/main/java/org/onap/pnfsimulator/simulator/scheduler/EventScheduler.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/scheduler/EventScheduler.java index 5584cb1..5c69d9d 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/scheduler/EventScheduler.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/scheduler/EventScheduler.java @@ -17,13 +17,13 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator.scheduler; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator.scheduler; import com.google.gson.JsonObject; -import org.onap.pnfsimulator.simulator.KeywordsHandler; -import org.onap.pnfsimulator.simulator.client.HttpClientAdapterImpl; -import org.onap.pnfsimulator.simulator.client.utils.ssl.SslAuthenticationHelper; +import org.onap.integration.simulators.nfsimulator.vesclient.simulator.KeywordsHandler; +import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpClientAdapterImpl; +import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl.SslAuthenticationHelper; import org.quartz.JobBuilder; import org.quartz.JobDataMap; import org.quartz.JobDetail; @@ -42,12 +42,12 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -import static org.onap.pnfsimulator.simulator.scheduler.EventJob.BODY; -import static org.onap.pnfsimulator.simulator.scheduler.EventJob.CLIENT_ADAPTER; -import static org.onap.pnfsimulator.simulator.scheduler.EventJob.EVENT_ID; -import static org.onap.pnfsimulator.simulator.scheduler.EventJob.KEYWORDS_HANDLER; -import static org.onap.pnfsimulator.simulator.scheduler.EventJob.TEMPLATE_NAME; -import static org.onap.pnfsimulator.simulator.scheduler.EventJob.VES_URL; +import static org.onap.integration.simulators.nfsimulator.vesclient.simulator.scheduler.EventJob.BODY; +import static org.onap.integration.simulators.nfsimulator.vesclient.simulator.scheduler.EventJob.CLIENT_ADAPTER; +import static org.onap.integration.simulators.nfsimulator.vesclient.simulator.scheduler.EventJob.EVENT_ID; +import static org.onap.integration.simulators.nfsimulator.vesclient.simulator.scheduler.EventJob.KEYWORDS_HANDLER; +import static org.onap.integration.simulators.nfsimulator.vesclient.simulator.scheduler.EventJob.TEMPLATE_NAME; +import static org.onap.integration.simulators.nfsimulator.vesclient.simulator.scheduler.EventJob.VES_URL; import static org.quartz.SimpleScheduleBuilder.simpleSchedule; @Component diff --git a/src/main/java/org/onap/pnfsimulator/simulator/scheduler/QuartzConfiguration.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/scheduler/QuartzConfiguration.java index 2beb9dc..882c1a1 100644 --- a/src/main/java/org/onap/pnfsimulator/simulator/scheduler/QuartzConfiguration.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/scheduler/QuartzConfiguration.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulator.scheduler; +package org.onap.integration.simulators.nfsimulator.vesclient.simulator.scheduler; import org.quartz.Scheduler; import org.quartz.SchedulerException; diff --git a/src/main/java/org/onap/pnfsimulator/simulatorconfig/SimulatorConfig.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulatorconfig/SimulatorConfig.java index 0baa477..8b0588c 100644 --- a/src/main/java/org/onap/pnfsimulator/simulatorconfig/SimulatorConfig.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulatorconfig/SimulatorConfig.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulatorconfig; +package org.onap.integration.simulators.nfsimulator.vesclient.simulatorconfig; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; diff --git a/src/main/java/org/onap/pnfsimulator/simulatorconfig/SimulatorConfigRepository.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulatorconfig/SimulatorConfigRepository.java index 5e63ee4..c1ec882 100644 --- a/src/main/java/org/onap/pnfsimulator/simulatorconfig/SimulatorConfigRepository.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulatorconfig/SimulatorConfigRepository.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulatorconfig; +package org.onap.integration.simulators.nfsimulator.vesclient.simulatorconfig; import org.springframework.data.mongodb.repository.MongoRepository; diff --git a/src/main/java/org/onap/pnfsimulator/simulatorconfig/SimulatorConfigService.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulatorconfig/SimulatorConfigService.java index 2063351..af6dd26 100644 --- a/src/main/java/org/onap/pnfsimulator/simulatorconfig/SimulatorConfigService.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulatorconfig/SimulatorConfigService.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.simulatorconfig; +package org.onap.integration.simulators.nfsimulator.vesclient.simulatorconfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/onap/pnfsimulator/template/FsToDbTemplateSynchronizer.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/FsToDbTemplateSynchronizer.java index 0080813..9eeb570 100644 --- a/src/main/java/org/onap/pnfsimulator/template/FsToDbTemplateSynchronizer.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/FsToDbTemplateSynchronizer.java @@ -18,11 +18,11 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.template; +package org.onap.integration.simulators.nfsimulator.vesclient.template; import org.bson.json.JsonParseException; -import org.onap.pnfsimulator.db.Storage; -import org.onap.pnfsimulator.filesystem.WatcherEventProcessor; +import org.onap.integration.simulators.nfsimulator.vesclient.db.Storage; +import org.onap.integration.simulators.nfsimulator.vesclient.filesystem.WatcherEventProcessor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/onap/pnfsimulator/template/Template.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/Template.java index 121d7d4..0aeca40 100644 --- a/src/main/java/org/onap/pnfsimulator/template/Template.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/Template.java @@ -18,16 +18,16 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.template; +package org.onap.integration.simulators.nfsimulator.vesclient.template; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.NoArgsConstructor; import lombok.ToString; -import org.onap.pnfsimulator.db.Row; +import org.onap.integration.simulators.nfsimulator.vesclient.db.Row; +import org.onap.integration.simulators.nfsimulator.vesclient.template.search.JsonUtils; import org.bson.Document; -import org.onap.pnfsimulator.template.search.JsonUtils; import org.springframework.data.mongodb.core.mapping.Field; @NoArgsConstructor diff --git a/src/main/java/org/onap/pnfsimulator/template/TemplateRepository.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/TemplateRepository.java index 78c9c77..6b3bcd4 100644 --- a/src/main/java/org/onap/pnfsimulator/template/TemplateRepository.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/TemplateRepository.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.template; +package org.onap.integration.simulators.nfsimulator.vesclient.template; import org.springframework.data.mongodb.repository.MongoRepository; diff --git a/src/main/java/org/onap/pnfsimulator/template/TemplateService.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/TemplateService.java index 3e245e1..2b3fbbd 100644 --- a/src/main/java/org/onap/pnfsimulator/template/TemplateService.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/TemplateService.java @@ -18,14 +18,14 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.template; +package org.onap.integration.simulators.nfsimulator.vesclient.template; import java.util.List; import java.util.Optional; import com.google.gson.JsonObject; -import org.onap.pnfsimulator.db.Storage; -import org.onap.pnfsimulator.template.search.TemplateSearchHelper; +import org.onap.integration.simulators.nfsimulator.vesclient.db.Storage; +import org.onap.integration.simulators.nfsimulator.vesclient.template.search.TemplateSearchHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/onap/pnfsimulator/template/search/IllegalJsonValueException.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/IllegalJsonValueException.java index 1685536..d2c1c2a 100644 --- a/src/main/java/org/onap/pnfsimulator/template/search/IllegalJsonValueException.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/IllegalJsonValueException.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.template.search; +package org.onap.integration.simulators.nfsimulator.vesclient.template.search; public class IllegalJsonValueException extends IllegalArgumentException { diff --git a/src/main/java/org/onap/pnfsimulator/template/search/JsonUtils.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/JsonUtils.java index b595b4f..3d7c60d 100644 --- a/src/main/java/org/onap/pnfsimulator/template/search/JsonUtils.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/JsonUtils.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.template.search; +package org.onap.integration.simulators.nfsimulator.vesclient.template.search; import com.google.common.base.Strings; import com.google.gson.Gson; diff --git a/src/main/java/org/onap/pnfsimulator/template/search/TemplateSearchHelper.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/TemplateSearchHelper.java index 3f22b1a..432b2d6 100644 --- a/src/main/java/org/onap/pnfsimulator/template/search/TemplateSearchHelper.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/TemplateSearchHelper.java @@ -18,12 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.template.search; +package org.onap.integration.simulators.nfsimulator.vesclient.template.search; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import org.onap.pnfsimulator.template.search.handler.PrimitiveValueCriteriaBuilder; -import org.onap.pnfsimulator.template.search.viewmodel.FlatTemplateContent; +import org.onap.integration.simulators.nfsimulator.vesclient.template.search.handler.PrimitiveValueCriteriaBuilder; +import org.onap.integration.simulators.nfsimulator.vesclient.template.search.viewmodel.FlatTemplateContent; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; diff --git a/src/main/java/org/onap/pnfsimulator/template/search/handler/PrimitiveValueCriteriaBuilder.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/handler/PrimitiveValueCriteriaBuilder.java index 79d64b7..7e5ae02 100644 --- a/src/main/java/org/onap/pnfsimulator/template/search/handler/PrimitiveValueCriteriaBuilder.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/handler/PrimitiveValueCriteriaBuilder.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.template.search.handler; +package org.onap.integration.simulators.nfsimulator.vesclient.template.search.handler; import com.google.common.collect.Lists; import com.google.gson.JsonPrimitive; diff --git a/src/main/java/org/onap/pnfsimulator/template/search/viewmodel/FlatTemplateContent.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/viewmodel/FlatTemplateContent.java index 8634052..9c9a39d 100644 --- a/src/main/java/org/onap/pnfsimulator/template/search/viewmodel/FlatTemplateContent.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/viewmodel/FlatTemplateContent.java @@ -18,13 +18,13 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.template.search.viewmodel; +package org.onap.integration.simulators.nfsimulator.vesclient.template.search.viewmodel; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; -import org.onap.pnfsimulator.db.Row; +import org.onap.integration.simulators.nfsimulator.vesclient.db.Row; import java.util.List; diff --git a/src/main/java/org/onap/pnfsimulator/template/search/viewmodel/KeyValuePair.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/viewmodel/KeyValuePair.java index 8f24334..9c9ca72 100644 --- a/src/main/java/org/onap/pnfsimulator/template/search/viewmodel/KeyValuePair.java +++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/viewmodel/KeyValuePair.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.template.search.viewmodel; +package org.onap.integration.simulators.nfsimulator.vesclient.template.search.viewmodel; import lombok.AllArgsConstructor; import lombok.Getter; |