diff --git a/src/main/java/com/facebook/openwifirrm/modules/DataCollector.java b/src/main/java/com/facebook/openwifirrm/modules/DataCollector.java index 396b61e..af446d7 100644 --- a/src/main/java/com/facebook/openwifirrm/modules/DataCollector.java +++ b/src/main/java/com/facebook/openwifirrm/modules/DataCollector.java @@ -34,7 +34,7 @@ import com.facebook.openwifirrm.ucentral.UCentralClient; import com.facebook.openwifirrm.ucentral.UCentralKafkaConsumer; import com.facebook.openwifirrm.ucentral.UCentralKafkaConsumer.KafkaRecord; import com.facebook.openwifirrm.ucentral.UCentralUtils; -import com.facebook.openwifirrm.ucentral.UCentralUtils.WifiScanEntry; +import com.facebook.openwifirrm.ucentral.WifiScanEntry; import com.facebook.openwifirrm.ucentral.gw.models.CommandInfo; import com.facebook.openwifirrm.ucentral.gw.models.DeviceCapabilities; import com.facebook.openwifirrm.ucentral.gw.models.DeviceWithStatus; diff --git a/src/main/java/com/facebook/openwifirrm/modules/Modeler.java b/src/main/java/com/facebook/openwifirrm/modules/Modeler.java index f547a95..84d223f 100644 --- a/src/main/java/com/facebook/openwifirrm/modules/Modeler.java +++ b/src/main/java/com/facebook/openwifirrm/modules/Modeler.java @@ -29,7 +29,7 @@ import com.facebook.openwifirrm.ucentral.UCentralClient; import com.facebook.openwifirrm.ucentral.UCentralKafkaConsumer; import com.facebook.openwifirrm.ucentral.UCentralKafkaConsumer.KafkaRecord; import com.facebook.openwifirrm.ucentral.UCentralUtils; -import com.facebook.openwifirrm.ucentral.UCentralUtils.WifiScanEntry; +import com.facebook.openwifirrm.ucentral.WifiScanEntry; import com.facebook.openwifirrm.ucentral.gw.models.DeviceCapabilities; import com.facebook.openwifirrm.ucentral.gw.models.DeviceWithStatus; import com.facebook.openwifirrm.ucentral.gw.models.ServiceEvent; diff --git a/src/main/java/com/facebook/openwifirrm/modules/ModelerUtils.java b/src/main/java/com/facebook/openwifirrm/modules/ModelerUtils.java index 7ba5b5f..449529e 100644 --- a/src/main/java/com/facebook/openwifirrm/modules/ModelerUtils.java +++ b/src/main/java/com/facebook/openwifirrm/modules/ModelerUtils.java @@ -21,7 +21,7 @@ import org.slf4j.LoggerFactory; import com.facebook.openwifirrm.aggregators.Aggregator; import com.facebook.openwifirrm.aggregators.MeanAggregator; import com.facebook.openwifirrm.modules.Modeler.DataModel; -import com.facebook.openwifirrm.ucentral.UCentralUtils.WifiScanEntry; +import com.facebook.openwifirrm.ucentral.WifiScanEntry; import com.facebook.openwifirrm.ucentral.operationelement.HTOperationElement; import com.facebook.openwifirrm.ucentral.operationelement.VHTOperationElement; diff --git a/src/main/java/com/facebook/openwifirrm/mysql/DatabaseManager.java b/src/main/java/com/facebook/openwifirrm/mysql/DatabaseManager.java index 184dede..560039c 100644 --- a/src/main/java/com/facebook/openwifirrm/mysql/DatabaseManager.java +++ b/src/main/java/com/facebook/openwifirrm/mysql/DatabaseManager.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.facebook.openwifirrm.Utils; -import com.facebook.openwifirrm.ucentral.UCentralUtils.WifiScanEntry; +import com.facebook.openwifirrm.ucentral.WifiScanEntry; import com.facebook.openwifirrm.ucentral.models.State; import com.google.gson.Gson; import com.google.gson.JsonArray; diff --git a/src/main/java/com/facebook/openwifirrm/optimizers/channel/ChannelOptimizer.java b/src/main/java/com/facebook/openwifirrm/optimizers/channel/ChannelOptimizer.java index 392b4a2..c6412d4 100644 --- a/src/main/java/com/facebook/openwifirrm/optimizers/channel/ChannelOptimizer.java +++ b/src/main/java/com/facebook/openwifirrm/optimizers/channel/ChannelOptimizer.java @@ -24,7 +24,7 @@ import com.facebook.openwifirrm.modules.ConfigManager; import com.facebook.openwifirrm.modules.Modeler.DataModel; import com.facebook.openwifirrm.ucentral.UCentralConstants; import com.facebook.openwifirrm.ucentral.UCentralUtils; -import com.facebook.openwifirrm.ucentral.UCentralUtils.WifiScanEntry; +import com.facebook.openwifirrm.ucentral.WifiScanEntry; import com.facebook.openwifirrm.ucentral.models.State; import com.facebook.openwifirrm.ucentral.operationelement.HTOperationElement; import com.facebook.openwifirrm.ucentral.operationelement.VHTOperationElement; diff --git a/src/main/java/com/facebook/openwifirrm/optimizers/channel/LeastUsedChannelOptimizer.java b/src/main/java/com/facebook/openwifirrm/optimizers/channel/LeastUsedChannelOptimizer.java index 120b587..78962fb 100644 --- a/src/main/java/com/facebook/openwifirrm/optimizers/channel/LeastUsedChannelOptimizer.java +++ b/src/main/java/com/facebook/openwifirrm/optimizers/channel/LeastUsedChannelOptimizer.java @@ -24,7 +24,7 @@ import com.facebook.openwifirrm.DeviceDataManager; import com.facebook.openwifirrm.modules.Modeler.DataModel; import com.facebook.openwifirrm.ucentral.UCentralConstants; import com.facebook.openwifirrm.ucentral.UCentralUtils; -import com.facebook.openwifirrm.ucentral.UCentralUtils.WifiScanEntry; +import com.facebook.openwifirrm.ucentral.WifiScanEntry; import com.facebook.openwifirrm.ucentral.models.State; /** diff --git a/src/main/java/com/facebook/openwifirrm/optimizers/channel/RandomChannelInitializer.java b/src/main/java/com/facebook/openwifirrm/optimizers/channel/RandomChannelInitializer.java index 074e591..3e22d08 100644 --- a/src/main/java/com/facebook/openwifirrm/optimizers/channel/RandomChannelInitializer.java +++ b/src/main/java/com/facebook/openwifirrm/optimizers/channel/RandomChannelInitializer.java @@ -22,7 +22,7 @@ import org.slf4j.LoggerFactory; import com.facebook.openwifirrm.DeviceDataManager; import com.facebook.openwifirrm.modules.Modeler.DataModel; import com.facebook.openwifirrm.ucentral.UCentralUtils; -import com.facebook.openwifirrm.ucentral.UCentralUtils.WifiScanEntry; +import com.facebook.openwifirrm.ucentral.WifiScanEntry; import com.facebook.openwifirrm.ucentral.models.State; /** diff --git a/src/main/java/com/facebook/openwifirrm/optimizers/channel/UnmanagedApAwareChannelOptimizer.java b/src/main/java/com/facebook/openwifirrm/optimizers/channel/UnmanagedApAwareChannelOptimizer.java index c62aa9d..cecfb5e 100644 --- a/src/main/java/com/facebook/openwifirrm/optimizers/channel/UnmanagedApAwareChannelOptimizer.java +++ b/src/main/java/com/facebook/openwifirrm/optimizers/channel/UnmanagedApAwareChannelOptimizer.java @@ -20,7 +20,7 @@ import org.slf4j.LoggerFactory; import com.facebook.openwifirrm.DeviceDataManager; import com.facebook.openwifirrm.modules.Modeler.DataModel; import com.facebook.openwifirrm.ucentral.UCentralConstants; -import com.facebook.openwifirrm.ucentral.UCentralUtils.WifiScanEntry; +import com.facebook.openwifirrm.ucentral.WifiScanEntry; /** * Unmanaged AP aware least used channel optimizer. diff --git a/src/main/java/com/facebook/openwifirrm/optimizers/tpc/MeasurementBasedApApTPC.java b/src/main/java/com/facebook/openwifirrm/optimizers/tpc/MeasurementBasedApApTPC.java index 2deeab6..094c274 100644 --- a/src/main/java/com/facebook/openwifirrm/optimizers/tpc/MeasurementBasedApApTPC.java +++ b/src/main/java/com/facebook/openwifirrm/optimizers/tpc/MeasurementBasedApApTPC.java @@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory; import com.facebook.openwifirrm.DeviceDataManager; import com.facebook.openwifirrm.modules.Modeler.DataModel; import com.facebook.openwifirrm.ucentral.UCentralUtils; -import com.facebook.openwifirrm.ucentral.UCentralUtils.WifiScanEntry; +import com.facebook.openwifirrm.ucentral.WifiScanEntry; import com.facebook.openwifirrm.ucentral.models.State; import com.google.gson.JsonArray; import com.google.gson.JsonElement; diff --git a/src/main/java/com/facebook/openwifirrm/ucentral/UCentralUtils.java b/src/main/java/com/facebook/openwifirrm/ucentral/UCentralUtils.java index 13f91d5..a9d0683 100644 --- a/src/main/java/com/facebook/openwifirrm/ucentral/UCentralUtils.java +++ b/src/main/java/com/facebook/openwifirrm/ucentral/UCentralUtils.java @@ -16,7 +16,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import java.util.Objects; import java.util.Set; import org.slf4j.Logger; @@ -26,7 +25,6 @@ import com.facebook.openwifirrm.RRMConfig; import com.facebook.openwifirrm.Utils; import com.facebook.openwifirrm.optimizers.channel.ChannelOptimizer; import com.facebook.openwifirrm.ucentral.models.State; -import com.facebook.openwifirrm.ucentral.models.WifiScanEntryResult; import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonElement; @@ -61,60 +59,6 @@ public class UCentralUtils { // This class should not be instantiated. private UCentralUtils() {} - /** - * Extends {@link WifiScanEntryResult} to track the response time of the entry. - */ - public static class WifiScanEntry extends WifiScanEntryResult { - /** - * Unix time in milliseconds (ms). This field is not defined in the uCentral - * API. This is added it because {@link WifiScanEntryResult#tsf} is an unknown - * time reference. - */ - public long unixTimeMs; - - /** Default Constructor. */ - public WifiScanEntry() {} - - /** Copy Constructor. */ - public WifiScanEntry(WifiScanEntry o) { - super(o); - this.unixTimeMs = o.unixTimeMs; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = super.hashCode(); - result = prime * result + Objects.hash(unixTimeMs); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (!super.equals(obj)) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - WifiScanEntry other = (WifiScanEntry) obj; - return unixTimeMs == other.unixTimeMs; - } - - @Override - public String toString() { - return String.format( - "WifiScanEntry[signal=%d, bssid=%s, unixTimeMs=%d]", - signal, - bssid, - unixTimeMs - ); - } - } - /** * Parse a JSON wifi scan result into a list of WifiScanEntry objects. * diff --git a/src/main/java/com/facebook/openwifirrm/ucentral/WifiScanEntry.java b/src/main/java/com/facebook/openwifirrm/ucentral/WifiScanEntry.java new file mode 100644 index 0000000..495abcc --- /dev/null +++ b/src/main/java/com/facebook/openwifirrm/ucentral/WifiScanEntry.java @@ -0,0 +1,67 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under the BSD-style license found in the + * LICENSE file in the root directory of this source tree. + */ + +package com.facebook.openwifirrm.ucentral; + +import java.util.Objects; + +import com.facebook.openwifirrm.ucentral.models.WifiScanEntryResult; + +/** + * Extends {@link WifiScanEntryResult} to track the response time of the entry. + */ +public class WifiScanEntry extends WifiScanEntryResult { + /** + * Unix time in milliseconds (ms). This field is not defined in the uCentral + * API. This is added it because {@link WifiScanEntryResult#tsf} is an unknown + * time reference. + */ + public long unixTimeMs; + + /** Default Constructor. */ + public WifiScanEntry() {} + + /** Copy Constructor. */ + public WifiScanEntry(WifiScanEntry o) { + super(o); + this.unixTimeMs = o.unixTimeMs; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = super.hashCode(); + result = prime * result + Objects.hash(unixTimeMs); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!super.equals(obj)) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + WifiScanEntry other = (WifiScanEntry) obj; + return unixTimeMs == other.unixTimeMs; + } + + @Override + public String toString() { + return String.format( + "WifiScanEntry[signal=%d, bssid=%s, unixTimeMs=%d]", + signal, + bssid, + unixTimeMs + ); + } +} \ No newline at end of file diff --git a/src/test/java/com/facebook/openwifirrm/modules/ModelerUtilsTest.java b/src/test/java/com/facebook/openwifirrm/modules/ModelerUtilsTest.java index 6516e7e..e02d6a6 100644 --- a/src/test/java/com/facebook/openwifirrm/modules/ModelerUtilsTest.java +++ b/src/test/java/com/facebook/openwifirrm/modules/ModelerUtilsTest.java @@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test; import com.facebook.openwifirrm.aggregators.MeanAggregator; import com.facebook.openwifirrm.modules.Modeler.DataModel; import com.facebook.openwifirrm.optimizers.TestUtils; -import com.facebook.openwifirrm.ucentral.UCentralUtils.WifiScanEntry; +import com.facebook.openwifirrm.ucentral.WifiScanEntry; public class ModelerUtilsTest { @Test diff --git a/src/test/java/com/facebook/openwifirrm/optimizers/TestUtils.java b/src/test/java/com/facebook/openwifirrm/optimizers/TestUtils.java index 24195f0..4d48c2f 100644 --- a/src/test/java/com/facebook/openwifirrm/optimizers/TestUtils.java +++ b/src/test/java/com/facebook/openwifirrm/optimizers/TestUtils.java @@ -20,7 +20,7 @@ import java.util.stream.Collectors; import com.facebook.openwifirrm.DeviceTopology; import com.facebook.openwifirrm.ucentral.UCentralConstants; import com.facebook.openwifirrm.ucentral.UCentralUtils; -import com.facebook.openwifirrm.ucentral.UCentralUtils.WifiScanEntry; +import com.facebook.openwifirrm.ucentral.WifiScanEntry; import com.facebook.openwifirrm.ucentral.models.State; import com.google.gson.Gson; import com.google.gson.JsonArray; diff --git a/src/test/java/com/facebook/openwifirrm/optimizers/tpc/MeasurementBasedApApTPCTest.java b/src/test/java/com/facebook/openwifirrm/optimizers/tpc/MeasurementBasedApApTPCTest.java index 34e5773..de119f1 100644 --- a/src/test/java/com/facebook/openwifirrm/optimizers/tpc/MeasurementBasedApApTPCTest.java +++ b/src/test/java/com/facebook/openwifirrm/optimizers/tpc/MeasurementBasedApApTPCTest.java @@ -32,7 +32,7 @@ import com.facebook.openwifirrm.modules.Modeler.DataModel; import com.facebook.openwifirrm.optimizers.TestUtils; import com.facebook.openwifirrm.ucentral.UCentralConstants; import com.facebook.openwifirrm.ucentral.UCentralUtils; -import com.facebook.openwifirrm.ucentral.UCentralUtils.WifiScanEntry; +import com.facebook.openwifirrm.ucentral.WifiScanEntry; import com.facebook.openwifirrm.ucentral.models.State; import com.google.gson.JsonArray;