Merge "Remove this redundant "static" qualifier"

2 files changed, 3 insertions, 26 deletions

diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Segment.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Segment.java
index b5279cd..25e27c3 100644
--- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Segment.java
+++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Segment.java
@@ -14,29 +14,6 @@
  * ============LICENSE_END=========================================================
  */
 
-/*
- * ============LICENSE_START==========================================
- * ===================================================================
- * Copyright (c) 2017 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.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
- *
- */
-
 package com.woorea.openstack.quantum.model;
 
 import java.io.Serializable;
@@ -92,4 +69,4 @@ public class Segment implements Serializable {
                 ", provider:network_type=" + providerNetworkType +
                 ", provider:segmentation_id=" + providerSegmentationId + "]";
     }
-}
+}
\ No newline at end of file
diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Subnet.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Subnet.java
index 90ee325..a2319d4 100644
--- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Subnet.java
+++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Subnet.java
@@ -61,7 +61,7 @@ public class Subnet implements Serializable {
 
     private String id;
 
-    public static enum IpVersion implements Serializable {
+    public enum IpVersion implements Serializable {
         IPV4(4),
         IPV6(6);
         private int code;
@@ -277,4 +277,4 @@ public class Subnet implements Serializable {
                 + dnsNames + ", host_routes=" + hostRoutes + "]";
     }
 
-}
+}
\ No newline at end of file