aboutsummaryrefslogtreecommitdiffstats
path: root/models-interactions/model-impl/aai/src
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2021-06-17 17:35:26 -0400
committerJim Hahn <jrh3@att.com>2021-06-17 17:52:40 -0400
commitcad8b87bffb3b10c67f8b68ce8fcee5e5a3dcc35 (patch)
tree22748439c4a9c81bfb10e82577448e397f6c3996 /models-interactions/model-impl/aai/src
parent27ac6bce15318a074d4fb53606571eb30e46bf07 (diff)
Use lombok annotations for aai, appc, appclcm, cds
Issue-ID: POLICY-3396 Change-Id: I81b6b0c7929809ffaeadadd6144e9b9f394bfdc8 Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'models-interactions/model-impl/aai/src')
-rw-r--r--models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiConstants.java12
-rw-r--r--models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java15
-rw-r--r--models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/util/Serialization.java9
3 files changed, 14 insertions, 22 deletions
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiConstants.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiConstants.java
index 084e4a504..e6c46e5e2 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiConstants.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiConstants.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP
* ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,15 +20,15 @@
package org.onap.policy.aai;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
/**
* Constants used with A&AI classes.
*/
-public class AaiConstants {
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class AaiConstants {
public static final String ACTOR_NAME = "AAI";
public static final String CONTEXT_PREFIX = ACTOR_NAME + ".";
-
- private AaiConstants() {
- // do nothing
- }
}
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java
index b2a410733..a6a671815 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java
@@ -29,6 +29,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import java.util.stream.Collectors;
+import lombok.AllArgsConstructor;
import org.apache.commons.lang3.tuple.Pair;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -44,6 +45,7 @@ import org.slf4j.LoggerFactory;
/**
* This class handles communication towards and responses from A&AI for this module.
*/
+@AllArgsConstructor
public final class AaiManager {
// TODO remove this class
@@ -55,9 +57,6 @@ public final class AaiManager {
private static final StandardCoder CODER = new StandardCoder();
- // The REST manager used for processing REST calls for this AAI manager
- private final RestManager restManager;
-
/** custom query and other AAI resource URLs. */
private static final String CQ_URL = "/aai/v21/query?format=resource";
private static final String TENANT_URL = "/aai/v21/search/nodes-query?"
@@ -66,14 +65,8 @@ public final class AaiManager {
private static final String PNF_URL = PREFIX + "/network/pnfs/pnf/";
private static final String AAI_DEPTH_SUFFIX = "?depth=0";
- /**
- * Constructor, create the AAI manager with the specified REST manager.
- *
- * @param restManager the rest manager to use for REST calls
- */
- public AaiManager(final RestManager restManager) {
- this.restManager = restManager;
- }
+ // The REST manager used for processing REST calls for this AAI manager
+ private final RestManager restManager;
/**
* Creates the custom query payload from a tenant query response.
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/util/Serialization.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/util/Serialization.java
index 7a14a854f..4b2be050a 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/util/Serialization.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/util/Serialization.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* aai
* ================================================================================
- * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2021 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,12 +23,11 @@ package org.onap.policy.aai.util;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class Serialization {
public static final Gson gsonPretty = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting().create();
-
- private Serialization() {
- // Private constructor to prevent subclassing
- }
}