From c802bc1e792a35f5a89a97aedd353f1ff4972a5e Mon Sep 17 00:00:00 2001
From: botte <b.otte@cablelabs.com>
Date: Sun, 11 Oct 2015 15:26:40 +0000
Subject: All modified files to support the UPDATE CRUD operation.  Also a few
 general tweaks.

Change-Id: Ife64166f2d572ee94f2c393af9ae66cfefa62551
---
 .../com/cablelabs/vcpe/uni/unibase/model/Uni.java  | 27 +++++-----------------
 1 file changed, 6 insertions(+), 21 deletions(-)

(limited to 'uni/unibase/src/main/java/com/cablelabs/vcpe/uni/unibase/model')

diff --git a/uni/unibase/src/main/java/com/cablelabs/vcpe/uni/unibase/model/Uni.java b/uni/unibase/src/main/java/com/cablelabs/vcpe/uni/unibase/model/Uni.java
index 0fc8100..cec4d80 100644
--- a/uni/unibase/src/main/java/com/cablelabs/vcpe/uni/unibase/model/Uni.java
+++ b/uni/unibase/src/main/java/com/cablelabs/vcpe/uni/unibase/model/Uni.java
@@ -38,10 +38,10 @@ public class Uni
 
     public enum PhysMedium { // just a sampling of 802.3 phys layers
         UNASSIGNED     ("UNASSIGNED"),
-        TEN_BASE_T     ("10BASE‑T"),
-        HUNDERED_BASE_T("100BASE‑T"),
-        GIG_BASE_T     ("1000BASE‑T"),
-        TEN_GIG_BASE_T ("10GBASE‑T");
+        TEN_BASE_T     ("10BASE-T"),
+        HUNDERED_BASE_T("100BASE-T"),
+        GIG_BASE_T     ("1000BASE-T"),
+        TEN_GIG_BASE_T ("10GBASE-T");
                             private final String s;
                             private PhysMedium(final String s) {this.s = s;}
                             @Override public String toString() { return s; }
@@ -72,33 +72,18 @@ public class Uni
                         @Override public String toString() { return s; }
         }
 
-    @XmlElement(name="id")
-    private String id;
 
-    @XmlTransient // This does not get written to JSON body
+    private String id;
     private SvcSpeed speed;
-
-    @XmlElement(name="ip-address")
     private String ipAddress;
-
-    @XmlElement(name="mac-address")
     private String macAddress;
-
-    @XmlElement(name="physical-medium")
     private PhysMedium physicalMedium;
-
-    @XmlElement(name="mac-layer")
     private MacLayer macLayer;
-
-    @XmlElement(name="mode")
     private SyncMode mode;
-
-    @XmlElement(name="type")
     private Type type;
-
-    @XmlElement(name="mtu-size")
     private long mtuSize;
 
+
     // no argument constructor required for JAX-RS
     public Uni() {
         this.id              = "unset";
-- 
cgit 1.2.3-korg