From ee67930973552a69830c30e6b3b1915091af8ebb Mon Sep 17 00:00:00 2001 From: "denilson.l65" Date: Fri, 21 May 2021 21:20:02 +0530 Subject: Code cleanup Issue-ID: DCAEGEN2-2504 Signed-off-by: denilson.l65 Change-Id: Ife119bb0e084a5ef0e3199a70523876c4e258f67 --- .../main/java/org/onap/slice/analysis/ms/models/CUModel.java | 6 ++++++ .../java/org/onap/slice/analysis/ms/models/CellCUList.java | 8 +++++++- .../java/org/onap/slice/analysis/ms/models/ConfigData.java | 6 ++++++ .../java/org/onap/slice/analysis/ms/models/ConfigPolicy.java | 4 ++-- .../org/onap/slice/analysis/ms/models/MLOutputModel.java | 7 ++++++- .../org/onap/slice/analysis/ms/models/MeasurementObject.java | 11 ++++++++++- .../java/org/onap/slice/analysis/ms/models/SubCounter.java | 6 ++++++ .../onap/slice/analysis/ms/models/configdb/CellsModel.java | 4 ---- .../analysis/ms/models/configdb/NetworkFunctionModel.java | 8 +------- .../onap/slice/analysis/ms/models/pmnotification/Event.java | 3 ++- .../analysis/ms/models/pmnotification/MeasValuesList.java | 3 ++- .../analysis/ms/models/policy/AdditionalProperties.java | 1 - .../org/onap/slice/analysis/ms/models/policy/Payload.java | 12 ------------ 13 files changed, 48 insertions(+), 31 deletions(-) (limited to 'components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models') diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/CUModel.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/CUModel.java index 6473ab23..91201f05 100644 --- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/CUModel.java +++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/CUModel.java @@ -61,6 +61,9 @@ public class CUModel { return "CUModel [gNBCUName=" + gNBCUName + ", nearRTRICId=" + nearRTRICId + ", cellCUList=" + cellCUList + "]"; } + /** + * Returns a hashcode value for the object + */ @Override public int hashCode() { final int prime = 31; @@ -71,6 +74,9 @@ public class CUModel { return result; } + /** + * Checks whether the object matches with the CUModel + */ @Override public boolean equals(Object obj) { if (this == obj) diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/CellCUList.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/CellCUList.java index cd566778..5225fd36 100644 --- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/CellCUList.java +++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/CellCUList.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * slice-analysis-ms * ================================================================================ - * Copyright (C) 2020 Wipro Limited. + * Copyright (C) 2020-2021 Wipro Limited. * ============================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,6 +29,9 @@ public class CellCUList { private Integer cellLocalId; private ConfigData configData; + /** + * Returns a hashcode value for the object + */ @Override public int hashCode() { final int prime = 31; @@ -38,6 +41,9 @@ public class CellCUList { return result; } + /** + * Checks whether the object matches with the CellCUList + */ @Override public boolean equals(Object obj) { if (this == obj) diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/ConfigData.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/ConfigData.java index f8711154..ea811824 100644 --- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/ConfigData.java +++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/ConfigData.java @@ -54,6 +54,9 @@ public class ConfigData { this.lastUpdatedTS = lastUpdatedTS; } + /** + * Returns a hashcode value for the object + */ @Override public int hashCode() { final int prime = 31; @@ -64,6 +67,9 @@ public class ConfigData { return result; } + /** + * Checks whether the object matches with ConfigData + */ @Override public boolean equals(Object obj) { if (this == obj) diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/ConfigPolicy.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/ConfigPolicy.java index 6f2b4ec6..e18c8c0f 100644 --- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/ConfigPolicy.java +++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/ConfigPolicy.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * slice-analysis-ms * ================================================================================ - * Copyright (C) 2020 Wipro Limited. + * Copyright (C) 2020-2021 Wipro Limited. * ============================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,6 @@ import java.util.Map; * Model class for configuration policy * */ - public class ConfigPolicy { private static ConfigPolicy instance = null; @@ -69,4 +68,5 @@ public class ConfigPolicy { public String toString() { return "ConfigPolicy [config=" + config + "]"; } + } diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/MLOutputModel.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/MLOutputModel.java index 7533d215..aee819be 100644 --- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/MLOutputModel.java +++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/MLOutputModel.java @@ -47,6 +47,9 @@ public class MLOutputModel { return "MLOutputModel [snssai=" + snssai + ", data=" + data + "]"; } + /** + * Returns a hashcode value for the object + */ @Override public int hashCode() { final int prime = 31; @@ -56,6 +59,9 @@ public class MLOutputModel { return result; } + /** + * Checks whether the object matches with the MLOutputModel + */ @Override public boolean equals(Object obj) { if (this == obj) @@ -78,5 +84,4 @@ public class MLOutputModel { return true; } - } diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/MeasurementObject.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/MeasurementObject.java index b94d75da..cbe97a9b 100644 --- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/MeasurementObject.java +++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/MeasurementObject.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * slice-analysis-ms * ================================================================================ - * Copyright (C) 2020 Wipro Limited. + * Copyright (C) 2020-2021 Wipro Limited. * ============================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,6 +32,9 @@ public class MeasurementObject { private String measurementObjectId; private Map pmData; + /** + * Returns the index of the MeasurementObject + */ public static int findIndex(String measurementObjectId, List list) { int index = -1; int len = list.size(); @@ -74,6 +77,9 @@ public class MeasurementObject { } + /** + * Returns a hachcode value for the object + */ @Override public int hashCode() { final int prime = 31; @@ -83,6 +89,9 @@ public class MeasurementObject { return result; } + /** + * Checks whether the object matches with the MeasurementObject + */ @Override public boolean equals(Object obj) { if (this == obj) diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/SubCounter.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/SubCounter.java index 2990d365..cd540194 100644 --- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/SubCounter.java +++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/SubCounter.java @@ -43,6 +43,9 @@ public final class SubCounter { return measuredObject; } + /** + * Returns a hashcode value for the object + */ @Override public int hashCode() { final int prime = 31; @@ -52,6 +55,9 @@ public final class SubCounter { return result; } + /** + * Checks whether the object matches with the SubCounter + */ @Override public boolean equals(Object obj) { if (this == obj) diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/configdb/CellsModel.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/configdb/CellsModel.java index e024bf7c..5c8f2dc9 100644 --- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/configdb/CellsModel.java +++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/configdb/CellsModel.java @@ -26,13 +26,11 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; /** * Model class for the CellsModel Object */ - @JsonIgnoreProperties(ignoreUnknown = true) public class CellsModel { private String cellLocalId; - public String getCellLocalId() { return cellLocalId; } @@ -46,6 +44,4 @@ public class CellsModel { return "CellsModel [cellLocalId=" + cellLocalId + "]"; } - - } diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/configdb/NetworkFunctionModel.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/configdb/NetworkFunctionModel.java index 46291d51..6821871f 100644 --- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/configdb/NetworkFunctionModel.java +++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/configdb/NetworkFunctionModel.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * slice-analysis-ms * ================================================================================ - * Copyright (C) 2020 Wipro Limited. + * Copyright (C) 2020-2021 Wipro Limited. * ============================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,6 @@ *******************************************************************************/ package org.onap.slice.analysis.ms.models.configdb; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; /** @@ -31,7 +30,6 @@ public class NetworkFunctionModel { private String gNBDUId; - public String getgNBDUId() { return gNBDUId; } @@ -45,8 +43,4 @@ public class NetworkFunctionModel { return "NetworkFunctionModel [gNBDUId=" + gNBDUId + "]"; } - - - - } diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/pmnotification/Event.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/pmnotification/Event.java index 4e41e261..4b0fcaa7 100644 --- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/pmnotification/Event.java +++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/pmnotification/Event.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * slice-analysis-ms * ================================================================================ - * Copyright (C) 2020 Wipro Limited. + * Copyright (C) 2020-2021 Wipro Limited. * ============================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,4 +44,5 @@ public class Event { public void setPerf3gppFields(Perf3gppFields perf3gppFields) { this.perf3gppFields = perf3gppFields; } + } diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/pmnotification/MeasValuesList.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/pmnotification/MeasValuesList.java index 38b7c23c..36e7b103 100644 --- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/pmnotification/MeasValuesList.java +++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/pmnotification/MeasValuesList.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * slice-analysis-ms * ================================================================================ - * Copyright (C) 2020 Wipro Limited. + * Copyright (C) 2020-2021 Wipro Limited. * ============================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -55,4 +55,5 @@ public class MeasValuesList { public void setMeasResults(List measResults) { this.measResults = measResults; } + } diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/AdditionalProperties.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/AdditionalProperties.java index 0d4e4bd8..24c1dd2f 100644 --- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/AdditionalProperties.java +++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/AdditionalProperties.java @@ -71,5 +71,4 @@ public class AdditionalProperties { this.scriptName = scriptName; } - } diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/Payload.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/Payload.java index 57aab994..d96850cb 100644 --- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/Payload.java +++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/Payload.java @@ -32,62 +32,50 @@ public class Payload { private String networkType; private AdditionalProperties additionalProperties; - public String getName() { return name; } - public void setName(String name) { this.name = name; } - public String getServiceInstanceID() { return serviceInstanceID; } - public void setServiceInstanceID(String serviceInstanceId) { this.serviceInstanceID = serviceInstanceId; } - public String getGlobalSubscriberId() { return globalSubscriberId; } - public void setGlobalSubscriberId(String globalSubscriberId) { this.globalSubscriberId = globalSubscriberId; } - public String getSubscriptionServiceType() { return subscriptionServiceType; } - public void setSubscriptionServiceType(String subscriptionServiceType) { this.subscriptionServiceType = subscriptionServiceType; } - public String getNetworkType() { return networkType; } - public void setNetworkType(String networkType) { this.networkType = networkType; } - public AdditionalProperties getAdditionalProperties() { return additionalProperties; } - public void setAdditionalProperties(AdditionalProperties additionalProperties) { this.additionalProperties = additionalProperties; } -- cgit 1.2.3-korg