ing

src/main/java/com/loafle/overflow/model/discovery/DiscoverHost.java

@@ -1,85 +1,19 @@
 package com.loafle.overflow.model.discovery;
 
+import com.loafle.overflow.model.meta.MetaIPType;
+
 /**
  * DiscoveryHost
  */
 public class DiscoverHost {
-  private String firstScanRangev4;
-  private String lastScanRangev4;
-  private String[] excludeHostsv4;
-  private String[] includeHostsv4;
-
-  private String firstScanRangev6;
-  private String lastScanRangev6;
-  private String[] excludeHostsv6;
-  private String[] includeHostsv6;
+  private MetaIPType metaIPType;
+  private String firstScanRange;
+  private String lastScanRange;
+  private String[] excludeHosts;
+  private String[] includeHosts;
 
   private DiscoverPort discoverPort;
 
-  public String getFirstScanRangev4() {
-    return firstScanRangev4;
-  }
-
-  public void setFirstScanRangev4(String firstScanRangev4) {
-    this.firstScanRangev4 = firstScanRangev4;
-  }
-
-  public String getLastScanRangev4() {
-    return lastScanRangev4;
-  }
-
-  public void setLastScanRangev4(String lastScanRangev4) {
-    this.lastScanRangev4 = lastScanRangev4;
-  }
-
-  public String[] getExcludeHostsv4() {
-    return excludeHostsv4;
-  }
-
-  public void setExcludeHostsv4(String[] excludeHostsv4) {
-    this.excludeHostsv4 = excludeHostsv4;
-  }
-
-  public String[] getIncludeHostsv4() {
-    return includeHostsv4;
-  }
-
-  public void setIncludeHostsv4(String[] includeHostsv4) {
-    this.includeHostsv4 = includeHostsv4;
-  }
-
-  public String getFirstScanRangev6() {
-    return firstScanRangev6;
-  }
-
-  public void setFirstScanRangev6(String firstScanRangev6) {
-    this.firstScanRangev6 = firstScanRangev6;
-  }
-
-  public String getLastScanRangev6() {
-    return lastScanRangev6;
-  }
-
-  public void setLastScanRangev6(String lastScanRangev6) {
-    this.lastScanRangev6 = lastScanRangev6;
-  }
-
-  public String[] getExcludeHostsv6() {
-    return excludeHostsv6;
-  }
-
-  public void setExcludeHostsv6(String[] excludeHostsv6) {
-    this.excludeHostsv6 = excludeHostsv6;
-  }
-
-  public String[] getIncludeHostsv6() {
-    return includeHostsv6;
-  }
-
-  public void setIncludeHostsv6(String[] includeHostsv6) {
-    this.includeHostsv6 = includeHostsv6;
-  }
-
   public DiscoverPort getDiscoverPort() {
     return discoverPort;
   }
@@ -87,4 +21,74 @@ public class DiscoverHost {
   public void setDiscoverPort(DiscoverPort discoverPort) {
     this.discoverPort = discoverPort;
   }
+
+  /**
+   * @return the metaIPType
+   */
+  public MetaIPType getMetaIPType() {
+    return metaIPType;
+  }
+
+  /**
+   * @param metaIPType the metaIPType to set
+   */
+  public void setMetaIPType(MetaIPType metaIPType) {
+    this.metaIPType = metaIPType;
+  }
+
+  /**
+   * @return the firstScanRange
+   */
+  public String getFirstScanRange() {
+    return firstScanRange;
+  }
+
+  /**
+   * @param firstScanRange the firstScanRange to set
+   */
+  public void setFirstScanRange(String firstScanRange) {
+    this.firstScanRange = firstScanRange;
+  }
+
+  /**
+   * @return the lastScanRange
+   */
+  public String getLastScanRange() {
+    return lastScanRange;
+  }
+
+  /**
+   * @param lastScanRange the lastScanRange to set
+   */
+  public void setLastScanRange(String lastScanRange) {
+    this.lastScanRange = lastScanRange;
+  }
+
+  /**
+   * @return the excludeHosts
+   */
+  public String[] getExcludeHosts() {
+    return excludeHosts;
+  }
+
+  /**
+   * @param excludeHosts the excludeHosts to set
+   */
+  public void setExcludeHosts(String[] excludeHosts) {
+    this.excludeHosts = excludeHosts;
+  }
+
+  /**
+   * @return the includeHosts
+   */
+  public String[] getIncludeHosts() {
+    return includeHosts;
+  }
+
+  /**
+   * @param includeHosts the includeHosts to set
+   */
+  public void setIncludeHosts(String[] includeHosts) {
+    this.includeHosts = includeHosts;
+  }
 }

src/main/java/com/loafle/overflow/model/discovery/Host.java

@@ -3,12 +3,14 @@ package com.loafle.overflow.model.discovery;
 import java.util.Date;
 import java.util.List;
 
+import com.loafle.overflow.model.meta.MetaIPType;
+
 /**
  * Created by root on 17. 6. 4.
  */
 
 public class Host {
-  private String metaIPTypeKey;
+  private MetaIPType metaIPType;
   private String address;
   private String mac;
 
@@ -65,16 +67,17 @@ public class Host {
   }
 
   /**
-   * @return the metaIPTypeKey
+   * @return the metaIPType
    */
-  public String getMetaIPTypeKey() {
-    return metaIPTypeKey;
+  public MetaIPType getMetaIPType() {
+    return metaIPType;
   }
 
   /**
-   * @param metaIPTypeKey the metaIPTypeKey to set
+   * @param metaIPType the metaIPType to set
    */
-  public void setMetaIPTypeKey(String metaIPTypeKey) {
-    this.metaIPTypeKey = metaIPTypeKey;
+  public void setMetaIPType(MetaIPType metaIPType) {
+    this.metaIPType = metaIPType;
   }
+
 }

src/main/java/com/loafle/overflow/model/discovery/Port.java

@@ -3,12 +3,14 @@ package com.loafle.overflow.model.discovery;
 import java.util.Date;
 import java.util.List;
 
+import com.loafle.overflow.model.meta.MetaPortType;
+
 /**
  * Created by root on 17. 6. 4.
  */
 
 public class Port {
-  private String metaPortTypeKey;
+  private MetaPortType metaPortType;
 
   private Integer portNumber;
 
@@ -51,17 +53,17 @@ public class Port {
   }
 
   /**
-   * @return the metaPortTypeKey
+   * @return the metaPortType
    */
-  public String getMetaPortTypeKey() {
-    return metaPortTypeKey;
+  public MetaPortType getMetaPortType() {
+    return metaPortType;
   }
 
   /**
-   * @param metaPortTypeKey the metaPortTypeKey to set
+   * @param metaPortType the metaPortType to set
    */
-  public void setMetaPortTypeKey(String metaPortTypeKey) {
-    this.metaPortTypeKey = metaPortTypeKey;
+  public void setMetaPortType(MetaPortType metaPortType) {
+    this.metaPortType = metaPortType;
   }
 
 }

src/main/java/com/loafle/overflow/model/discovery/Service.java

@@ -2,12 +2,14 @@ package com.loafle.overflow.model.discovery;
 
 import java.util.Date;
 
+import com.loafle.overflow.model.meta.MetaCryptoType;
+
 /**
  * Created by root on 17. 6. 4.
  */
 
 public class Service {
-  private String metaCryptoTypeKey;
+  private MetaCryptoType metaCryptoType;
 
   private String name;
 
@@ -46,17 +48,17 @@ public class Service {
   }
 
   /**
-   * @return the metaCryptoTypeKey
+   * @return the metaCryptoType
    */
-  public String getMetaCryptoTypeKey() {
-    return metaCryptoTypeKey;
+  public MetaCryptoType getMetaCryptoType() {
+    return metaCryptoType;
   }
 
   /**
-   * @param metaCryptoTypeKey the metaCryptoTypeKey to set
+   * @param metaCryptoType the metaCryptoType to set
    */
-  public void setMetaCryptoTypeKey(String metaCryptoTypeKey) {
-    this.metaCryptoTypeKey = metaCryptoTypeKey;
+  public void setMetaCryptoType(MetaCryptoType metaCryptoType) {
+    this.metaCryptoType = metaCryptoType;
   }
 
 }

src/main/java/com/loafle/overflow/model/discovery/Zone.java

@@ -2,13 +2,15 @@ package com.loafle.overflow.model.discovery;
 
 import java.util.Date;
 
+import com.loafle.overflow.model.meta.MetaIPType;
+
 /**
  * Created by snoop on 17. 10. 31.
  */
 public class Zone {
   private String network;
   private String iface;
-  private String metaIPTypeKey;
+  private MetaIPType metaIPType;
   private String address;
   private String mac;
 
@@ -61,16 +63,16 @@ public class Zone {
   }
 
   /**
-   * @return the metaIPTypeKey
+   * @return the metaIPType
    */
-  public String getMetaIPTypeKey() {
-    return metaIPTypeKey;
+  public MetaIPType getMetaIPType() {
+    return metaIPType;
   }
 
   /**
-   * @param metaIPTypeKey the metaIPTypeKey to set
+   * @param metaIPType the metaIPType to set
    */
-  public void setMetaIPTypeKey(String metaIPTypeKey) {
-    this.metaIPTypeKey = metaIPTypeKey;
+  public void setMetaIPType(MetaIPType metaIPType) {
+    this.metaIPType = metaIPType;
   }
 }