aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2019-08-14 12:36:05 +0000
committerGerrit Code Review <gerrit@onap.org>2019-08-14 12:36:05 +0000
commit1eaeae75f218b96e3214c8a79de3239413e0aa95 (patch)
treee13f0c1a4f80810715062b21669b3731e01cf874
parent9efa71f87dab47b8f54327d9ba388a365df544ed (diff)
parentcaa4640a087d925e36a6aa231470e30a4c499d52 (diff)
Merge "Move this variable to comply with Java Code Conventions"
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetNetworkCollectionDetails/Vlan.java19
1 files changed, 11 insertions, 8 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetNetworkCollectionDetails/Vlan.java b/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetNetworkCollectionDetails/Vlan.java
index 8d19ad4a7..008f916ca 100644
--- a/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetNetworkCollectionDetails/Vlan.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetNetworkCollectionDetails/Vlan.java
@@ -3,6 +3,7 @@
* VID
* ================================================================================
* Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 IBM.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,7 +27,16 @@ import org.onap.vid.aai.model.interfaces.AaiModelWithRelationships;
@JsonIgnoreProperties(ignoreUnknown = true)
public class Vlan implements AaiModelWithRelationships {
+
+ @JsonProperty("vlan-interface")
+ private final String vlanInterface;
+ @JsonProperty("vlan-id-inner")
+ private final String vlanIdInner;
+
+ @JsonProperty("relationship-list")
+ public final RelationshipList relationshipList;
+
public Vlan(
@JsonProperty("vlan-interface") String vlanInterface,
@JsonProperty("vlan-id-inner") String vlanIdInner,
@@ -36,14 +46,7 @@ public class Vlan implements AaiModelWithRelationships {
this.relationshipList = relationshipList;
}
- @JsonProperty("vlan-interface")
- private final String vlanInterface;
-
- @JsonProperty("vlan-id-inner")
- private final String vlanIdInner;
-
- @JsonProperty("relationship-list")
- public final RelationshipList relationshipList;
+
public String getVlanInterface() {
return vlanInterface;