diff options
Diffstat (limited to 'src/main/java/org/onap/a1pesimulator/service')
-rw-r--r-- | src/main/java/org/onap/a1pesimulator/service/a1/SetLowRangeValuesOnPolicyAction.java | 6 | ||||
-rw-r--r-- | src/main/java/org/onap/a1pesimulator/service/cell/RanCellServiceImpl.java | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/a1pesimulator/service/common/AbstractRanRunnable.java | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/a1pesimulator/service/pm/FileReadyEventService.java (renamed from src/main/java/org/onap/a1pesimulator/service/fileready/FileReadyEventService.java) | 4 | ||||
-rw-r--r-- | src/main/java/org/onap/a1pesimulator/service/pm/FtpServerService.java (renamed from src/main/java/org/onap/a1pesimulator/service/fileready/FtpServerService.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/a1pesimulator/service/pm/PMBulkFileService.java (renamed from src/main/java/org/onap/a1pesimulator/service/fileready/PMBulkFileService.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/a1pesimulator/service/pm/RanFileReadyHolder.java (renamed from src/main/java/org/onap/a1pesimulator/service/fileready/RanFileReadyHolder.java) | 4 | ||||
-rw-r--r-- | src/main/java/org/onap/a1pesimulator/service/pm/RanSaveFileReadyRunnable.java (renamed from src/main/java/org/onap/a1pesimulator/service/fileready/RanSaveFileReadyRunnable.java) | 4 | ||||
-rw-r--r-- | src/main/java/org/onap/a1pesimulator/service/pm/RanSendReportsRunnable.java (renamed from src/main/java/org/onap/a1pesimulator/service/fileready/RanSendReportsRunnable.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/a1pesimulator/service/report/OnEventAction.java (renamed from src/main/java/org/onap/a1pesimulator/service/ves/OnEventAction.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/a1pesimulator/service/report/RanCellEventCustomizer.java (renamed from src/main/java/org/onap/a1pesimulator/service/ves/RanCellEventCustomizer.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/a1pesimulator/service/report/RanCellFailureEventCustomizer.java (renamed from src/main/java/org/onap/a1pesimulator/service/ves/RanCellFailureEventCustomizer.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/a1pesimulator/service/report/RanCheckCellIsDeadOnEvent.java (renamed from src/main/java/org/onap/a1pesimulator/service/ves/RanCheckCellIsDeadOnEvent.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/a1pesimulator/service/report/RanEventCustomizerFactory.java (renamed from src/main/java/org/onap/a1pesimulator/service/ves/RanEventCustomizerFactory.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/a1pesimulator/service/report/RanReportsBrokerService.java (renamed from src/main/java/org/onap/a1pesimulator/service/ves/RanVesBrokerService.java) | 10 | ||||
-rw-r--r-- | src/main/java/org/onap/a1pesimulator/service/report/RanReportsBrokerServiceImpl.java (renamed from src/main/java/org/onap/a1pesimulator/service/ves/RanVesBrokerServiceImpl.java) | 12 | ||||
-rw-r--r-- | src/main/java/org/onap/a1pesimulator/service/report/RanSendVesRunnable.java (renamed from src/main/java/org/onap/a1pesimulator/service/ves/RanSendVesRunnable.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/a1pesimulator/service/report/RanVesDataProvider.java (renamed from src/main/java/org/onap/a1pesimulator/service/ves/RanVesDataProvider.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/a1pesimulator/service/report/RanVesHolder.java (renamed from src/main/java/org/onap/a1pesimulator/service/ves/RanVesHolder.java) | 10 | ||||
-rw-r--r-- | src/main/java/org/onap/a1pesimulator/service/report/RanVesSender.java (renamed from src/main/java/org/onap/a1pesimulator/service/ves/RanVesSender.java) | 2 |
20 files changed, 38 insertions, 38 deletions
diff --git a/src/main/java/org/onap/a1pesimulator/service/a1/SetLowRangeValuesOnPolicyAction.java b/src/main/java/org/onap/a1pesimulator/service/a1/SetLowRangeValuesOnPolicyAction.java index 29c55de..ab5002d 100644 --- a/src/main/java/org/onap/a1pesimulator/service/a1/SetLowRangeValuesOnPolicyAction.java +++ b/src/main/java/org/onap/a1pesimulator/service/a1/SetLowRangeValuesOnPolicyAction.java @@ -18,7 +18,7 @@ import java.util.List; import org.onap.a1pesimulator.data.fileready.RanPeriodicEvent; import org.onap.a1pesimulator.data.ves.VesEvent; import org.onap.a1pesimulator.data.ves.MeasurementFields.AdditionalMeasurement; -import org.onap.a1pesimulator.service.ves.RanVesBrokerService; +import org.onap.a1pesimulator.service.report.RanReportsBrokerService; import org.onap.a1pesimulator.util.JsonUtils; import org.onap.a1pesimulator.util.RanVesUtils; import org.springframework.stereotype.Service; @@ -26,9 +26,9 @@ import org.springframework.stereotype.Service; @Service public class SetLowRangeValuesOnPolicyAction implements OnPolicyAction { - private final RanVesBrokerService vesBrokerService; + private final RanReportsBrokerService vesBrokerService; - public SetLowRangeValuesOnPolicyAction(RanVesBrokerService vesBrokerService) { + public SetLowRangeValuesOnPolicyAction(RanReportsBrokerService vesBrokerService) { this.vesBrokerService = vesBrokerService; } diff --git a/src/main/java/org/onap/a1pesimulator/service/cell/RanCellServiceImpl.java b/src/main/java/org/onap/a1pesimulator/service/cell/RanCellServiceImpl.java index 0c0ab00..10a598c 100644 --- a/src/main/java/org/onap/a1pesimulator/service/cell/RanCellServiceImpl.java +++ b/src/main/java/org/onap/a1pesimulator/service/cell/RanCellServiceImpl.java @@ -23,7 +23,7 @@ import org.onap.a1pesimulator.data.cell.CellWithStatus; import org.onap.a1pesimulator.data.cell.RanCell; import org.onap.a1pesimulator.data.ue.UserEquipment; import org.onap.a1pesimulator.service.ue.RanUeHolder; -import org.onap.a1pesimulator.service.ves.RanVesHolder; +import org.onap.a1pesimulator.service.report.RanVesHolder; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/org/onap/a1pesimulator/service/common/AbstractRanRunnable.java b/src/main/java/org/onap/a1pesimulator/service/common/AbstractRanRunnable.java index bd5e2a9..700d336 100644 --- a/src/main/java/org/onap/a1pesimulator/service/common/AbstractRanRunnable.java +++ b/src/main/java/org/onap/a1pesimulator/service/common/AbstractRanRunnable.java @@ -16,7 +16,7 @@ package org.onap.a1pesimulator.service.common; import java.util.Collection; import org.onap.a1pesimulator.data.ves.VesEvent; -import org.onap.a1pesimulator.service.ves.OnEventAction; +import org.onap.a1pesimulator.service.report.OnEventAction; public abstract class AbstractRanRunnable implements Runnable { diff --git a/src/main/java/org/onap/a1pesimulator/service/fileready/FileReadyEventService.java b/src/main/java/org/onap/a1pesimulator/service/pm/FileReadyEventService.java index 98f0733..df2ce97 100644 --- a/src/main/java/org/onap/a1pesimulator/service/fileready/FileReadyEventService.java +++ b/src/main/java/org/onap/a1pesimulator/service/pm/FileReadyEventService.java @@ -11,9 +11,9 @@ * limitations under the License */ -package org.onap.a1pesimulator.service.fileready; +package org.onap.a1pesimulator.service.pm; -import static org.onap.a1pesimulator.service.fileready.FtpServerService.deletePMBulkFile; +import static org.onap.a1pesimulator.service.pm.FtpServerService.deletePMBulkFile; import static org.onap.a1pesimulator.util.Constants.FILE_READY_CHANGE_IDENTIFIER; import static org.onap.a1pesimulator.util.Constants.FILE_READY_CHANGE_TYPE; diff --git a/src/main/java/org/onap/a1pesimulator/service/fileready/FtpServerService.java b/src/main/java/org/onap/a1pesimulator/service/pm/FtpServerService.java index c02ffc3..01b0672 100644 --- a/src/main/java/org/onap/a1pesimulator/service/fileready/FtpServerService.java +++ b/src/main/java/org/onap/a1pesimulator/service/pm/FtpServerService.java @@ -11,7 +11,7 @@ * limitations under the License */ -package org.onap.a1pesimulator.service.fileready; +package org.onap.a1pesimulator.service.pm; import static java.util.Objects.nonNull; import static org.onap.a1pesimulator.util.Constants.TEMP_DIR; diff --git a/src/main/java/org/onap/a1pesimulator/service/fileready/PMBulkFileService.java b/src/main/java/org/onap/a1pesimulator/service/pm/PMBulkFileService.java index 813c8a4..aec473c 100644 --- a/src/main/java/org/onap/a1pesimulator/service/fileready/PMBulkFileService.java +++ b/src/main/java/org/onap/a1pesimulator/service/pm/PMBulkFileService.java @@ -11,7 +11,7 @@ * limitations under the License */ -package org.onap.a1pesimulator.service.fileready; +package org.onap.a1pesimulator.service.pm; import static java.util.Comparator.comparing; import static java.util.Objects.isNull; diff --git a/src/main/java/org/onap/a1pesimulator/service/fileready/RanFileReadyHolder.java b/src/main/java/org/onap/a1pesimulator/service/pm/RanFileReadyHolder.java index cf3cf3a..d3a7970 100644 --- a/src/main/java/org/onap/a1pesimulator/service/fileready/RanFileReadyHolder.java +++ b/src/main/java/org/onap/a1pesimulator/service/pm/RanFileReadyHolder.java @@ -11,7 +11,7 @@ * limitations under the License */ -package org.onap.a1pesimulator.service.fileready; +package org.onap.a1pesimulator.service.pm; import static java.util.Objects.isNull; import static java.util.Objects.nonNull; @@ -27,7 +27,7 @@ import org.onap.a1pesimulator.data.fileready.EventMemoryHolder; import org.onap.a1pesimulator.data.fileready.FileData; import org.onap.a1pesimulator.data.ves.VesEvent; import org.onap.a1pesimulator.exception.VesBrokerException; -import org.onap.a1pesimulator.service.ves.RanVesSender; +import org.onap.a1pesimulator.service.report.RanVesSender; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/onap/a1pesimulator/service/fileready/RanSaveFileReadyRunnable.java b/src/main/java/org/onap/a1pesimulator/service/pm/RanSaveFileReadyRunnable.java index 53d4600..222680f 100644 --- a/src/main/java/org/onap/a1pesimulator/service/fileready/RanSaveFileReadyRunnable.java +++ b/src/main/java/org/onap/a1pesimulator/service/pm/RanSaveFileReadyRunnable.java @@ -11,7 +11,7 @@ * limitations under the License */ -package org.onap.a1pesimulator.service.fileready; +package org.onap.a1pesimulator.service.pm; import java.util.Collection; import java.util.UUID; @@ -20,7 +20,7 @@ import org.onap.a1pesimulator.data.ves.VesEvent; import org.onap.a1pesimulator.exception.VesBrokerException; import org.onap.a1pesimulator.service.common.AbstractRanRunnable; import org.onap.a1pesimulator.service.common.EventCustomizer; -import org.onap.a1pesimulator.service.ves.OnEventAction; +import org.onap.a1pesimulator.service.report.OnEventAction; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/onap/a1pesimulator/service/fileready/RanSendReportsRunnable.java b/src/main/java/org/onap/a1pesimulator/service/pm/RanSendReportsRunnable.java index f92d479..88cb5a2 100644 --- a/src/main/java/org/onap/a1pesimulator/service/fileready/RanSendReportsRunnable.java +++ b/src/main/java/org/onap/a1pesimulator/service/pm/RanSendReportsRunnable.java @@ -11,7 +11,7 @@ * limitations under the License */ -package org.onap.a1pesimulator.service.fileready; +package org.onap.a1pesimulator.service.pm; public class RanSendReportsRunnable implements Runnable { diff --git a/src/main/java/org/onap/a1pesimulator/service/ves/OnEventAction.java b/src/main/java/org/onap/a1pesimulator/service/report/OnEventAction.java index ba1ddab..f95f749 100644 --- a/src/main/java/org/onap/a1pesimulator/service/ves/OnEventAction.java +++ b/src/main/java/org/onap/a1pesimulator/service/report/OnEventAction.java @@ -11,7 +11,7 @@ * limitations under the License */ -package org.onap.a1pesimulator.service.ves; +package org.onap.a1pesimulator.service.report; import org.onap.a1pesimulator.data.ves.VesEvent; diff --git a/src/main/java/org/onap/a1pesimulator/service/ves/RanCellEventCustomizer.java b/src/main/java/org/onap/a1pesimulator/service/report/RanCellEventCustomizer.java index 7cb375f..f16e29c 100644 --- a/src/main/java/org/onap/a1pesimulator/service/ves/RanCellEventCustomizer.java +++ b/src/main/java/org/onap/a1pesimulator/service/report/RanCellEventCustomizer.java @@ -11,7 +11,7 @@ * limitations under the License */ -package org.onap.a1pesimulator.service.ves; +package org.onap.a1pesimulator.service.report; import java.util.List; import java.util.Optional; diff --git a/src/main/java/org/onap/a1pesimulator/service/ves/RanCellFailureEventCustomizer.java b/src/main/java/org/onap/a1pesimulator/service/report/RanCellFailureEventCustomizer.java index a21d1ad..6d62f33 100644 --- a/src/main/java/org/onap/a1pesimulator/service/ves/RanCellFailureEventCustomizer.java +++ b/src/main/java/org/onap/a1pesimulator/service/report/RanCellFailureEventCustomizer.java @@ -11,7 +11,7 @@ * limitations under the License */ -package org.onap.a1pesimulator.service.ves; +package org.onap.a1pesimulator.service.report; import java.text.MessageFormat; import java.util.Collection; diff --git a/src/main/java/org/onap/a1pesimulator/service/ves/RanCheckCellIsDeadOnEvent.java b/src/main/java/org/onap/a1pesimulator/service/report/RanCheckCellIsDeadOnEvent.java index 3d0c400..a3fc3da 100644 --- a/src/main/java/org/onap/a1pesimulator/service/ves/RanCheckCellIsDeadOnEvent.java +++ b/src/main/java/org/onap/a1pesimulator/service/report/RanCheckCellIsDeadOnEvent.java @@ -11,7 +11,7 @@ * limitations under the License */ -package org.onap.a1pesimulator.service.ves; +package org.onap.a1pesimulator.service.report; import static org.onap.a1pesimulator.service.cell.RanCellStateService.TOPIC_CELL; diff --git a/src/main/java/org/onap/a1pesimulator/service/ves/RanEventCustomizerFactory.java b/src/main/java/org/onap/a1pesimulator/service/report/RanEventCustomizerFactory.java index c7c2ee9..26ec13a 100644 --- a/src/main/java/org/onap/a1pesimulator/service/ves/RanEventCustomizerFactory.java +++ b/src/main/java/org/onap/a1pesimulator/service/report/RanEventCustomizerFactory.java @@ -11,7 +11,7 @@ * limitations under the License */ -package org.onap.a1pesimulator.service.ves; +package org.onap.a1pesimulator.service.report; import java.text.MessageFormat; diff --git a/src/main/java/org/onap/a1pesimulator/service/ves/RanVesBrokerService.java b/src/main/java/org/onap/a1pesimulator/service/report/RanReportsBrokerService.java index 1b92fbf..a1af9ac 100644 --- a/src/main/java/org/onap/a1pesimulator/service/ves/RanVesBrokerService.java +++ b/src/main/java/org/onap/a1pesimulator/service/report/RanReportsBrokerService.java @@ -11,7 +11,7 @@ * limitations under the License */ -package org.onap.a1pesimulator.service.ves; +package org.onap.a1pesimulator.service.report; import java.util.Collection; import java.util.Map; @@ -22,11 +22,11 @@ import org.onap.a1pesimulator.data.fileready.RanPeriodicEvent; import org.onap.a1pesimulator.data.ves.VesEvent; import org.springframework.http.ResponseEntity; -public interface RanVesBrokerService { +public interface RanReportsBrokerService { - ResponseEntity<String> startSendingVesEvents(String identifier, VesEvent vesEvent, Integer interval, ReportingMethodEnum reportingMethods); + ResponseEntity<String> startSendingReports(String identifier, VesEvent vesEvent, Integer interval, ReportingMethodEnum reportingMethods); - Optional<RanPeriodicEvent> stopSendingVesEvents(String identifier); + Optional<RanPeriodicEvent> stopSendingReports(String identifier); Map<String, RanPeriodicEvent> getPeriodicEventsCache(); @@ -34,7 +34,7 @@ public interface RanVesBrokerService { RanPeriodicEvent getPeriodicEvent(String identifier); - VesEvent startSendingFailureVesEvents(String identifier, ReportingMethodEnum reportingMethods); + VesEvent startSendingFailureReports(String identifier, ReportingMethodEnum reportingMethods); VesEvent getGlobalPmVesStructure(); diff --git a/src/main/java/org/onap/a1pesimulator/service/ves/RanVesBrokerServiceImpl.java b/src/main/java/org/onap/a1pesimulator/service/report/RanReportsBrokerServiceImpl.java index ea4b46d..b441164 100644 --- a/src/main/java/org/onap/a1pesimulator/service/ves/RanVesBrokerServiceImpl.java +++ b/src/main/java/org/onap/a1pesimulator/service/report/RanReportsBrokerServiceImpl.java @@ -11,7 +11,7 @@ * limitations under the License */ -package org.onap.a1pesimulator.service.ves; +package org.onap.a1pesimulator.service.report; import java.util.Collection; import java.util.Collections; @@ -27,13 +27,13 @@ import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; @Service -public class RanVesBrokerServiceImpl implements RanVesBrokerService { +public class RanReportsBrokerServiceImpl implements RanReportsBrokerService { private final RanVesDataProvider vesDataProvider; private final RanVesHolder vesHolder; - public RanVesBrokerServiceImpl(RanVesDataProvider vesDataProvider, RanVesHolder vesHolder) { + public RanReportsBrokerServiceImpl(RanVesDataProvider vesDataProvider, RanVesHolder vesHolder) { this.vesDataProvider = vesDataProvider; this.vesHolder = vesHolder; } @@ -44,14 +44,14 @@ public class RanVesBrokerServiceImpl implements RanVesBrokerService { } @Override - public ResponseEntity<String> startSendingVesEvents(String identifier, VesEvent vesEvent, Integer interval, ReportingMethodEnum reportingMethod) { + public ResponseEntity<String> startSendingReports(String identifier, VesEvent vesEvent, Integer interval, ReportingMethodEnum reportingMethod) { enrichWithIdentifier(identifier, vesEvent); ResponseEntity<String> response = vesHolder.startSendingVesEvents(identifier, vesEvent, interval, reportingMethod); return ResponseEntity.accepted().body(response.getBody()); } @Override - public VesEvent startSendingFailureVesEvents(String identifier, ReportingMethodEnum reportingMethod) { + public VesEvent startSendingFailureReports(String identifier, ReportingMethodEnum reportingMethod) { var vesEvent = vesDataProvider.getFailurePmVesEvent(); @@ -61,7 +61,7 @@ public class RanVesBrokerServiceImpl implements RanVesBrokerService { } @Override - public Optional<RanPeriodicEvent> stopSendingVesEvents(String identifier) { + public Optional<RanPeriodicEvent> stopSendingReports(String identifier) { return vesHolder.stopSendingVesEvents(identifier); } diff --git a/src/main/java/org/onap/a1pesimulator/service/ves/RanSendVesRunnable.java b/src/main/java/org/onap/a1pesimulator/service/report/RanSendVesRunnable.java index c537a5f..e982417 100644 --- a/src/main/java/org/onap/a1pesimulator/service/ves/RanSendVesRunnable.java +++ b/src/main/java/org/onap/a1pesimulator/service/report/RanSendVesRunnable.java @@ -11,7 +11,7 @@ * limitations under the License */ -package org.onap.a1pesimulator.service.ves; +package org.onap.a1pesimulator.service.report; import java.util.Collection; diff --git a/src/main/java/org/onap/a1pesimulator/service/ves/RanVesDataProvider.java b/src/main/java/org/onap/a1pesimulator/service/report/RanVesDataProvider.java index 931b258..35f2773 100644 --- a/src/main/java/org/onap/a1pesimulator/service/ves/RanVesDataProvider.java +++ b/src/main/java/org/onap/a1pesimulator/service/report/RanVesDataProvider.java @@ -11,7 +11,7 @@ * limitations under the License */ -package org.onap.a1pesimulator.service.ves; +package org.onap.a1pesimulator.service.report; import java.io.IOException; import java.net.URL; diff --git a/src/main/java/org/onap/a1pesimulator/service/ves/RanVesHolder.java b/src/main/java/org/onap/a1pesimulator/service/report/RanVesHolder.java index 92d30e4..dba7898 100644 --- a/src/main/java/org/onap/a1pesimulator/service/ves/RanVesHolder.java +++ b/src/main/java/org/onap/a1pesimulator/service/report/RanVesHolder.java @@ -11,7 +11,7 @@ * limitations under the License */ -package org.onap.a1pesimulator.service.ves; +package org.onap.a1pesimulator.service.report; import static java.util.Objects.isNull; import static java.util.Objects.nonNull; @@ -31,10 +31,10 @@ import org.onap.a1pesimulator.data.fileready.RanPeriodicSendReport; import org.onap.a1pesimulator.data.ves.VesEvent; import org.onap.a1pesimulator.service.common.AbstractRanRunnable; import org.onap.a1pesimulator.service.common.EventCustomizer; -import org.onap.a1pesimulator.service.fileready.RanFileReadyHolder; -import org.onap.a1pesimulator.service.fileready.RanSaveFileReadyRunnable; -import org.onap.a1pesimulator.service.fileready.RanSendReportsRunnable; -import org.onap.a1pesimulator.service.ves.RanEventCustomizerFactory.Mode; +import org.onap.a1pesimulator.service.pm.RanFileReadyHolder; +import org.onap.a1pesimulator.service.pm.RanSaveFileReadyRunnable; +import org.onap.a1pesimulator.service.pm.RanSendReportsRunnable; +import org.onap.a1pesimulator.service.report.RanEventCustomizerFactory.Mode; import org.onap.a1pesimulator.util.VnfConfigReader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/onap/a1pesimulator/service/ves/RanVesSender.java b/src/main/java/org/onap/a1pesimulator/service/report/RanVesSender.java index 85bccbb..d12abd8 100644 --- a/src/main/java/org/onap/a1pesimulator/service/ves/RanVesSender.java +++ b/src/main/java/org/onap/a1pesimulator/service/report/RanVesSender.java @@ -11,7 +11,7 @@ * limitations under the License */ -package org.onap.a1pesimulator.service.ves; +package org.onap.a1pesimulator.service.report; import static java.util.Objects.nonNull; |