diff --git a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/Hotspot20OsuProviders.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/Hotspot20OsuProviders.java index e4802a9..b6aab45 100644 --- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/Hotspot20OsuProviders.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/Hotspot20OsuProviders.java @@ -4,16 +4,19 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; +import com.telecominfraproject.wlan.opensync.ovsdb.dao.OvsdbDao; import com.vmware.ovsdb.protocol.operation.notation.Row; import com.vmware.ovsdb.protocol.operation.notation.Uuid; public class Hotspot20OsuProviders implements Cloneable { - public static String[] ovsdbColumns = { "_version", "osu_nai", "osu_nai2", "osu_icons", "osu_provider_name", +// public static String[] ovsdbColumns = { "_version", "osu_nai", "osu_nai2", "osu_icons", "osu_provider_name", +// "server_uri", "method_list", "_uuid", "osu_friendly_name", "service_description" }; + public static String[] ovsdbColumns = { "_version", "osu_nai", "osu_icons", "server_uri", "method_list", "_uuid", "osu_friendly_name", "service_description" }; public Uuid version; public String osuNai; - public String osuNai2; + /* public String osuNai2; */ public Set osuIcons; public String serverUri; public Set methodList; @@ -31,10 +34,11 @@ public class Hotspot20OsuProviders implements Cloneable { .equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) { this.osuNai = row.getStringColumn("osu_nai"); } - if ((row.getColumns().get("osu_nai2") != null) && row.getColumns().get("osu_nai2").getClass() - .equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) { - this.osuNai2 = row.getStringColumn("osu_nai2"); - } + /* + * if (row.getColumns().containsKey("osu_nai2")) { this.osuNai2 = + * OvsdbDao.getSingleValueFromSet(row, "osu_nai2"); } + */ + this.osuIcons = row.getSetColumn("osu_icons"); if ((row.getColumns().get("server_uri") != null) && row.getColumns().get("server_uri").getClass() .equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) { @@ -72,7 +76,8 @@ public class Hotspot20OsuProviders implements Cloneable { @Override public int hashCode() { - return Objects.hash(methodList, osuFriendlyName, osuIcons, osuNai, osuNai2, serverUri, serviceDescription, uuid, + return Objects.hash(methodList, osuFriendlyName, osuIcons, osuNai, + /* osuNai2, */ serverUri, serviceDescription, uuid, version); } @@ -87,14 +92,15 @@ public class Hotspot20OsuProviders implements Cloneable { Hotspot20OsuProviders other = (Hotspot20OsuProviders) obj; return Objects.equals(methodList, other.methodList) && Objects.equals(osuFriendlyName, other.osuFriendlyName) && Objects.equals(osuIcons, other.osuIcons) && Objects.equals(osuNai, other.osuNai) - && Objects.equals(osuNai2, other.osuNai2) && Objects.equals(serverUri, other.serverUri) + /* && Objects.equals(osuNai2, other.osuNai2) */&& Objects.equals(serverUri, other.serverUri) && Objects.equals(serviceDescription, other.serviceDescription) && Objects.equals(uuid, other.uuid) && Objects.equals(version, other.version); } @Override public String toString() { - return "Hotspot20OsuProviders [version=" + version + ", osuNai=" + osuNai + ", osuNai2=" + osuNai2 + return "Hotspot20OsuProviders [version=" + version + ", osuNai=" + osuNai + /*+ ", osuNai2=" + osuNai2 */ + ", osuIcons=" + osuIcons + ", serverUri=" + serverUri + ", methodList=" + methodList + ", uuid=" + uuid + ", osuFriendlyName=" + osuFriendlyName + ", serviceDescription=" + serviceDescription + "]"; }