diff --git a/base-container/src/main/java/com/whizcontrol/core/server/async/AsyncConfiguration.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/async/AsyncConfiguration.java similarity index 98% rename from base-container/src/main/java/com/whizcontrol/core/server/async/AsyncConfiguration.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/async/AsyncConfiguration.java index 71db106..5d15d2d 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/async/AsyncConfiguration.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/async/AsyncConfiguration.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.async; +package com.telecominfraproject.wlan.core.server.async; import java.util.Collection; import java.util.Iterator; @@ -27,8 +27,8 @@ import org.springframework.util.concurrent.ListenableFuture; import com.netflix.servo.annotations.DataSourceType; import com.netflix.servo.annotations.Monitor; import com.netflix.servo.monitor.Monitors; -import com.whizcontrol.core.server.async.example.AsyncCallerExample; -import com.whizcontrol.core.server.async.example.AsyncExample; +import com.telecominfraproject.wlan.core.server.async.example.AsyncCallerExample; +import com.telecominfraproject.wlan.core.server.async.example.AsyncExample; /** * @author dtoptygin diff --git a/base-container/src/main/java/com/whizcontrol/core/server/async/UncaughtExceptionHandler.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/async/UncaughtExceptionHandler.java similarity index 93% rename from base-container/src/main/java/com/whizcontrol/core/server/async/UncaughtExceptionHandler.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/async/UncaughtExceptionHandler.java index 6533401..6e10cd4 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/async/UncaughtExceptionHandler.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/async/UncaughtExceptionHandler.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.server.async; +package com.telecominfraproject.wlan.core.server.async; import java.lang.reflect.Method; diff --git a/base-container/src/main/java/com/whizcontrol/core/server/async/example/AsyncCallerExample.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/async/example/AsyncCallerExample.java similarity index 94% rename from base-container/src/main/java/com/whizcontrol/core/server/async/example/AsyncCallerExample.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/async/example/AsyncCallerExample.java index c0b3a62..651e9e4 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/async/example/AsyncCallerExample.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/async/example/AsyncCallerExample.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.async.example; +package com.telecominfraproject.wlan.core.server.async.example; import java.util.concurrent.Future; diff --git a/base-container/src/main/java/com/whizcontrol/core/server/async/example/AsyncExample.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/async/example/AsyncExample.java similarity index 96% rename from base-container/src/main/java/com/whizcontrol/core/server/async/example/AsyncExample.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/async/example/AsyncExample.java index f853ec1..c8ec0a8 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/async/example/AsyncExample.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/async/example/AsyncExample.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.async.example; +package com.telecominfraproject.wlan.core.server.async.example; import java.util.concurrent.Future; diff --git a/base-container/src/main/java/com/whizcontrol/core/server/async/example/ExampleStartupCommands.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/async/example/ExampleStartupCommands.java similarity index 93% rename from base-container/src/main/java/com/whizcontrol/core/server/async/example/ExampleStartupCommands.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/async/example/ExampleStartupCommands.java index 89d6e1f..52b8061 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/async/example/ExampleStartupCommands.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/async/example/ExampleStartupCommands.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.async.example; +package com.telecominfraproject.wlan.core.server.async.example; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/base-container/src/main/java/com/whizcontrol/core/server/cache/BaseCache.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/cache/BaseCache.java similarity index 97% rename from base-container/src/main/java/com/whizcontrol/core/server/cache/BaseCache.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/cache/BaseCache.java index 98ba2b1..845076e 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/cache/BaseCache.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/cache/BaseCache.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.server.cache; +package com.telecominfraproject.wlan.core.server.cache; import org.springframework.cache.Cache; import org.springframework.cache.Cache.ValueWrapper; diff --git a/base-container/src/main/java/com/whizcontrol/core/server/cache/CacheConfiguration.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/cache/CacheConfiguration.java similarity index 97% rename from base-container/src/main/java/com/whizcontrol/core/server/cache/CacheConfiguration.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/cache/CacheConfiguration.java index a5cb7a5..070943a 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/cache/CacheConfiguration.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/cache/CacheConfiguration.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.cache; +package com.telecominfraproject.wlan.core.server.cache; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/base-container/src/main/java/com/whizcontrol/core/server/cache/CacheResult.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/cache/CacheResult.java similarity index 88% rename from base-container/src/main/java/com/whizcontrol/core/server/cache/CacheResult.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/cache/CacheResult.java index fa62300..7947ab6 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/cache/CacheResult.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/cache/CacheResult.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.server.cache; +package com.telecominfraproject.wlan.core.server.cache; /** * @author yongli diff --git a/base-container/src/main/java/com/telecominfraproject/wlan/core/server/cache/CacheType.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/cache/CacheType.java new file mode 100644 index 0000000..af458c6 --- /dev/null +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/cache/CacheType.java @@ -0,0 +1,5 @@ +package com.telecominfraproject.wlan.core.server.cache; + +public enum CacheType { + +} diff --git a/base-container/src/main/java/com/whizcontrol/core/server/cache/GetValueOperation.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/cache/GetValueOperation.java similarity index 66% rename from base-container/src/main/java/com/whizcontrol/core/server/cache/GetValueOperation.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/cache/GetValueOperation.java index 13135df..006cfd0 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/cache/GetValueOperation.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/cache/GetValueOperation.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.server.cache; +package com.telecominfraproject.wlan.core.server.cache; /** * @author yongli diff --git a/base-container/src/main/java/com/whizcontrol/core/server/container/BaseConfigResourceProvider.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/BaseConfigResourceProvider.java similarity index 94% rename from base-container/src/main/java/com/whizcontrol/core/server/container/BaseConfigResourceProvider.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/BaseConfigResourceProvider.java index 66e2b14..f52aa37 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/container/BaseConfigResourceProvider.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/BaseConfigResourceProvider.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.server.container; +package com.telecominfraproject.wlan.core.server.container; import java.io.InputStream; import java.nio.charset.StandardCharsets; @@ -13,8 +13,8 @@ import org.slf4j.LoggerFactory; import org.springframework.util.ResourceUtils; import org.springframework.util.StreamUtils; -import com.whizcontrol.core.model.json.BaseJsonModel; -import com.whizcontrol.server.exceptions.ConfigurationException; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.server.exceptions.ConfigurationException; /** * @author yongli diff --git a/base-container/src/main/java/com/whizcontrol/core/server/container/ConnectorProperties.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/ConnectorProperties.java similarity index 86% rename from base-container/src/main/java/com/whizcontrol/core/server/container/ConnectorProperties.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/ConnectorProperties.java index f539aaf..097805e 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/container/ConnectorProperties.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/ConnectorProperties.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.container; +package com.telecominfraproject.wlan.core.server.container; import java.net.InetAddress; diff --git a/base-container/src/main/java/com/whizcontrol/core/server/container/ConnectorPropertiesImpl.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/ConnectorPropertiesImpl.java similarity index 97% rename from base-container/src/main/java/com/whizcontrol/core/server/container/ConnectorPropertiesImpl.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/ConnectorPropertiesImpl.java index a263f5f..05d9271 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/container/ConnectorPropertiesImpl.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/ConnectorPropertiesImpl.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.container; +package com.telecominfraproject.wlan.core.server.container; import java.net.InetAddress; import java.net.UnknownHostException; @@ -7,7 +7,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.env.Environment; -import com.whizcontrol.server.exceptions.ConfigurationException; +import com.telecominfraproject.wlan.server.exceptions.ConfigurationException; /** * @author dtop diff --git a/base-container/src/main/java/com/whizcontrol/core/server/container/ConnectorType.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/ConnectorType.java similarity index 76% rename from base-container/src/main/java/com/whizcontrol/core/server/container/ConnectorType.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/ConnectorType.java index d874e10..edfa291 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/container/ConnectorType.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/ConnectorType.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.container; +package com.telecominfraproject.wlan.core.server.container; /** * @author dtop diff --git a/base-container/src/main/java/com/whizcontrol/core/server/container/DualConnectorContainerCustomizer.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/DualConnectorContainerCustomizer.java similarity index 97% rename from base-container/src/main/java/com/whizcontrol/core/server/container/DualConnectorContainerCustomizer.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/DualConnectorContainerCustomizer.java index 36244dc..13b4e50 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/container/DualConnectorContainerCustomizer.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/DualConnectorContainerCustomizer.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.container; +package com.telecominfraproject.wlan.core.server.container; import org.apache.catalina.connector.Connector; import org.slf4j.Logger; diff --git a/base-container/src/main/java/com/whizcontrol/core/server/container/NoSSLContainerCustomizer.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/NoSSLContainerCustomizer.java similarity index 97% rename from base-container/src/main/java/com/whizcontrol/core/server/container/NoSSLContainerCustomizer.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/NoSSLContainerCustomizer.java index 24a136d..1b604bd 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/container/NoSSLContainerCustomizer.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/NoSSLContainerCustomizer.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.container; +package com.telecominfraproject.wlan.core.server.container; import org.apache.catalina.connector.Connector; import org.slf4j.Logger; diff --git a/base-container/src/main/java/com/whizcontrol/core/server/container/NoSessionRequestWrapper.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/NoSessionRequestWrapper.java similarity index 92% rename from base-container/src/main/java/com/whizcontrol/core/server/container/NoSessionRequestWrapper.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/NoSessionRequestWrapper.java index df60a8f..231941f 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/container/NoSessionRequestWrapper.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/NoSessionRequestWrapper.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.container; +package com.telecominfraproject.wlan.core.server.container; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; diff --git a/base-container/src/main/java/com/whizcontrol/core/server/container/SSLContainerCustomizer.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/SSLContainerCustomizer.java similarity index 97% rename from base-container/src/main/java/com/whizcontrol/core/server/container/SSLContainerCustomizer.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/SSLContainerCustomizer.java index 3aceb54..16208de 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/container/SSLContainerCustomizer.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/SSLContainerCustomizer.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.container; +package com.telecominfraproject.wlan.core.server.container; import java.util.Arrays; diff --git a/base-container/src/main/java/com/whizcontrol/core/server/container/ServerRootWatcher.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/ServerRootWatcher.java similarity index 98% rename from base-container/src/main/java/com/whizcontrol/core/server/container/ServerRootWatcher.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/ServerRootWatcher.java index 0ceae07..5c47f64 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/container/ServerRootWatcher.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/ServerRootWatcher.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.server.container; +package com.telecominfraproject.wlan.core.server.container; import java.io.File; import java.util.Map; diff --git a/base-container/src/main/java/com/whizcontrol/core/server/container/ServletContainerCustomizer.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/ServletContainerCustomizer.java similarity index 98% rename from base-container/src/main/java/com/whizcontrol/core/server/container/ServletContainerCustomizer.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/ServletContainerCustomizer.java index c4008a9..736fd51 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/container/ServletContainerCustomizer.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/ServletContainerCustomizer.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.container; +package com.telecominfraproject.wlan.core.server.container; import java.io.FileNotFoundException; import java.util.Timer; @@ -145,7 +145,7 @@ public abstract class ServletContainerCustomizer implements EmbeddedServletConta if(useCertificateClientAuth){ connector.setAttribute("clientAuth", "true"); // for use with X.509 certificates on the client } else { - connector.setAttribute("clientAuth", "false"); //no auth, just SSL ( basic/digest/form auth can still be used - see com.whizcontrol.core.server.security.WebSecurityConfig ) + connector.setAttribute("clientAuth", "false"); //no auth, just SSL ( basic/digest/form auth can still be used - see com.telecominfraproject.wlan.core.server.security.WebSecurityConfig ) } diff --git a/base-container/src/main/java/com/whizcontrol/core/server/container/ServletFilters.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/ServletFilters.java similarity index 97% rename from base-container/src/main/java/com/whizcontrol/core/server/container/ServletFilters.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/ServletFilters.java index 0eee4fc..6477c9e 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/container/ServletFilters.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/ServletFilters.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.container; +package com.telecominfraproject.wlan.core.server.container; import java.io.IOException; import java.util.Set; @@ -20,7 +20,7 @@ import org.springframework.http.HttpStatus; import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; -import com.whizcontrol.core.server.security.WebSecurityConfig; +import com.telecominfraproject.wlan.core.server.security.WebSecurityConfig; /** * @author dtop diff --git a/base-container/src/main/java/com/whizcontrol/core/server/controller/ping/PingController.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/controller/ping/PingController.java similarity index 89% rename from base-container/src/main/java/com/whizcontrol/core/server/controller/ping/PingController.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/controller/ping/PingController.java index 6ba666f..218251c 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/controller/ping/PingController.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/controller/ping/PingController.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.controller.ping; +package com.telecominfraproject.wlan.core.server.controller.ping; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -8,7 +8,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.whizcontrol.core.server.container.ConnectorProperties; +import com.telecominfraproject.wlan.core.server.container.ConnectorProperties; /** diff --git a/base-container/src/main/java/com/whizcontrol/core/server/controller/ping/PingResponse.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/controller/ping/PingResponse.java similarity index 87% rename from base-container/src/main/java/com/whizcontrol/core/server/controller/ping/PingResponse.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/controller/ping/PingResponse.java index 3168c54..9e20f63 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/controller/ping/PingResponse.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/controller/ping/PingResponse.java @@ -1,6 +1,6 @@ -package com.whizcontrol.core.server.controller.ping; +package com.telecominfraproject.wlan.core.server.controller.ping; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; public class PingResponse extends BaseJsonModel { diff --git a/base-container/src/main/java/com/whizcontrol/core/server/controller/transaction/TransactionManagerConfiguration.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/controller/transaction/TransactionManagerConfiguration.java similarity index 78% rename from base-container/src/main/java/com/whizcontrol/core/server/controller/transaction/TransactionManagerConfiguration.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/controller/transaction/TransactionManagerConfiguration.java index 91ce380..c837e60 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/controller/transaction/TransactionManagerConfiguration.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/controller/transaction/TransactionManagerConfiguration.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.server.controller.transaction; +package com.telecominfraproject.wlan.core.server.controller.transaction; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass; import org.springframework.context.annotation.Bean; @@ -19,7 +19,7 @@ import org.springframework.transaction.PlatformTransactionManager; public class TransactionManagerConfiguration { @Bean - @ConditionalOnMissingClass(value = "com.whizcontrol.core.server.jdbc.BaseDataSourceConfig") + @ConditionalOnMissingClass(value = "com.telecominfraproject.wlan.core.server.jdbc.BaseDataSourceConfig") public PlatformTransactionManager platformTransactionManager() { return new PseudoTransactionManager(); } diff --git a/base-container/src/main/java/com/whizcontrol/core/server/controller/util/DBRetryUtil.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/controller/util/DBRetryUtil.java similarity index 86% rename from base-container/src/main/java/com/whizcontrol/core/server/controller/util/DBRetryUtil.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/controller/util/DBRetryUtil.java index b0d41bd..6fafbad 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/controller/util/DBRetryUtil.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/controller/util/DBRetryUtil.java @@ -1,6 +1,6 @@ -package com.whizcontrol.core.server.controller.util; +package com.telecominfraproject.wlan.core.server.controller.util; -import com.whizcontrol.datastore.exceptions.DsConcurrentModificationException; +import com.telecominfraproject.wlan.datastore.exceptions.DsConcurrentModificationException; /** * Since some of our APIs involve switching states, I prefer to have diff --git a/base-container/src/main/java/com/whizcontrol/core/server/security/AccessType.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/AccessType.java similarity index 73% rename from base-container/src/main/java/com/whizcontrol/core/server/security/AccessType.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/AccessType.java index 28d3825..b0edfc1 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/security/AccessType.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/AccessType.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.security; +package com.telecominfraproject.wlan.core.server.security; public enum AccessType { /** diff --git a/base-container/src/main/java/com/whizcontrol/core/server/security/Auth0AndHttpDigestAuthWebSecurityConfig.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/Auth0AndHttpDigestAuthWebSecurityConfig.java similarity index 92% rename from base-container/src/main/java/com/whizcontrol/core/server/security/Auth0AndHttpDigestAuthWebSecurityConfig.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/Auth0AndHttpDigestAuthWebSecurityConfig.java index e55a461..4e68b64 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/security/Auth0AndHttpDigestAuthWebSecurityConfig.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/Auth0AndHttpDigestAuthWebSecurityConfig.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.security; +package com.telecominfraproject.wlan.core.server.security; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; diff --git a/base-container/src/main/java/com/whizcontrol/core/server/security/AuthProviderInfo.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/AuthProviderInfo.java similarity index 74% rename from base-container/src/main/java/com/whizcontrol/core/server/security/AuthProviderInfo.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/AuthProviderInfo.java index 40c12dc..a053125 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/security/AuthProviderInfo.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/AuthProviderInfo.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.security; +package com.telecominfraproject.wlan.core.server.security; public interface AuthProviderInfo { /** diff --git a/base-container/src/main/java/com/whizcontrol/core/server/security/FormBasedAuthWebSecurityConfig.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/FormBasedAuthWebSecurityConfig.java similarity index 92% rename from base-container/src/main/java/com/whizcontrol/core/server/security/FormBasedAuthWebSecurityConfig.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/FormBasedAuthWebSecurityConfig.java index 7960c57..a83eaa7 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/security/FormBasedAuthWebSecurityConfig.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/FormBasedAuthWebSecurityConfig.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.security; +package com.telecominfraproject.wlan.core.server.security; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; diff --git a/base-container/src/main/java/com/whizcontrol/core/server/security/HttpBasicAuthWebSecurityConfig.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/HttpBasicAuthWebSecurityConfig.java similarity index 92% rename from base-container/src/main/java/com/whizcontrol/core/server/security/HttpBasicAuthWebSecurityConfig.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/HttpBasicAuthWebSecurityConfig.java index 08c6e0c..56650f0 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/security/HttpBasicAuthWebSecurityConfig.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/HttpBasicAuthWebSecurityConfig.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.security; +package com.telecominfraproject.wlan.core.server.security; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; diff --git a/base-container/src/main/java/com/whizcontrol/core/server/security/HttpDigestAuthWebSecurityConfig.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/HttpDigestAuthWebSecurityConfig.java similarity index 92% rename from base-container/src/main/java/com/whizcontrol/core/server/security/HttpDigestAuthWebSecurityConfig.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/HttpDigestAuthWebSecurityConfig.java index 6ce4baa..e2be102 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/security/HttpDigestAuthWebSecurityConfig.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/HttpDigestAuthWebSecurityConfig.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.security; +package com.telecominfraproject.wlan.core.server.security; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; diff --git a/base-container/src/main/java/com/whizcontrol/core/server/security/NoAuthWebSecurityConfig.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/NoAuthWebSecurityConfig.java similarity index 91% rename from base-container/src/main/java/com/whizcontrol/core/server/security/NoAuthWebSecurityConfig.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/NoAuthWebSecurityConfig.java index 6810e7b..92fb194 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/security/NoAuthWebSecurityConfig.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/NoAuthWebSecurityConfig.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.security; +package com.telecominfraproject.wlan.core.server.security; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; diff --git a/base-container/src/main/java/com/whizcontrol/core/server/security/WebSecurityConfig.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/WebSecurityConfig.java similarity index 97% rename from base-container/src/main/java/com/whizcontrol/core/server/security/WebSecurityConfig.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/WebSecurityConfig.java index 17ce46f..462dd23 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/security/WebSecurityConfig.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/WebSecurityConfig.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.security; +package com.telecominfraproject.wlan.core.server.security; import java.io.IOException; import java.security.MessageDigest; @@ -63,11 +63,11 @@ import org.springframework.security.web.header.HeaderWriter; import org.springframework.security.web.util.matcher.AnyRequestMatcher; import org.springframework.security.web.util.matcher.RequestMatcher; -import com.whizcontrol.core.server.container.ConnectorProperties; -import com.whizcontrol.core.server.security.auth0.Auth0AuthenticationEntryPoint; -import com.whizcontrol.core.server.security.auth0.Auth0AuthenticationFilter; -import com.whizcontrol.core.server.security.auth0.Auth0AuthenticationProvider; -import com.whizcontrol.server.exceptions.ConfigurationException; +import com.telecominfraproject.wlan.core.server.container.ConnectorProperties; +import com.telecominfraproject.wlan.core.server.security.auth0.Auth0AuthenticationEntryPoint; +import com.telecominfraproject.wlan.core.server.security.auth0.Auth0AuthenticationFilter; +import com.telecominfraproject.wlan.core.server.security.auth0.Auth0AuthenticationProvider; +import com.telecominfraproject.wlan.server.exceptions.ConfigurationException; /** * @author dtoptygin @@ -354,7 +354,7 @@ public abstract class WebSecurityConfig extends WebSecurityConfigurerAdapter { /** * Call this method to set up form-based http authentication for use with - * portals Make sure com.whizcontrol.core.server.ServletContainerCustomizer + * portals Make sure com.telecominfraproject.wlan.core.server.ServletContainerCustomizer * is using connector.setAttribute("clientAuth", "false") * * Examples of calling web service: with self-signed certificates: 1. Call @@ -395,7 +395,7 @@ public abstract class WebSecurityConfig extends WebSecurityConfigurerAdapter { /** * Call this method to set up basic http authentication for use with REST * web services Make sure - * com.whizcontrol.core.server.ServletContainerCustomizer is using + * com.telecominfraproject.wlan.core.server.ServletContainerCustomizer is using * connector.setAttribute("clientAuth", "false") * * Examples of calling web service: with self-signed certificates: wget @@ -427,7 +427,7 @@ public abstract class WebSecurityConfig extends WebSecurityConfigurerAdapter { /** * Call this method to set up digest http authentication for use with REST * web services Make sure - * com.whizcontrol.core.server.ServletContainerCustomizer is using + * com.telecominfraproject.wlan.core.server.ServletContainerCustomizer is using * connector.setAttribute("clientAuth", "false") * * Examples of calling web service: with self-signed certificates: wget @@ -536,7 +536,7 @@ public abstract class WebSecurityConfig extends WebSecurityConfigurerAdapter { /** * Call this method to set up X509 Certificate authentication for use with * REST web services Make sure - * com.whizcontrol.core.server.ServletContainerCustomizer is using + * com.telecominfraproject.wlan.core.server.ServletContainerCustomizer is using * connector.setAttribute("clientAuth", "true") * * Examples of calling web service: with self-signed certificates: wget diff --git a/base-container/src/main/java/com/whizcontrol/core/server/security/X509CertificateAndHttpBasicAuthWebSecurityConfig.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/X509CertificateAndHttpBasicAuthWebSecurityConfig.java similarity index 93% rename from base-container/src/main/java/com/whizcontrol/core/server/security/X509CertificateAndHttpBasicAuthWebSecurityConfig.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/X509CertificateAndHttpBasicAuthWebSecurityConfig.java index 605fb99..5d6a2d4 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/security/X509CertificateAndHttpBasicAuthWebSecurityConfig.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/X509CertificateAndHttpBasicAuthWebSecurityConfig.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.security; +package com.telecominfraproject.wlan.core.server.security; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; diff --git a/base-container/src/main/java/com/whizcontrol/core/server/security/X509CertificateAndHttpDigestAuthWebSecurityConfig.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/X509CertificateAndHttpDigestAuthWebSecurityConfig.java similarity index 93% rename from base-container/src/main/java/com/whizcontrol/core/server/security/X509CertificateAndHttpDigestAuthWebSecurityConfig.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/X509CertificateAndHttpDigestAuthWebSecurityConfig.java index afbda65..202e9ee 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/security/X509CertificateAndHttpDigestAuthWebSecurityConfig.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/X509CertificateAndHttpDigestAuthWebSecurityConfig.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.security; +package com.telecominfraproject.wlan.core.server.security; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; diff --git a/base-container/src/main/java/com/whizcontrol/core/server/security/X509CertificateAuthWebSecurityConfig.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/X509CertificateAuthWebSecurityConfig.java similarity index 92% rename from base-container/src/main/java/com/whizcontrol/core/server/security/X509CertificateAuthWebSecurityConfig.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/X509CertificateAuthWebSecurityConfig.java index 34d0caf..b72670d 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/security/X509CertificateAuthWebSecurityConfig.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/X509CertificateAuthWebSecurityConfig.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.security; +package com.telecominfraproject.wlan.core.server.security; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; diff --git a/base-container/src/main/java/com/whizcontrol/core/server/security/auth0/Auth0AuthenticationEntryPoint.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/auth0/Auth0AuthenticationEntryPoint.java similarity index 95% rename from base-container/src/main/java/com/whizcontrol/core/server/security/auth0/Auth0AuthenticationEntryPoint.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/auth0/Auth0AuthenticationEntryPoint.java index 967dbb3..671ee9d 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/security/auth0/Auth0AuthenticationEntryPoint.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/auth0/Auth0AuthenticationEntryPoint.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.security.auth0; +package com.telecominfraproject.wlan.core.server.security.auth0; import java.io.IOException; import java.io.PrintWriter; diff --git a/base-container/src/main/java/com/whizcontrol/core/server/security/auth0/Auth0AuthenticationFilter.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/auth0/Auth0AuthenticationFilter.java similarity index 97% rename from base-container/src/main/java/com/whizcontrol/core/server/security/auth0/Auth0AuthenticationFilter.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/auth0/Auth0AuthenticationFilter.java index 4d00056..fa17e7d 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/security/auth0/Auth0AuthenticationFilter.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/auth0/Auth0AuthenticationFilter.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.security.auth0; +package com.telecominfraproject.wlan.core.server.security.auth0; import java.io.IOException; import java.util.regex.Pattern; diff --git a/base-container/src/main/java/com/whizcontrol/core/server/security/auth0/Auth0AuthenticationProvider.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/auth0/Auth0AuthenticationProvider.java similarity index 95% rename from base-container/src/main/java/com/whizcontrol/core/server/security/auth0/Auth0AuthenticationProvider.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/auth0/Auth0AuthenticationProvider.java index bcd033c..f2d2334 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/security/auth0/Auth0AuthenticationProvider.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/auth0/Auth0AuthenticationProvider.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.security.auth0; +package com.telecominfraproject.wlan.core.server.security.auth0; import java.io.IOException; import java.security.InvalidKeyException; @@ -15,8 +15,8 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; import com.auth0.jwt.JWTVerifier; -import com.whizcontrol.core.server.security.AccessType; -import com.whizcontrol.server.exceptions.ConfigurationException; +import com.telecominfraproject.wlan.core.server.security.AccessType; +import com.telecominfraproject.wlan.server.exceptions.ConfigurationException; /** * Class that verifies the JWT token and in case of beeing valid, it will set diff --git a/base-container/src/main/java/com/whizcontrol/core/server/security/auth0/Auth0JWTToken.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/auth0/Auth0JWTToken.java similarity index 94% rename from base-container/src/main/java/com/whizcontrol/core/server/security/auth0/Auth0JWTToken.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/auth0/Auth0JWTToken.java index 4df8b74..944dab4 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/security/auth0/Auth0JWTToken.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/auth0/Auth0JWTToken.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.security.auth0; +package com.telecominfraproject.wlan.core.server.security.auth0; import java.util.Collection; diff --git a/base-container/src/main/java/com/whizcontrol/core/server/security/auth0/Auth0TokenException.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/auth0/Auth0TokenException.java similarity index 89% rename from base-container/src/main/java/com/whizcontrol/core/server/security/auth0/Auth0TokenException.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/auth0/Auth0TokenException.java index 6e02b7a..1e19fd9 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/security/auth0/Auth0TokenException.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/auth0/Auth0TokenException.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.security.auth0; +package com.telecominfraproject.wlan.core.server.security.auth0; import org.springframework.security.core.AuthenticationException; diff --git a/base-container/src/main/java/com/whizcontrol/core/server/security/auth0/Auth0TokenHelper.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/auth0/Auth0TokenHelper.java similarity index 67% rename from base-container/src/main/java/com/whizcontrol/core/server/security/auth0/Auth0TokenHelper.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/auth0/Auth0TokenHelper.java index beec45a..3357ca6 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/security/auth0/Auth0TokenHelper.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/auth0/Auth0TokenHelper.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.security.auth0; +package com.telecominfraproject.wlan.core.server.security.auth0; public interface Auth0TokenHelper { diff --git a/base-container/src/main/java/com/whizcontrol/core/server/security/auth0/Auth0UserDetails.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/auth0/Auth0UserDetails.java similarity index 94% rename from base-container/src/main/java/com/whizcontrol/core/server/security/auth0/Auth0UserDetails.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/auth0/Auth0UserDetails.java index 5e05279..700745a 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/security/auth0/Auth0UserDetails.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/auth0/Auth0UserDetails.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.security.auth0; +package com.telecominfraproject.wlan.core.server.security.auth0; import java.util.ArrayList; import java.util.Collection; @@ -10,8 +10,8 @@ import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; -import com.whizcontrol.core.server.security.AccessType; -import com.whizcontrol.core.server.security.AuthProviderInfo; +import com.telecominfraproject.wlan.core.server.security.AccessType; +import com.telecominfraproject.wlan.core.server.security.AuthProviderInfo; /** * Implementation of UserDetails in compliance with the decoded object returned diff --git a/base-container/src/main/java/com/whizcontrol/core/server/security/auth0/impl/Auth0RuntimeException.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/auth0/impl/Auth0RuntimeException.java similarity index 83% rename from base-container/src/main/java/com/whizcontrol/core/server/security/auth0/impl/Auth0RuntimeException.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/auth0/impl/Auth0RuntimeException.java index db4b868..19f3543 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/security/auth0/impl/Auth0RuntimeException.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/auth0/impl/Auth0RuntimeException.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.security.auth0.impl; +package com.telecominfraproject.wlan.core.server.security.auth0.impl; public class Auth0RuntimeException extends RuntimeException { diff --git a/base-container/src/main/java/com/whizcontrol/core/server/security/auth0/impl/Auth0TokenHelperImpl.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/auth0/impl/Auth0TokenHelperImpl.java similarity index 94% rename from base-container/src/main/java/com/whizcontrol/core/server/security/auth0/impl/Auth0TokenHelperImpl.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/auth0/impl/Auth0TokenHelperImpl.java index 970b5fc..fcf4118 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/security/auth0/impl/Auth0TokenHelperImpl.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/auth0/impl/Auth0TokenHelperImpl.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.security.auth0.impl; +package com.telecominfraproject.wlan.core.server.security.auth0.impl; import java.io.IOException; import java.security.InvalidKeyException; @@ -18,7 +18,7 @@ import com.auth0.jwt.JWTVerifier; import com.auth0.jwt.JwtSigner; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.whizcontrol.core.server.security.auth0.Auth0TokenHelper; +import com.telecominfraproject.wlan.core.server.security.auth0.Auth0TokenHelper; public class Auth0TokenHelperImpl implements Auth0TokenHelper, InitializingBean { diff --git a/base-container/src/main/java/com/whizcontrol/core/server/security/cors/StaticCorsFilter.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/cors/StaticCorsFilter.java similarity index 95% rename from base-container/src/main/java/com/whizcontrol/core/server/security/cors/StaticCorsFilter.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/cors/StaticCorsFilter.java index 9b0ca5d..fcfa7f6 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/security/cors/StaticCorsFilter.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/cors/StaticCorsFilter.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.security.cors; +package com.telecominfraproject.wlan.core.server.security.cors; import java.io.IOException; import javax.servlet.Filter; diff --git a/base-container/src/main/java/com/whizcontrol/core/server/tx/TxConfiguration.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/tx/TxConfiguration.java similarity index 97% rename from base-container/src/main/java/com/whizcontrol/core/server/tx/TxConfiguration.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/tx/TxConfiguration.java index 85460a3..9f8f3c4 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/tx/TxConfiguration.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/tx/TxConfiguration.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.tx; +package com.telecominfraproject.wlan.core.server.tx; import org.springframework.context.annotation.Configuration; import org.springframework.transaction.annotation.EnableTransactionManagement; diff --git a/base-container/src/main/java/com/whizcontrol/core/server/webconfig/CommonControllerAdvice.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/webconfig/CommonControllerAdvice.java similarity index 94% rename from base-container/src/main/java/com/whizcontrol/core/server/webconfig/CommonControllerAdvice.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/webconfig/CommonControllerAdvice.java index e498fa8..41ae391 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/webconfig/CommonControllerAdvice.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/webconfig/CommonControllerAdvice.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.webconfig; +package com.telecominfraproject.wlan.core.server.webconfig; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; -import com.whizcontrol.core.model.json.JsonSerializedException; +import com.telecominfraproject.wlan.core.model.json.JsonSerializedException; /** * @author dtoptygin diff --git a/base-container/src/main/java/com/whizcontrol/core/server/webconfig/WebConfig.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/webconfig/WebConfig.java similarity index 97% rename from base-container/src/main/java/com/whizcontrol/core/server/webconfig/WebConfig.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/webconfig/WebConfig.java index 2399b7d..25445ba 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/webconfig/WebConfig.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/webconfig/WebConfig.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.server.webconfig; +package com.telecominfraproject.wlan.core.server.webconfig; import java.util.ArrayList; import java.util.List; @@ -19,7 +19,7 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistra import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; /** * @author dtoptygin diff --git a/base-container/src/main/java/com/whizcontrol/core/server/webconfig/WebGenericConverter.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/webconfig/WebGenericConverter.java similarity index 98% rename from base-container/src/main/java/com/whizcontrol/core/server/webconfig/WebGenericConverter.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/webconfig/WebGenericConverter.java index 1a55c07..47cf1de 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/webconfig/WebGenericConverter.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/webconfig/WebGenericConverter.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.server.webconfig; +package com.telecominfraproject.wlan.core.server.webconfig; import java.util.ArrayList; import java.util.Collection; @@ -14,7 +14,7 @@ import org.slf4j.LoggerFactory; import org.springframework.core.convert.TypeDescriptor; import org.springframework.core.convert.converter.GenericConverter; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; /** * @author dtoptygin diff --git a/base-container/src/main/java/com/whizcontrol/core/server/webconfig/WebMvcRegistrationsConfiguration.java b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/webconfig/WebMvcRegistrationsConfiguration.java similarity index 97% rename from base-container/src/main/java/com/whizcontrol/core/server/webconfig/WebMvcRegistrationsConfiguration.java rename to base-container/src/main/java/com/telecominfraproject/wlan/core/server/webconfig/WebMvcRegistrationsConfiguration.java index 6a79ba1..574d04d 100644 --- a/base-container/src/main/java/com/whizcontrol/core/server/webconfig/WebMvcRegistrationsConfiguration.java +++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/webconfig/WebMvcRegistrationsConfiguration.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.server.webconfig; +package com.telecominfraproject.wlan.core.server.webconfig; import java.lang.reflect.Method; diff --git a/base-container/src/main/java/com/whizcontrol/core/server/cache/CacheType.java b/base-container/src/main/java/com/whizcontrol/core/server/cache/CacheType.java deleted file mode 100644 index c6f3e42..0000000 --- a/base-container/src/main/java/com/whizcontrol/core/server/cache/CacheType.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.whizcontrol.core.server.cache; - -public enum CacheType { - -} diff --git a/base-elasticsearch/src/main/java/com/whizcontrol/elasticsearch/client/BaseElasticSearchAWSClientConfigurer.java b/base-elasticsearch/src/main/java/com/telecominfraproject/wlan/elasticsearch/client/BaseElasticSearchAWSClientConfigurer.java similarity index 98% rename from base-elasticsearch/src/main/java/com/whizcontrol/elasticsearch/client/BaseElasticSearchAWSClientConfigurer.java rename to base-elasticsearch/src/main/java/com/telecominfraproject/wlan/elasticsearch/client/BaseElasticSearchAWSClientConfigurer.java index 473147c..8490259 100644 --- a/base-elasticsearch/src/main/java/com/whizcontrol/elasticsearch/client/BaseElasticSearchAWSClientConfigurer.java +++ b/base-elasticsearch/src/main/java/com/telecominfraproject/wlan/elasticsearch/client/BaseElasticSearchAWSClientConfigurer.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.elasticsearch.client; +package com.telecominfraproject.wlan.elasticsearch.client; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/base-elasticsearch/src/main/java/com/whizcontrol/elasticsearch/client/BaseElasticSearchClientConfigurer.java b/base-elasticsearch/src/main/java/com/telecominfraproject/wlan/elasticsearch/client/BaseElasticSearchClientConfigurer.java similarity index 97% rename from base-elasticsearch/src/main/java/com/whizcontrol/elasticsearch/client/BaseElasticSearchClientConfigurer.java rename to base-elasticsearch/src/main/java/com/telecominfraproject/wlan/elasticsearch/client/BaseElasticSearchClientConfigurer.java index d34380a..818848f 100644 --- a/base-elasticsearch/src/main/java/com/whizcontrol/elasticsearch/client/BaseElasticSearchClientConfigurer.java +++ b/base-elasticsearch/src/main/java/com/telecominfraproject/wlan/elasticsearch/client/BaseElasticSearchClientConfigurer.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.elasticsearch.client; +package com.telecominfraproject.wlan.elasticsearch.client; import java.net.InetAddress; import java.net.UnknownHostException; @@ -13,7 +13,7 @@ import org.elasticsearch.common.transport.InetSocketTransportAddress; import org.slf4j.Logger; import org.springframework.core.env.Environment; -import com.whizcontrol.server.exceptions.ConfigurationException; +import com.telecominfraproject.wlan.server.exceptions.ConfigurationException; /** * Configure TransportClient for Elasticsearch diff --git a/base-elasticsearch/src/main/java/com/whizcontrol/elasticsearch/client/BaseElasticSearchStaticClientConfigurer.java b/base-elasticsearch/src/main/java/com/telecominfraproject/wlan/elasticsearch/client/BaseElasticSearchStaticClientConfigurer.java similarity index 95% rename from base-elasticsearch/src/main/java/com/whizcontrol/elasticsearch/client/BaseElasticSearchStaticClientConfigurer.java rename to base-elasticsearch/src/main/java/com/telecominfraproject/wlan/elasticsearch/client/BaseElasticSearchStaticClientConfigurer.java index a12c7b2..5d6059a 100644 --- a/base-elasticsearch/src/main/java/com/whizcontrol/elasticsearch/client/BaseElasticSearchStaticClientConfigurer.java +++ b/base-elasticsearch/src/main/java/com/telecominfraproject/wlan/elasticsearch/client/BaseElasticSearchStaticClientConfigurer.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.elasticsearch.client; +package com.telecominfraproject.wlan.elasticsearch.client; import java.util.Set; import java.util.TreeSet; diff --git a/base-exceptions/src/main/java/com/whizcontrol/client/exceptions/ClientIncorrectServerException.java b/base-exceptions/src/main/java/com/telecominfraproject/wlan/client/exceptions/ClientIncorrectServerException.java similarity index 92% rename from base-exceptions/src/main/java/com/whizcontrol/client/exceptions/ClientIncorrectServerException.java rename to base-exceptions/src/main/java/com/telecominfraproject/wlan/client/exceptions/ClientIncorrectServerException.java index c550f09..efb34f4 100644 --- a/base-exceptions/src/main/java/com/whizcontrol/client/exceptions/ClientIncorrectServerException.java +++ b/base-exceptions/src/main/java/com/telecominfraproject/wlan/client/exceptions/ClientIncorrectServerException.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.client.exceptions; +package com.telecominfraproject.wlan.client.exceptions; /** * Exception with message set to the remote URL the request should be redirect diff --git a/base-exceptions/src/main/java/com/whizcontrol/client/exceptions/ClientRemoteConnectionException.java b/base-exceptions/src/main/java/com/telecominfraproject/wlan/client/exceptions/ClientRemoteConnectionException.java similarity index 91% rename from base-exceptions/src/main/java/com/whizcontrol/client/exceptions/ClientRemoteConnectionException.java rename to base-exceptions/src/main/java/com/telecominfraproject/wlan/client/exceptions/ClientRemoteConnectionException.java index ec0db78..f616f86 100644 --- a/base-exceptions/src/main/java/com/whizcontrol/client/exceptions/ClientRemoteConnectionException.java +++ b/base-exceptions/src/main/java/com/telecominfraproject/wlan/client/exceptions/ClientRemoteConnectionException.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.client.exceptions; +package com.telecominfraproject.wlan.client.exceptions; /** * Remote API Call connection exception diff --git a/base-exceptions/src/main/java/com/whizcontrol/datastore/exceptions/DsConcurrentModificationException.java b/base-exceptions/src/main/java/com/telecominfraproject/wlan/datastore/exceptions/DsConcurrentModificationException.java similarity index 89% rename from base-exceptions/src/main/java/com/whizcontrol/datastore/exceptions/DsConcurrentModificationException.java rename to base-exceptions/src/main/java/com/telecominfraproject/wlan/datastore/exceptions/DsConcurrentModificationException.java index 336af32..7c3133b 100644 --- a/base-exceptions/src/main/java/com/whizcontrol/datastore/exceptions/DsConcurrentModificationException.java +++ b/base-exceptions/src/main/java/com/telecominfraproject/wlan/datastore/exceptions/DsConcurrentModificationException.java @@ -1,4 +1,4 @@ -package com.whizcontrol.datastore.exceptions; +package com.telecominfraproject.wlan.datastore.exceptions; public class DsConcurrentModificationException extends RuntimeException { diff --git a/base-exceptions/src/main/java/com/whizcontrol/datastore/exceptions/DsDataValidationException.java b/base-exceptions/src/main/java/com/telecominfraproject/wlan/datastore/exceptions/DsDataValidationException.java similarity index 93% rename from base-exceptions/src/main/java/com/whizcontrol/datastore/exceptions/DsDataValidationException.java rename to base-exceptions/src/main/java/com/telecominfraproject/wlan/datastore/exceptions/DsDataValidationException.java index 3817623..e174fde 100644 --- a/base-exceptions/src/main/java/com/whizcontrol/datastore/exceptions/DsDataValidationException.java +++ b/base-exceptions/src/main/java/com/telecominfraproject/wlan/datastore/exceptions/DsDataValidationException.java @@ -1,4 +1,4 @@ -package com.whizcontrol.datastore.exceptions; +package com.telecominfraproject.wlan.datastore.exceptions; import java.util.ArrayList; import java.util.List; diff --git a/base-exceptions/src/main/java/com/whizcontrol/datastore/exceptions/DsDuplicateEntityException.java b/base-exceptions/src/main/java/com/telecominfraproject/wlan/datastore/exceptions/DsDuplicateEntityException.java similarity index 89% rename from base-exceptions/src/main/java/com/whizcontrol/datastore/exceptions/DsDuplicateEntityException.java rename to base-exceptions/src/main/java/com/telecominfraproject/wlan/datastore/exceptions/DsDuplicateEntityException.java index 84d4ffa..76dc424 100644 --- a/base-exceptions/src/main/java/com/whizcontrol/datastore/exceptions/DsDuplicateEntityException.java +++ b/base-exceptions/src/main/java/com/telecominfraproject/wlan/datastore/exceptions/DsDuplicateEntityException.java @@ -1,4 +1,4 @@ -package com.whizcontrol.datastore.exceptions; +package com.telecominfraproject.wlan.datastore.exceptions; public class DsDuplicateEntityException extends RuntimeException { diff --git a/base-exceptions/src/main/java/com/whizcontrol/datastore/exceptions/DsEntityNotFoundException.java b/base-exceptions/src/main/java/com/telecominfraproject/wlan/datastore/exceptions/DsEntityNotFoundException.java similarity index 88% rename from base-exceptions/src/main/java/com/whizcontrol/datastore/exceptions/DsEntityNotFoundException.java rename to base-exceptions/src/main/java/com/telecominfraproject/wlan/datastore/exceptions/DsEntityNotFoundException.java index bf76db1..8bcbae9 100644 --- a/base-exceptions/src/main/java/com/whizcontrol/datastore/exceptions/DsEntityNotFoundException.java +++ b/base-exceptions/src/main/java/com/telecominfraproject/wlan/datastore/exceptions/DsEntityNotFoundException.java @@ -1,4 +1,4 @@ -package com.whizcontrol.datastore.exceptions; +package com.telecominfraproject.wlan.datastore.exceptions; public class DsEntityNotFoundException extends RuntimeException { diff --git a/base-exceptions/src/main/java/com/whizcontrol/datastore/exceptions/DsForeignKeyViolatedException.java b/base-exceptions/src/main/java/com/telecominfraproject/wlan/datastore/exceptions/DsForeignKeyViolatedException.java similarity index 89% rename from base-exceptions/src/main/java/com/whizcontrol/datastore/exceptions/DsForeignKeyViolatedException.java rename to base-exceptions/src/main/java/com/telecominfraproject/wlan/datastore/exceptions/DsForeignKeyViolatedException.java index 49ceefa..08c75ae 100644 --- a/base-exceptions/src/main/java/com/whizcontrol/datastore/exceptions/DsForeignKeyViolatedException.java +++ b/base-exceptions/src/main/java/com/telecominfraproject/wlan/datastore/exceptions/DsForeignKeyViolatedException.java @@ -1,4 +1,4 @@ -package com.whizcontrol.datastore.exceptions; +package com.telecominfraproject.wlan.datastore.exceptions; public class DsForeignKeyViolatedException extends RuntimeException { diff --git a/base-exceptions/src/main/java/com/whizcontrol/datastore/exceptions/DsInvalidNumberEntitiesReturned.java b/base-exceptions/src/main/java/com/telecominfraproject/wlan/datastore/exceptions/DsInvalidNumberEntitiesReturned.java similarity index 88% rename from base-exceptions/src/main/java/com/whizcontrol/datastore/exceptions/DsInvalidNumberEntitiesReturned.java rename to base-exceptions/src/main/java/com/telecominfraproject/wlan/datastore/exceptions/DsInvalidNumberEntitiesReturned.java index a5ac9f3..c3c4e85 100644 --- a/base-exceptions/src/main/java/com/whizcontrol/datastore/exceptions/DsInvalidNumberEntitiesReturned.java +++ b/base-exceptions/src/main/java/com/telecominfraproject/wlan/datastore/exceptions/DsInvalidNumberEntitiesReturned.java @@ -1,4 +1,4 @@ -package com.whizcontrol.datastore.exceptions; +package com.telecominfraproject.wlan.datastore.exceptions; public class DsInvalidNumberEntitiesReturned extends RuntimeException { private static final long serialVersionUID = -3714845675690578087L; diff --git a/base-exceptions/src/main/java/com/whizcontrol/models/exceptions/DataInstantiationException.java b/base-exceptions/src/main/java/com/telecominfraproject/wlan/models/exceptions/DataInstantiationException.java similarity index 92% rename from base-exceptions/src/main/java/com/whizcontrol/models/exceptions/DataInstantiationException.java rename to base-exceptions/src/main/java/com/telecominfraproject/wlan/models/exceptions/DataInstantiationException.java index c19fc8a..b7a8414 100644 --- a/base-exceptions/src/main/java/com/whizcontrol/models/exceptions/DataInstantiationException.java +++ b/base-exceptions/src/main/java/com/telecominfraproject/wlan/models/exceptions/DataInstantiationException.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.models.exceptions; +package com.telecominfraproject.wlan.models.exceptions; /** * Unable to instantiate object from class. diff --git a/base-exceptions/src/main/java/com/whizcontrol/rules/exceptions/RulesCompilationException.java b/base-exceptions/src/main/java/com/telecominfraproject/wlan/rules/exceptions/RulesCompilationException.java similarity index 90% rename from base-exceptions/src/main/java/com/whizcontrol/rules/exceptions/RulesCompilationException.java rename to base-exceptions/src/main/java/com/telecominfraproject/wlan/rules/exceptions/RulesCompilationException.java index ee8a94b..48d6ad1 100644 --- a/base-exceptions/src/main/java/com/whizcontrol/rules/exceptions/RulesCompilationException.java +++ b/base-exceptions/src/main/java/com/telecominfraproject/wlan/rules/exceptions/RulesCompilationException.java @@ -1,4 +1,4 @@ -package com.whizcontrol.rules.exceptions; +package com.telecominfraproject.wlan.rules.exceptions; /** * @author dtop diff --git a/base-exceptions/src/main/java/com/whizcontrol/server/exceptions/ConfigurationException.java b/base-exceptions/src/main/java/com/telecominfraproject/wlan/server/exceptions/ConfigurationException.java similarity index 89% rename from base-exceptions/src/main/java/com/whizcontrol/server/exceptions/ConfigurationException.java rename to base-exceptions/src/main/java/com/telecominfraproject/wlan/server/exceptions/ConfigurationException.java index 277287c..8e2faa7 100644 --- a/base-exceptions/src/main/java/com/whizcontrol/server/exceptions/ConfigurationException.java +++ b/base-exceptions/src/main/java/com/telecominfraproject/wlan/server/exceptions/ConfigurationException.java @@ -1,4 +1,4 @@ -package com.whizcontrol.server.exceptions; +package com.telecominfraproject.wlan.server.exceptions; /** * @author dtop diff --git a/base-exceptions/src/main/java/com/whizcontrol/server/exceptions/GenericErrorException.java b/base-exceptions/src/main/java/com/telecominfraproject/wlan/server/exceptions/GenericErrorException.java similarity index 90% rename from base-exceptions/src/main/java/com/whizcontrol/server/exceptions/GenericErrorException.java rename to base-exceptions/src/main/java/com/telecominfraproject/wlan/server/exceptions/GenericErrorException.java index ca9df72..3109959 100644 --- a/base-exceptions/src/main/java/com/whizcontrol/server/exceptions/GenericErrorException.java +++ b/base-exceptions/src/main/java/com/telecominfraproject/wlan/server/exceptions/GenericErrorException.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.server.exceptions; +package com.telecominfraproject.wlan.server.exceptions; /** * Generic wrapper exception diff --git a/base-exceptions/src/main/java/com/whizcontrol/server/exceptions/SerializationException.java b/base-exceptions/src/main/java/com/telecominfraproject/wlan/server/exceptions/SerializationException.java similarity index 89% rename from base-exceptions/src/main/java/com/whizcontrol/server/exceptions/SerializationException.java rename to base-exceptions/src/main/java/com/telecominfraproject/wlan/server/exceptions/SerializationException.java index e3566f5..796a78b 100644 --- a/base-exceptions/src/main/java/com/whizcontrol/server/exceptions/SerializationException.java +++ b/base-exceptions/src/main/java/com/telecominfraproject/wlan/server/exceptions/SerializationException.java @@ -1,4 +1,4 @@ -package com.whizcontrol.server.exceptions; +package com.telecominfraproject.wlan.server.exceptions; /** * @author dtop diff --git a/base-exceptions/src/test/java/com/whizcontrol/rules/exceptions/RuleCompilationExceptionTests.java b/base-exceptions/src/test/java/com/whizcontrol/rules/exceptions/RuleCompilationExceptionTests.java index c475e9c..c351c56 100644 --- a/base-exceptions/src/test/java/com/whizcontrol/rules/exceptions/RuleCompilationExceptionTests.java +++ b/base-exceptions/src/test/java/com/whizcontrol/rules/exceptions/RuleCompilationExceptionTests.java @@ -4,6 +4,8 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.telecominfraproject.wlan.rules.exceptions.RulesCompilationException; + public class RuleCompilationExceptionTests { private static final Logger LOG = LoggerFactory.getLogger(RuleCompilationExceptionTests.class); diff --git a/base-exceptions/src/test/resources/logback.xml b/base-exceptions/src/test/resources/logback.xml index bcad42f..376abdb 100644 --- a/base-exceptions/src/test/resources/logback.xml +++ b/base-exceptions/src/test/resources/logback.xml @@ -39,7 +39,7 @@ --> - + diff --git a/base-models/src/main/java/com/whizcontrol/core/model/algorithms/CellSizeAlgorithm.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/algorithms/CellSizeAlgorithm.java similarity index 82% rename from base-models/src/main/java/com/whizcontrol/core/model/algorithms/CellSizeAlgorithm.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/algorithms/CellSizeAlgorithm.java index 9b407fa..b43a0c8 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/algorithms/CellSizeAlgorithm.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/algorithms/CellSizeAlgorithm.java @@ -1,10 +1,10 @@ /** * */ -package com.whizcontrol.core.model.algorithms; +package com.telecominfraproject.wlan.core.model.algorithms; import com.fasterxml.jackson.annotation.JsonCreator; -import com.whizcontrol.core.model.json.JsonDeserializationUtils; +import com.telecominfraproject.wlan.core.model.json.JsonDeserializationUtils; /** * @author erik diff --git a/base-models/src/main/java/com/whizcontrol/core/model/converters/BaseModelConverter.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/converters/BaseModelConverter.java similarity index 94% rename from base-models/src/main/java/com/whizcontrol/core/model/converters/BaseModelConverter.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/converters/BaseModelConverter.java index a2c91a1..60e23ca 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/converters/BaseModelConverter.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/converters/BaseModelConverter.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.converters; +package com.telecominfraproject.wlan.core.model.converters; /** * Base class for model converters - components that transform model of one class into model of another one. diff --git a/base-models/src/main/java/com/whizcontrol/core/model/converters/ConverterList.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/converters/ConverterList.java similarity index 83% rename from base-models/src/main/java/com/whizcontrol/core/model/converters/ConverterList.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/converters/ConverterList.java index 5d5197e..b7de109 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/converters/ConverterList.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/converters/ConverterList.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.converters; +package com.telecominfraproject.wlan.core.model.converters; import java.util.ArrayList; import java.util.List; @@ -32,7 +32,7 @@ public class ConverterList extends BaseModelConverter { /** * Only first matching converter will be used. * - * @see com.whizcontrol.core.model.converters.BaseModelConverter#convertDirect(com.whizcontrol.core.model.json.BaseJsonModel) + * @see com.telecominfraproject.wlan.core.model.converters.BaseModelConverter#convertDirect(com.telecominfraproject.wlan.core.model.json.BaseJsonModel) */ @Override protected T convertDirect(F fromModel) { diff --git a/base-models/src/main/java/com/whizcontrol/core/model/converters/EmptyBaseModelConverter.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/converters/EmptyBaseModelConverter.java similarity index 62% rename from base-models/src/main/java/com/whizcontrol/core/model/converters/EmptyBaseModelConverter.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/converters/EmptyBaseModelConverter.java index d674be3..e99836a 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/converters/EmptyBaseModelConverter.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/converters/EmptyBaseModelConverter.java @@ -1,6 +1,6 @@ -package com.whizcontrol.core.model.converters; +package com.telecominfraproject.wlan.core.model.converters; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; /** * Does nothing, returns the same BaseJsonModel. diff --git a/base-models/src/main/java/com/whizcontrol/core/model/converters/EmptyConverter.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/converters/EmptyConverter.java similarity index 63% rename from base-models/src/main/java/com/whizcontrol/core/model/converters/EmptyConverter.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/converters/EmptyConverter.java index 71ce6d6..8910933 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/converters/EmptyConverter.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/converters/EmptyConverter.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.converters; +package com.telecominfraproject.wlan.core.model.converters; /** * Does nothing, returns the same model. @@ -15,7 +15,7 @@ public class EmptyConverter extends BaseModelConverter { } /** - * @see com.whizcontrol.core.model.converters.BaseModelConverter#convertDirect(com.whizcontrol.core.model.json.BaseJsonModel) + * @see com.telecominfraproject.wlan.core.model.converters.BaseModelConverter#convertDirect(com.telecominfraproject.wlan.core.model.json.BaseJsonModel) */ @Override protected T convertDirect(F fromModel) { diff --git a/base-models/src/main/java/com/whizcontrol/core/model/converters/JsonMap.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/converters/JsonMap.java similarity index 81% rename from base-models/src/main/java/com/whizcontrol/core/model/converters/JsonMap.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/converters/JsonMap.java index 7a6f836..76a7a41 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/converters/JsonMap.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/converters/JsonMap.java @@ -1,10 +1,10 @@ -package com.whizcontrol.core.model.converters; +package com.telecominfraproject.wlan.core.model.converters; import java.util.HashMap; import java.util.Map; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; /** * Generic class used to produce metric data with arbitrary properties. diff --git a/base-models/src/main/java/com/whizcontrol/core/model/entity/EntityConstants.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/entity/EntityConstants.java similarity index 87% rename from base-models/src/main/java/com/whizcontrol/core/model/entity/EntityConstants.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/entity/EntityConstants.java index 64b3da5..1751126 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/entity/EntityConstants.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/entity/EntityConstants.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.model.entity; +package com.telecominfraproject.wlan.core.model.entity; /** * Constants used for entity diff --git a/base-models/src/main/java/com/whizcontrol/core/model/entity/InetAddressConstants.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/entity/InetAddressConstants.java similarity index 90% rename from base-models/src/main/java/com/whizcontrol/core/model/entity/InetAddressConstants.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/entity/InetAddressConstants.java index 9110997..385e6a3 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/entity/InetAddressConstants.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/entity/InetAddressConstants.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.model.entity; +package com.telecominfraproject.wlan.core.model.entity; /** * @author yongli diff --git a/base-models/src/main/java/com/whizcontrol/core/model/equipment/ChannelHopReason.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/ChannelHopReason.java similarity index 67% rename from base-models/src/main/java/com/whizcontrol/core/model/equipment/ChannelHopReason.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/ChannelHopReason.java index bd69e8f..ea1e6ff 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/equipment/ChannelHopReason.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/ChannelHopReason.java @@ -1,7 +1,8 @@ -package com.whizcontrol.core.model.equipment; +package com.telecominfraproject.wlan.core.model.equipment; import com.fasterxml.jackson.annotation.JsonCreator; -import com.whizcontrol.core.model.json.JsonDeserializationUtils; +import com.telecominfraproject.wlan.core.model.equipment.ChannelHopReason; +import com.telecominfraproject.wlan.core.model.json.JsonDeserializationUtils; public enum ChannelHopReason { RadarDetected, HighInterference, UNSUPPORTED; diff --git a/base-models/src/main/java/com/whizcontrol/core/model/equipment/ChannelHopSettings.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/ChannelHopSettings.java similarity index 95% rename from base-models/src/main/java/com/whizcontrol/core/model/equipment/ChannelHopSettings.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/ChannelHopSettings.java index f0e750b..6271de8 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/equipment/ChannelHopSettings.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/ChannelHopSettings.java @@ -1,8 +1,9 @@ - package com.whizcontrol.core.model.equipment; + package com.telecominfraproject.wlan.core.model.equipment; import java.util.concurrent.TimeUnit; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.equipment.ChannelHopSettings; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; public class ChannelHopSettings extends BaseJsonModel { diff --git a/base-models/src/main/java/com/whizcontrol/core/model/equipment/DeploymentType.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/DeploymentType.java similarity index 70% rename from base-models/src/main/java/com/whizcontrol/core/model/equipment/DeploymentType.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/DeploymentType.java index b0e391b..c1da0eb 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/equipment/DeploymentType.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/DeploymentType.java @@ -1,7 +1,8 @@ -package com.whizcontrol.core.model.equipment; +package com.telecominfraproject.wlan.core.model.equipment; import com.fasterxml.jackson.annotation.JsonCreator; -import com.whizcontrol.core.model.json.JsonDeserializationUtils; +import com.telecominfraproject.wlan.core.model.equipment.DeploymentType; +import com.telecominfraproject.wlan.core.model.json.JsonDeserializationUtils; /** * This is used for calculate RF distance diff --git a/base-models/src/main/java/com/whizcontrol/core/model/equipment/DetectedAuthMode.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/DetectedAuthMode.java similarity index 74% rename from base-models/src/main/java/com/whizcontrol/core/model/equipment/DetectedAuthMode.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/DetectedAuthMode.java index 38f4ad2..21c579d 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/equipment/DetectedAuthMode.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/DetectedAuthMode.java @@ -1,7 +1,8 @@ -package com.whizcontrol.core.model.equipment; +package com.telecominfraproject.wlan.core.model.equipment; import com.fasterxml.jackson.annotation.JsonCreator; -import com.whizcontrol.core.model.json.JsonDeserializationUtils; +import com.telecominfraproject.wlan.core.model.equipment.DetectedAuthMode; +import com.telecominfraproject.wlan.core.model.json.JsonDeserializationUtils; public enum DetectedAuthMode { diff --git a/base-models/src/main/java/com/whizcontrol/core/model/equipment/EquipmentType.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/EquipmentType.java similarity index 84% rename from base-models/src/main/java/com/whizcontrol/core/model/equipment/EquipmentType.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/EquipmentType.java index 27f8128..12aba07 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/equipment/EquipmentType.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/EquipmentType.java @@ -1,10 +1,11 @@ -package com.whizcontrol.core.model.equipment; +package com.telecominfraproject.wlan.core.model.equipment; import java.util.HashMap; import java.util.Map; import com.fasterxml.jackson.annotation.JsonCreator; -import com.whizcontrol.core.model.json.JsonDeserializationUtils; +import com.telecominfraproject.wlan.core.model.equipment.EquipmentType; +import com.telecominfraproject.wlan.core.model.json.JsonDeserializationUtils; public enum EquipmentType { diff --git a/base-models/src/main/java/com/whizcontrol/core/model/equipment/LEDColour.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/LEDColour.java similarity index 75% rename from base-models/src/main/java/com/whizcontrol/core/model/equipment/LEDColour.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/LEDColour.java index 8e21ff5..2a045b7 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/equipment/LEDColour.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/LEDColour.java @@ -1,10 +1,11 @@ /** * */ -package com.whizcontrol.core.model.equipment; +package com.telecominfraproject.wlan.core.model.equipment; import com.fasterxml.jackson.annotation.JsonCreator; -import com.whizcontrol.core.model.json.JsonDeserializationUtils; +import com.telecominfraproject.wlan.core.model.equipment.LEDColour; +import com.telecominfraproject.wlan.core.model.json.JsonDeserializationUtils; /** * @author ekeddy diff --git a/base-models/src/main/java/com/whizcontrol/core/model/equipment/MacAddress.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/MacAddress.java similarity index 97% rename from base-models/src/main/java/com/whizcontrol/core/model/equipment/MacAddress.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/MacAddress.java index 62f43c3..28c3be1 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/equipment/MacAddress.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/MacAddress.java @@ -1,11 +1,12 @@ -package com.whizcontrol.core.model.equipment; +package com.telecominfraproject.wlan.core.model.equipment; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.equipment.MacAddress; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; @JsonSerialize() @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/base-models/src/main/java/com/whizcontrol/core/model/equipment/MacToMonitor.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/MacToMonitor.java similarity index 85% rename from base-models/src/main/java/com/whizcontrol/core/model/equipment/MacToMonitor.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/MacToMonitor.java index 6b6c72a..eb6dd67 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/equipment/MacToMonitor.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/MacToMonitor.java @@ -1,6 +1,8 @@ -package com.whizcontrol.core.model.equipment; +package com.telecominfraproject.wlan.core.model.equipment; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.equipment.MacAddress; +import com.telecominfraproject.wlan.core.model.equipment.MacToMonitor; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; public class MacToMonitor extends BaseJsonModel { private static final long serialVersionUID = 6944693708625261094L; diff --git a/base-models/src/main/java/com/whizcontrol/core/model/equipment/NeighboreScanPacketType.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/NeighboreScanPacketType.java similarity index 85% rename from base-models/src/main/java/com/whizcontrol/core/model/equipment/NeighboreScanPacketType.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/NeighboreScanPacketType.java index ac437f0..fdbbe86 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/equipment/NeighboreScanPacketType.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/NeighboreScanPacketType.java @@ -1,10 +1,11 @@ -package com.whizcontrol.core.model.equipment; +package com.telecominfraproject.wlan.core.model.equipment; import java.util.HashMap; import java.util.Map; import com.fasterxml.jackson.annotation.JsonCreator; -import com.whizcontrol.core.model.json.JsonDeserializationUtils; +import com.telecominfraproject.wlan.core.model.equipment.NeighboreScanPacketType; +import com.telecominfraproject.wlan.core.model.json.JsonDeserializationUtils; public enum NeighboreScanPacketType { diff --git a/base-models/src/main/java/com/whizcontrol/core/model/equipment/NetworkConstants.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/NetworkConstants.java similarity index 94% rename from base-models/src/main/java/com/whizcontrol/core/model/equipment/NetworkConstants.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/NetworkConstants.java index 9345472..7a65560 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/equipment/NetworkConstants.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/NetworkConstants.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.model.equipment; +package com.telecominfraproject.wlan.core.model.equipment; /** * @author yongli diff --git a/base-models/src/main/java/com/whizcontrol/core/model/equipment/NetworkInterfaceType.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/NetworkInterfaceType.java similarity index 94% rename from base-models/src/main/java/com/whizcontrol/core/model/equipment/NetworkInterfaceType.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/NetworkInterfaceType.java index 7bd855c..87f4aa0 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/equipment/NetworkInterfaceType.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/NetworkInterfaceType.java @@ -1,7 +1,10 @@ /** * */ -package com.whizcontrol.core.model.equipment; +package com.telecominfraproject.wlan.core.model.equipment; + +import com.telecominfraproject.wlan.core.model.equipment.MacAddress; +import com.telecominfraproject.wlan.core.model.equipment.NetworkInterfaceType; /** * Different type of interface based on MAC address allocation. diff --git a/base-models/src/main/java/com/whizcontrol/core/model/equipment/NetworkType.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/NetworkType.java similarity index 84% rename from base-models/src/main/java/com/whizcontrol/core/model/equipment/NetworkType.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/NetworkType.java index dd9d3f2..0c58a08 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/equipment/NetworkType.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/NetworkType.java @@ -1,13 +1,14 @@ /** * */ -package com.whizcontrol.core.model.equipment; +package com.telecominfraproject.wlan.core.model.equipment; import java.util.HashMap; import java.util.Map; import com.fasterxml.jackson.annotation.JsonCreator; -import com.whizcontrol.core.model.json.JsonDeserializationUtils; +import com.telecominfraproject.wlan.core.model.equipment.NetworkType; +import com.telecominfraproject.wlan.core.model.json.JsonDeserializationUtils; /** * @author ekeddy diff --git a/base-models/src/main/java/com/whizcontrol/core/model/equipment/OBSSHopMode.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/OBSSHopMode.java similarity index 80% rename from base-models/src/main/java/com/whizcontrol/core/model/equipment/OBSSHopMode.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/OBSSHopMode.java index ed2d502..bbc564d 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/equipment/OBSSHopMode.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/OBSSHopMode.java @@ -1,7 +1,7 @@ -package com.whizcontrol.core.model.equipment; +package com.telecominfraproject.wlan.core.model.equipment; import com.fasterxml.jackson.annotation.JsonCreator; -import com.whizcontrol.core.model.json.JsonDeserializationUtils; +import com.telecominfraproject.wlan.core.model.json.JsonDeserializationUtils; public enum OBSSHopMode { diff --git a/base-models/src/main/java/com/whizcontrol/core/model/equipment/RadioBestApSettings.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/RadioBestApSettings.java similarity index 91% rename from base-models/src/main/java/com/whizcontrol/core/model/equipment/RadioBestApSettings.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/RadioBestApSettings.java index 4ca7bc0..7cd6355 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/equipment/RadioBestApSettings.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/RadioBestApSettings.java @@ -1,6 +1,8 @@ -package com.whizcontrol.core.model.equipment; +package com.telecominfraproject.wlan.core.model.equipment; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.equipment.RadioBestApSettings; +import com.telecominfraproject.wlan.core.model.equipment.RadioType; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; public class RadioBestApSettings extends BaseJsonModel { diff --git a/base-models/src/main/java/com/whizcontrol/core/model/equipment/RadioBestApSettingsPerRadio.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/RadioBestApSettingsPerRadio.java similarity index 80% rename from base-models/src/main/java/com/whizcontrol/core/model/equipment/RadioBestApSettingsPerRadio.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/RadioBestApSettingsPerRadio.java index 81670a2..5595219 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/equipment/RadioBestApSettingsPerRadio.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/RadioBestApSettingsPerRadio.java @@ -1,6 +1,8 @@ -package com.whizcontrol.core.model.equipment; +package com.telecominfraproject.wlan.core.model.equipment; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.equipment.RadioBestApSettings; +import com.telecominfraproject.wlan.core.model.equipment.RadioType; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; public class RadioBestApSettingsPerRadio extends BaseJsonModel { diff --git a/base-models/src/main/java/com/whizcontrol/core/model/equipment/RadioType.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/RadioType.java similarity index 89% rename from base-models/src/main/java/com/whizcontrol/core/model/equipment/RadioType.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/RadioType.java index d10f097..1d3ee02 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/equipment/RadioType.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/RadioType.java @@ -1,11 +1,12 @@ -package com.whizcontrol.core.model.equipment; +package com.telecominfraproject.wlan.core.model.equipment; import java.util.Collection; import java.util.HashMap; import java.util.Map; import com.fasterxml.jackson.annotation.JsonCreator; -import com.whizcontrol.core.model.json.JsonDeserializationUtils; +import com.telecominfraproject.wlan.core.model.equipment.RadioType; +import com.telecominfraproject.wlan.core.model.json.JsonDeserializationUtils; public enum RadioType { diff --git a/base-models/src/main/java/com/whizcontrol/core/model/equipment/SecurityType.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/SecurityType.java similarity index 67% rename from base-models/src/main/java/com/whizcontrol/core/model/equipment/SecurityType.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/SecurityType.java index b0ef09d..0358a22 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/equipment/SecurityType.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/SecurityType.java @@ -1,7 +1,8 @@ -package com.whizcontrol.core.model.equipment; +package com.telecominfraproject.wlan.core.model.equipment; import com.fasterxml.jackson.annotation.JsonCreator; -import com.whizcontrol.core.model.json.JsonDeserializationUtils; +import com.telecominfraproject.wlan.core.model.equipment.SecurityType; +import com.telecominfraproject.wlan.core.model.json.JsonDeserializationUtils; public enum SecurityType { diff --git a/base-models/src/main/java/com/whizcontrol/core/model/equipment/SteerType.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/SteerType.java similarity index 73% rename from base-models/src/main/java/com/whizcontrol/core/model/equipment/SteerType.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/SteerType.java index 54b86f0..eb788ae 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/equipment/SteerType.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/SteerType.java @@ -1,7 +1,8 @@ -package com.whizcontrol.core.model.equipment; +package com.telecominfraproject.wlan.core.model.equipment; import com.fasterxml.jackson.annotation.JsonCreator; -import com.whizcontrol.core.model.json.JsonDeserializationUtils; +import com.telecominfraproject.wlan.core.model.equipment.SteerType; +import com.telecominfraproject.wlan.core.model.json.JsonDeserializationUtils; public enum SteerType { diff --git a/base-models/src/main/java/com/whizcontrol/core/model/equipment/SupportedEquipmentVendor.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/SupportedEquipmentVendor.java similarity index 81% rename from base-models/src/main/java/com/whizcontrol/core/model/equipment/SupportedEquipmentVendor.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/SupportedEquipmentVendor.java index 7cf941d..d515de6 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/equipment/SupportedEquipmentVendor.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/SupportedEquipmentVendor.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.model.equipment; +package com.telecominfraproject.wlan.core.model.equipment; /** * @author yongli diff --git a/base-models/src/main/java/com/whizcontrol/core/model/equipment/Toggle.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/Toggle.java similarity index 84% rename from base-models/src/main/java/com/whizcontrol/core/model/equipment/Toggle.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/Toggle.java index 6586617..33937d6 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/equipment/Toggle.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/Toggle.java @@ -1,13 +1,14 @@ /** * */ -package com.whizcontrol.core.model.equipment; +package com.telecominfraproject.wlan.core.model.equipment; import java.util.HashMap; import java.util.Map; import com.fasterxml.jackson.annotation.JsonCreator; -import com.whizcontrol.core.model.json.JsonDeserializationUtils; +import com.telecominfraproject.wlan.core.model.equipment.Toggle; +import com.telecominfraproject.wlan.core.model.json.JsonDeserializationUtils; /** * @author ekeddy diff --git a/base-models/src/main/java/com/whizcontrol/core/model/equipment/WiFiSessionUtility.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/WiFiSessionUtility.java similarity index 97% rename from base-models/src/main/java/com/whizcontrol/core/model/equipment/WiFiSessionUtility.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/WiFiSessionUtility.java index 5433fe1..001ecce 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/equipment/WiFiSessionUtility.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/WiFiSessionUtility.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.model.equipment; +package com.telecominfraproject.wlan.core.model.equipment; import java.util.concurrent.TimeUnit; diff --git a/base-models/src/main/java/com/whizcontrol/core/model/event/BaseLogEvent.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/event/BaseLogEvent.java similarity index 65% rename from base-models/src/main/java/com/whizcontrol/core/model/event/BaseLogEvent.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/event/BaseLogEvent.java index 44c852c..efba81b 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/event/BaseLogEvent.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/event/BaseLogEvent.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.model.event; +package com.telecominfraproject.wlan.core.model.event; /** * @author yongli diff --git a/base-models/src/main/java/com/whizcontrol/core/model/event/RawEventType.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/event/RawEventType.java similarity index 94% rename from base-models/src/main/java/com/whizcontrol/core/model/event/RawEventType.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/event/RawEventType.java index 0754158..606c1ec 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/event/RawEventType.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/event/RawEventType.java @@ -1,13 +1,13 @@ /** * */ -package com.whizcontrol.core.model.event; +package com.telecominfraproject.wlan.core.model.event; import java.util.HashMap; import java.util.Map; import com.fasterxml.jackson.annotation.JsonCreator; -import com.whizcontrol.core.model.json.JsonDeserializationUtils; +import com.telecominfraproject.wlan.core.model.json.JsonDeserializationUtils; /** * @author yongli diff --git a/base-models/src/main/java/com/whizcontrol/core/model/filter/EntryFilter.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/filter/EntryFilter.java similarity index 90% rename from base-models/src/main/java/com/whizcontrol/core/model/filter/EntryFilter.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/filter/EntryFilter.java index f49e442..43abfbf 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/filter/EntryFilter.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/filter/EntryFilter.java @@ -1,9 +1,9 @@ -package com.whizcontrol.core.model.filter; +package com.telecominfraproject.wlan.core.model.filter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; /** * @author dtop diff --git a/base-models/src/main/java/com/whizcontrol/core/model/filter/ModelFilter.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/filter/ModelFilter.java similarity index 98% rename from base-models/src/main/java/com/whizcontrol/core/model/filter/ModelFilter.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/filter/ModelFilter.java index 86d3b77..50b9345 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/filter/ModelFilter.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/filter/ModelFilter.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.model.filter; +package com.telecominfraproject.wlan.core.model.filter; import java.util.Arrays; import java.util.List; @@ -10,7 +10,7 @@ import java.util.Objects; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; /** * @author ekeddy diff --git a/base-models/src/main/java/com/whizcontrol/core/model/json/BaseJsonModel.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/BaseJsonModel.java similarity index 97% rename from base-models/src/main/java/com/whizcontrol/core/model/json/BaseJsonModel.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/BaseJsonModel.java index c2b2528..d336b74 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/json/BaseJsonModel.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/BaseJsonModel.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.json; +package com.telecominfraproject.wlan.core.model.json; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -47,11 +47,13 @@ import com.fasterxml.jackson.databind.ObjectWriter; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonTypeResolver; import com.fasterxml.jackson.databind.jsontype.NamedType; -import com.whizcontrol.server.exceptions.SerializationException; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.BaseJsonTypeResolverBuilder; +import com.telecominfraproject.wlan.server.exceptions.SerializationException; /** * All sub-classes are registered automatically with the static - * {@link ObjectMapper} as long as it's in "com.whizcontrol" package. The + * {@link ObjectMapper} as long as it's in "com.telecominfraproject.wlan" package. The * resulting JSON document will have "_type: " SimpleClassName" to help with * deserialization. *

@@ -223,7 +225,7 @@ public abstract class BaseJsonModel implements Cloneable, Serializable { JsonNode topNode = MAPPER.readTree(jsonStr); JsonNode typeNode = topNode.get("_type"); - Reflections reflections = new Reflections("com.whizcontrol"); + Reflections reflections = new Reflections("com.telecominfraproject.wlan"); Set> classes = reflections.getSubTypesOf(BaseJsonModel.class); for (Class subClazz : classes) { @@ -399,8 +401,8 @@ public abstract class BaseJsonModel implements Cloneable, Serializable { //without this @JsonSubTypes annotation has to be used, which would //introduce circular dependency between all model projects - //scan urls that contain 'com.whizcontrol', use the default scanners - Reflections reflections = new Reflections("com.whizcontrol"); + //scan urls that contain 'com.telecominfraproject.wlan', use the default scanners + Reflections reflections = new Reflections("com.telecominfraproject.wlan"); //SubTypesScanner Set> modelClasses = diff --git a/base-models/src/main/java/com/whizcontrol/core/model/json/BaseJsonTypeResolverBuilder.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/BaseJsonTypeResolverBuilder.java similarity index 98% rename from base-models/src/main/java/com/whizcontrol/core/model/json/BaseJsonTypeResolverBuilder.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/BaseJsonTypeResolverBuilder.java index be1536e..8be70e4 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/json/BaseJsonTypeResolverBuilder.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/BaseJsonTypeResolverBuilder.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.json; +package com.telecominfraproject.wlan.core.model.json; import java.io.IOException; import java.util.Collection; diff --git a/base-models/src/main/java/com/whizcontrol/core/model/json/BasicCounter.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/BasicCounter.java similarity index 83% rename from base-models/src/main/java/com/whizcontrol/core/model/json/BasicCounter.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/BasicCounter.java index 532d663..5cc0025 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/json/BasicCounter.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/BasicCounter.java @@ -1,7 +1,10 @@ /** * */ -package com.whizcontrol.core.model.json; +package com.telecominfraproject.wlan.core.model.json; + +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.BasicCounter; /** * @author ekeddy diff --git a/base-models/src/main/java/com/whizcontrol/core/model/json/GenericResponse.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/GenericResponse.java similarity index 90% rename from base-models/src/main/java/com/whizcontrol/core/model/json/GenericResponse.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/GenericResponse.java index 49e26ea..3579788 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/json/GenericResponse.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/GenericResponse.java @@ -1,5 +1,7 @@ -package com.whizcontrol.core.model.json; +package com.telecominfraproject.wlan.core.model.json; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.GenericResponse; /** * @author dtoptygin diff --git a/base-models/src/main/java/com/whizcontrol/core/model/json/JsonConfiguration.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/JsonConfiguration.java similarity index 97% rename from base-models/src/main/java/com/whizcontrol/core/model/json/JsonConfiguration.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/JsonConfiguration.java index 79a06a9..aa0f2c1 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/json/JsonConfiguration.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/JsonConfiguration.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.json; +package com.telecominfraproject.wlan.core.model.json; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; diff --git a/base-models/src/main/java/com/whizcontrol/core/model/json/JsonDeserializationUtils.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/JsonDeserializationUtils.java similarity index 87% rename from base-models/src/main/java/com/whizcontrol/core/model/json/JsonDeserializationUtils.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/JsonDeserializationUtils.java index 48d3e63..99bc37c 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/json/JsonDeserializationUtils.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/JsonDeserializationUtils.java @@ -1,11 +1,13 @@ /** * */ -package com.whizcontrol.core.model.json; +package com.telecominfraproject.wlan.core.model.json; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.telecominfraproject.wlan.core.model.json.JsonDeserializationUtils; + /** * @author yongli * diff --git a/base-models/src/main/java/com/whizcontrol/core/model/json/JsonSerializedException.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/JsonSerializedException.java similarity index 84% rename from base-models/src/main/java/com/whizcontrol/core/model/json/JsonSerializedException.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/JsonSerializedException.java index 62d650f..22d65d9 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/json/JsonSerializedException.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/JsonSerializedException.java @@ -1,5 +1,7 @@ -package com.whizcontrol.core.model.json; +package com.telecominfraproject.wlan.core.model.json; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.JsonSerializedException; /** * @author dtoptygin diff --git a/base-models/src/main/java/com/whizcontrol/core/model/json/flattener/ColumnMinMaxValues.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/flattener/ColumnMinMaxValues.java similarity index 82% rename from base-models/src/main/java/com/whizcontrol/core/model/json/flattener/ColumnMinMaxValues.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/flattener/ColumnMinMaxValues.java index 2f515c0..3504070 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/json/flattener/ColumnMinMaxValues.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/flattener/ColumnMinMaxValues.java @@ -1,6 +1,6 @@ -package com.whizcontrol.core.model.json.flattener; +package com.telecominfraproject.wlan.core.model.json.flattener; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; /** * @author dtop diff --git a/base-models/src/main/java/com/whizcontrol/core/model/json/flattener/ColumnNameTranslator.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/flattener/ColumnNameTranslator.java similarity index 88% rename from base-models/src/main/java/com/whizcontrol/core/model/json/flattener/ColumnNameTranslator.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/flattener/ColumnNameTranslator.java index 436ecc9..ae03454 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/json/flattener/ColumnNameTranslator.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/flattener/ColumnNameTranslator.java @@ -1,11 +1,11 @@ -package com.whizcontrol.core.model.json.flattener; +package com.telecominfraproject.wlan.core.model.json.flattener; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; /** * @author dtop diff --git a/base-models/src/main/java/com/whizcontrol/core/model/json/flattener/ColumnValueReplacements.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/flattener/ColumnValueReplacements.java similarity index 92% rename from base-models/src/main/java/com/whizcontrol/core/model/json/flattener/ColumnValueReplacements.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/flattener/ColumnValueReplacements.java index 77553af..9c2cdf3 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/json/flattener/ColumnValueReplacements.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/flattener/ColumnValueReplacements.java @@ -1,9 +1,9 @@ -package com.whizcontrol.core.model.json.flattener; +package com.telecominfraproject.wlan.core.model.json.flattener; import java.util.HashMap; import java.util.Map; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; /** * @author dtop diff --git a/base-models/src/main/java/com/whizcontrol/core/model/json/flattener/DatasetFlattener.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/flattener/DatasetFlattener.java similarity index 99% rename from base-models/src/main/java/com/whizcontrol/core/model/json/flattener/DatasetFlattener.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/flattener/DatasetFlattener.java index 49b4182..5cca3ce 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/json/flattener/DatasetFlattener.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/flattener/DatasetFlattener.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.json.flattener; +package com.telecominfraproject.wlan.core.model.json.flattener; import java.awt.image.BufferedImage; import java.awt.image.ColorModel; @@ -35,9 +35,9 @@ import javax.imageio.ImageIO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.whizcontrol.core.model.utils.NumberUtils; -import com.whizcontrol.server.exceptions.ConfigurationException; -import com.whizcontrol.server.exceptions.GenericErrorException; +import com.telecominfraproject.wlan.core.model.utils.NumberUtils; +import com.telecominfraproject.wlan.server.exceptions.ConfigurationException; +import com.telecominfraproject.wlan.server.exceptions.GenericErrorException; /** * @author dtop diff --git a/base-models/src/main/java/com/whizcontrol/core/model/json/flattener/ModelFlattener.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/flattener/ModelFlattener.java similarity index 99% rename from base-models/src/main/java/com/whizcontrol/core/model/json/flattener/ModelFlattener.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/flattener/ModelFlattener.java index 6585cfc..695b73c 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/json/flattener/ModelFlattener.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/flattener/ModelFlattener.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.json.flattener; +package com.telecominfraproject.wlan.core.model.json.flattener; import java.io.IOException; import java.util.ArrayList; diff --git a/base-models/src/main/java/com/whizcontrol/core/model/json/flattener/TargetFormulaInterface.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/flattener/TargetFormulaInterface.java similarity index 67% rename from base-models/src/main/java/com/whizcontrol/core/model/json/flattener/TargetFormulaInterface.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/flattener/TargetFormulaInterface.java index f828f60..872401b 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/json/flattener/TargetFormulaInterface.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/flattener/TargetFormulaInterface.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.json.flattener; +package com.telecominfraproject.wlan.core.model.json.flattener; /** * @author dtop diff --git a/base-models/src/main/java/com/whizcontrol/core/model/json/flattener/ValueElementMap.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/flattener/ValueElementMap.java similarity index 95% rename from base-models/src/main/java/com/whizcontrol/core/model/json/flattener/ValueElementMap.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/flattener/ValueElementMap.java index 66f973b..acd2dfa 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/json/flattener/ValueElementMap.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/flattener/ValueElementMap.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.json.flattener; +package com.telecominfraproject.wlan.core.model.json.flattener; import java.util.Map; diff --git a/base-models/src/main/java/com/whizcontrol/core/model/json/interfaces/HasCustomerId.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/interfaces/HasCustomerId.java similarity index 80% rename from base-models/src/main/java/com/whizcontrol/core/model/json/interfaces/HasCustomerId.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/interfaces/HasCustomerId.java index 310f294..7285006 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/json/interfaces/HasCustomerId.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/interfaces/HasCustomerId.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.json.interfaces; +package com.telecominfraproject.wlan.core.model.json.interfaces; /** * Marker interface that tells if current object can provide customerId for which it belongs to diff --git a/base-models/src/main/java/com/whizcontrol/core/model/json/interfaces/HasEquipmentId.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/interfaces/HasEquipmentId.java similarity index 80% rename from base-models/src/main/java/com/whizcontrol/core/model/json/interfaces/HasEquipmentId.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/interfaces/HasEquipmentId.java index 68e4f03..693ea75 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/json/interfaces/HasEquipmentId.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/interfaces/HasEquipmentId.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.json.interfaces; +package com.telecominfraproject.wlan.core.model.json.interfaces; /** * Marker interface that tells if current object can provide equipmentId for which it belongs to diff --git a/base-models/src/main/java/com/whizcontrol/core/model/json/interfaces/HasProducedTimestamp.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/interfaces/HasProducedTimestamp.java similarity index 83% rename from base-models/src/main/java/com/whizcontrol/core/model/json/interfaces/HasProducedTimestamp.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/interfaces/HasProducedTimestamp.java index 0e12b91..420c830 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/json/interfaces/HasProducedTimestamp.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/interfaces/HasProducedTimestamp.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.json.interfaces; +package com.telecominfraproject.wlan.core.model.json.interfaces; /** * Marker interface that tells if current object can provide a timestamp of when it was produced (i.e. eventTimestampMs) diff --git a/base-models/src/main/java/com/whizcontrol/core/model/json/interfaces/HasStoredTimestamp.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/interfaces/HasStoredTimestamp.java similarity index 84% rename from base-models/src/main/java/com/whizcontrol/core/model/json/interfaces/HasStoredTimestamp.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/interfaces/HasStoredTimestamp.java index e46f2a3..342e06e 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/json/interfaces/HasStoredTimestamp.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/interfaces/HasStoredTimestamp.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.json.interfaces; +package com.telecominfraproject.wlan.core.model.json.interfaces; /** * Marker interface that tells if current object can provide a timestamp of when it was stored in the database (i.e. createdTimestampMs) diff --git a/base-models/src/main/java/com/whizcontrol/core/model/pagination/ColumnAndSort.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/pagination/ColumnAndSort.java similarity index 93% rename from base-models/src/main/java/com/whizcontrol/core/model/pagination/ColumnAndSort.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/pagination/ColumnAndSort.java index f2d9911..0192cea 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/pagination/ColumnAndSort.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/pagination/ColumnAndSort.java @@ -1,6 +1,6 @@ -package com.whizcontrol.core.model.pagination; +package com.telecominfraproject.wlan.core.model.pagination; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; /** * @author dtop diff --git a/base-models/src/main/java/com/whizcontrol/core/model/pagination/PaginationContext.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/pagination/PaginationContext.java similarity index 95% rename from base-models/src/main/java/com/whizcontrol/core/model/pagination/PaginationContext.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/pagination/PaginationContext.java index 9dd50c8..e89b447 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/pagination/PaginationContext.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/pagination/PaginationContext.java @@ -1,10 +1,10 @@ -package com.whizcontrol.core.model.pagination; +package com.telecominfraproject.wlan.core.model.pagination; import java.util.HashMap; import java.util.Map; import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; /** * This class represents pagination context and keeps track of the last item returned to continue pagination from, number of items per page, as well as various statistics. diff --git a/base-models/src/main/java/com/whizcontrol/core/model/pagination/PaginationRequest.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/pagination/PaginationRequest.java similarity index 76% rename from base-models/src/main/java/com/whizcontrol/core/model/pagination/PaginationRequest.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/pagination/PaginationRequest.java index 0859c97..50c0f3b 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/pagination/PaginationRequest.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/pagination/PaginationRequest.java @@ -1,6 +1,6 @@ -package com.whizcontrol.core.model.pagination; +package com.telecominfraproject.wlan.core.model.pagination; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; /** * @author dtop diff --git a/base-models/src/main/java/com/whizcontrol/core/model/pagination/PaginationResponse.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/pagination/PaginationResponse.java similarity index 92% rename from base-models/src/main/java/com/whizcontrol/core/model/pagination/PaginationResponse.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/pagination/PaginationResponse.java index 14dbc1e..a0e55d6 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/pagination/PaginationResponse.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/pagination/PaginationResponse.java @@ -1,9 +1,9 @@ -package com.whizcontrol.core.model.pagination; +package com.telecominfraproject.wlan.core.model.pagination; import java.util.ArrayList; import java.util.List; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; /** * @author dtop diff --git a/base-models/src/main/java/com/whizcontrol/core/model/pagination/SortOrder.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/pagination/SortOrder.java similarity index 76% rename from base-models/src/main/java/com/whizcontrol/core/model/pagination/SortOrder.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/pagination/SortOrder.java index 457d2da..5a3fa28 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/pagination/SortOrder.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/pagination/SortOrder.java @@ -1,7 +1,7 @@ -package com.whizcontrol.core.model.pagination; +package com.telecominfraproject.wlan.core.model.pagination; import com.fasterxml.jackson.annotation.JsonCreator; -import com.whizcontrol.core.model.json.JsonDeserializationUtils; +import com.telecominfraproject.wlan.core.model.json.JsonDeserializationUtils; /** * @author dtop diff --git a/base-models/src/main/java/com/whizcontrol/core/model/pair/GenericPair.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/pair/GenericPair.java similarity index 94% rename from base-models/src/main/java/com/whizcontrol/core/model/pair/GenericPair.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/pair/GenericPair.java index 8dc401f..5115930 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/pair/GenericPair.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/pair/GenericPair.java @@ -1,7 +1,7 @@ -package com.whizcontrol.core.model.pair; +package com.telecominfraproject.wlan.core.model.pair; import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; /** * @author dtop diff --git a/base-models/src/main/java/com/whizcontrol/core/model/pair/PairBigDecimalString.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/pair/PairBigDecimalString.java similarity index 97% rename from base-models/src/main/java/com/whizcontrol/core/model/pair/PairBigDecimalString.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/pair/PairBigDecimalString.java index e17a8ab..ab10e11 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/pair/PairBigDecimalString.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/pair/PairBigDecimalString.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.pair; +package com.telecominfraproject.wlan.core.model.pair; import java.math.BigDecimal; diff --git a/base-models/src/main/java/com/whizcontrol/core/model/pair/PairIntInt.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/pair/PairIntInt.java similarity index 88% rename from base-models/src/main/java/com/whizcontrol/core/model/pair/PairIntInt.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/pair/PairIntInt.java index b080d9f..e9b43ab 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/pair/PairIntInt.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/pair/PairIntInt.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.pair; +package com.telecominfraproject.wlan.core.model.pair; /** * @author dtop diff --git a/base-models/src/main/java/com/whizcontrol/core/model/pair/PairIntLong.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/pair/PairIntLong.java similarity index 92% rename from base-models/src/main/java/com/whizcontrol/core/model/pair/PairIntLong.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/pair/PairIntLong.java index 2f29157..7e51f4e 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/pair/PairIntLong.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/pair/PairIntLong.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.pair; +package com.telecominfraproject.wlan.core.model.pair; /** * @author dtop diff --git a/base-models/src/main/java/com/whizcontrol/core/model/pair/PairIntString.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/pair/PairIntString.java similarity index 97% rename from base-models/src/main/java/com/whizcontrol/core/model/pair/PairIntString.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/pair/PairIntString.java index eea3150..62e220b 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/pair/PairIntString.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/pair/PairIntString.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.pair; +package com.telecominfraproject.wlan.core.model.pair; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/base-models/src/main/java/com/whizcontrol/core/model/pair/PairLongInt.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/pair/PairLongInt.java similarity index 96% rename from base-models/src/main/java/com/whizcontrol/core/model/pair/PairLongInt.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/pair/PairLongInt.java index 20d8501..23b65c6 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/pair/PairLongInt.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/pair/PairLongInt.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.pair; +package com.telecominfraproject.wlan.core.model.pair; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/base-models/src/main/java/com/whizcontrol/core/model/pair/PairLongLong.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/pair/PairLongLong.java similarity index 88% rename from base-models/src/main/java/com/whizcontrol/core/model/pair/PairLongLong.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/pair/PairLongLong.java index 325e523..7c87603 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/pair/PairLongLong.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/pair/PairLongLong.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.pair; +package com.telecominfraproject.wlan.core.model.pair; /** diff --git a/base-models/src/main/java/com/whizcontrol/core/model/pair/PairLongString.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/pair/PairLongString.java similarity index 97% rename from base-models/src/main/java/com/whizcontrol/core/model/pair/PairLongString.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/pair/PairLongString.java index f607164..8357b42 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/pair/PairLongString.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/pair/PairLongString.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.pair; +package com.telecominfraproject.wlan.core.model.pair; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/base-models/src/main/java/com/whizcontrol/core/model/pair/PairStringLong.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/pair/PairStringLong.java similarity index 89% rename from base-models/src/main/java/com/whizcontrol/core/model/pair/PairStringLong.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/pair/PairStringLong.java index 25328f5..09d8995 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/pair/PairStringLong.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/pair/PairStringLong.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.pair; +package com.telecominfraproject.wlan.core.model.pair; /** * @author dtop diff --git a/base-models/src/main/java/com/whizcontrol/core/model/pair/PairStringString.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/pair/PairStringString.java similarity index 90% rename from base-models/src/main/java/com/whizcontrol/core/model/pair/PairStringString.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/pair/PairStringString.java index 14d08de..5a3d8c8 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/pair/PairStringString.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/pair/PairStringString.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.pair; +package com.telecominfraproject.wlan.core.model.pair; /** * @author dtop diff --git a/base-models/src/main/java/com/whizcontrol/core/model/record/GenericCustomerRecord.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/record/GenericCustomerRecord.java similarity index 94% rename from base-models/src/main/java/com/whizcontrol/core/model/record/GenericCustomerRecord.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/record/GenericCustomerRecord.java index 37b09a4..758a3ce 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/record/GenericCustomerRecord.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/record/GenericCustomerRecord.java @@ -1,6 +1,6 @@ -package com.whizcontrol.core.model.record; +package com.telecominfraproject.wlan.core.model.record; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; public class GenericCustomerRecord extends BaseJsonModel { private static final long serialVersionUID = -5744903915279732103L; diff --git a/base-models/src/main/java/com/whizcontrol/core/model/request/BaseAccountChangeRequest.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/request/BaseAccountChangeRequest.java similarity index 96% rename from base-models/src/main/java/com/whizcontrol/core/model/request/BaseAccountChangeRequest.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/request/BaseAccountChangeRequest.java index 9cfbde9..389548a 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/request/BaseAccountChangeRequest.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/request/BaseAccountChangeRequest.java @@ -1,15 +1,15 @@ /** * */ -package com.whizcontrol.core.model.request; +package com.telecominfraproject.wlan.core.model.request; import java.util.HashMap; import java.util.Map; import com.fasterxml.jackson.annotation.JsonCreator; -import com.whizcontrol.core.model.json.BaseJsonModel; -import com.whizcontrol.core.model.json.JsonDeserializationUtils; -import com.whizcontrol.core.model.role.PortalUserRole; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.JsonDeserializationUtils; +import com.telecominfraproject.wlan.core.model.role.PortalUserRole; /** * Data model to extend Account Change requests. diff --git a/base-models/src/main/java/com/whizcontrol/core/model/role/AccessRight.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/role/AccessRight.java similarity index 86% rename from base-models/src/main/java/com/whizcontrol/core/model/role/AccessRight.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/role/AccessRight.java index 37a9667..3f0119a 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/role/AccessRight.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/role/AccessRight.java @@ -1,10 +1,10 @@ /** * */ -package com.whizcontrol.core.model.role; +package com.telecominfraproject.wlan.core.model.role; import com.fasterxml.jackson.annotation.JsonCreator; -import com.whizcontrol.core.model.json.JsonDeserializationUtils; +import com.telecominfraproject.wlan.core.model.json.JsonDeserializationUtils; /** * Control access to object in the system. diff --git a/base-models/src/main/java/com/whizcontrol/core/model/role/PortalUserRole.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/role/PortalUserRole.java similarity index 93% rename from base-models/src/main/java/com/whizcontrol/core/model/role/PortalUserRole.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/role/PortalUserRole.java index b6325c2..f6e250c 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/role/PortalUserRole.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/role/PortalUserRole.java @@ -1,13 +1,13 @@ /** * */ -package com.whizcontrol.core.model.role; +package com.telecominfraproject.wlan.core.model.role; import java.util.HashMap; import java.util.Map; import com.fasterxml.jackson.annotation.JsonCreator; -import com.whizcontrol.core.model.json.JsonDeserializationUtils; +import com.telecominfraproject.wlan.core.model.json.JsonDeserializationUtils; /** * @author ekeddy diff --git a/base-models/src/main/java/com/whizcontrol/core/model/ruleset/RuleSetType.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/ruleset/RuleSetType.java similarity index 72% rename from base-models/src/main/java/com/whizcontrol/core/model/ruleset/RuleSetType.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/ruleset/RuleSetType.java index 7fc2b90..7c21836 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/ruleset/RuleSetType.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/ruleset/RuleSetType.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.model.ruleset; +package com.telecominfraproject.wlan.core.model.ruleset; /** * @author yongli diff --git a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/DailyTimeRangeSchedule.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/DailyTimeRangeSchedule.java similarity index 95% rename from base-models/src/main/java/com/whizcontrol/core/model/scheduler/DailyTimeRangeSchedule.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/DailyTimeRangeSchedule.java index c6dd5b2..83fdc99 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/DailyTimeRangeSchedule.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/DailyTimeRangeSchedule.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.model.scheduler; +package com.telecominfraproject.wlan.core.model.scheduler; import java.time.Duration; import java.time.LocalDate; diff --git a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/DateTimeRangeSchedule.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/DateTimeRangeSchedule.java similarity index 94% rename from base-models/src/main/java/com/whizcontrol/core/model/scheduler/DateTimeRangeSchedule.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/DateTimeRangeSchedule.java index c2b2d9a..e658dd4 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/DateTimeRangeSchedule.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/DateTimeRangeSchedule.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.model.scheduler; +package com.telecominfraproject.wlan.core.model.scheduler; import java.time.Duration; import java.time.Instant; @@ -13,7 +13,7 @@ import java.util.Objects; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.whizcontrol.datastore.exceptions.DsDataValidationException; +import com.telecominfraproject.wlan.datastore.exceptions.DsDataValidationException; /** * @author yongli @@ -58,7 +58,7 @@ public class DateTimeRangeSchedule extends ScheduleSetting { * (non-Javadoc) * * @see - * com.whizcontrol.scheduler.models.ScheduleSetting#getNextWindows(long) + * com.telecominfraproject.wlan.scheduler.models.ScheduleSetting#getNextWindows(long) */ @Override public EpochTimeWindow getNextWindows(long currentTime) { @@ -132,7 +132,7 @@ public class DateTimeRangeSchedule extends ScheduleSetting { /* * (non-Javadoc) * - * @see com.whizcontrol.scheduler.models.ScheduleSetting#getLogger() + * @see com.telecominfraproject.wlan.scheduler.models.ScheduleSetting#getLogger() */ @Override protected Logger getLogger() { diff --git a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/DaysOfMonthTimeRangeSchedule.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/DaysOfMonthTimeRangeSchedule.java similarity index 98% rename from base-models/src/main/java/com/whizcontrol/core/model/scheduler/DaysOfMonthTimeRangeSchedule.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/DaysOfMonthTimeRangeSchedule.java index e9b166a..058d789 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/DaysOfMonthTimeRangeSchedule.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/DaysOfMonthTimeRangeSchedule.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.scheduler; +package com.telecominfraproject.wlan.core.model.scheduler; import java.time.Duration; import java.time.LocalDate; diff --git a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/DaysOfWeekTimeRangeSchedule.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/DaysOfWeekTimeRangeSchedule.java similarity index 98% rename from base-models/src/main/java/com/whizcontrol/core/model/scheduler/DaysOfWeekTimeRangeSchedule.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/DaysOfWeekTimeRangeSchedule.java index 3aa3794..2fdbefd 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/DaysOfWeekTimeRangeSchedule.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/DaysOfWeekTimeRangeSchedule.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.model.scheduler; +package com.telecominfraproject.wlan.core.model.scheduler; import java.time.DayOfWeek; import java.time.Duration; diff --git a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/EmptySchedule.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/EmptySchedule.java similarity index 80% rename from base-models/src/main/java/com/whizcontrol/core/model/scheduler/EmptySchedule.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/EmptySchedule.java index 89e91f6..b22a8cf 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/EmptySchedule.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/EmptySchedule.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.model.scheduler; +package com.telecominfraproject.wlan.core.model.scheduler; import java.time.Duration; @@ -36,7 +36,7 @@ public class EmptySchedule extends ScheduleSetting { * (non-Javadoc) * * @see - * com.whizcontrol.scheduler.models.ScheduleSetting#getNextWindows(long) + * com.telecominfraproject.wlan.scheduler.models.ScheduleSetting#getNextWindows(long) */ @Override public ImmutableTimeWindow getNextWindows(long currentTime) { @@ -46,7 +46,7 @@ public class EmptySchedule extends ScheduleSetting { /* * (non-Javadoc) * - * @see com.whizcontrol.scheduler.models.ScheduleSetting#getLogger() + * @see com.telecominfraproject.wlan.scheduler.models.ScheduleSetting#getLogger() */ @Override protected Logger getLogger() { diff --git a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/EpochTimeWindow.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/EpochTimeWindow.java similarity index 98% rename from base-models/src/main/java/com/whizcontrol/core/model/scheduler/EpochTimeWindow.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/EpochTimeWindow.java index 6f90645..bd54e91 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/EpochTimeWindow.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/EpochTimeWindow.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.model.scheduler; +package com.telecominfraproject.wlan.core.model.scheduler; /** * Time window with begin and end time in EPOCH value. diff --git a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/ImmutableTimeWindow.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/ImmutableTimeWindow.java similarity index 97% rename from base-models/src/main/java/com/whizcontrol/core/model/scheduler/ImmutableTimeWindow.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/ImmutableTimeWindow.java index 3c80a43..c9da949 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/ImmutableTimeWindow.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/ImmutableTimeWindow.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.model.scheduler; +package com.telecominfraproject.wlan.core.model.scheduler; import java.time.Instant; diff --git a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/LocalDateTimeValue.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/LocalDateTimeValue.java similarity index 93% rename from base-models/src/main/java/com/whizcontrol/core/model/scheduler/LocalDateTimeValue.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/LocalDateTimeValue.java index 5dc7f0b..0b30051 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/LocalDateTimeValue.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/LocalDateTimeValue.java @@ -1,12 +1,12 @@ /** * */ -package com.whizcontrol.core.model.scheduler; +package com.telecominfraproject.wlan.core.model.scheduler; import java.time.LocalDateTime; -import com.whizcontrol.core.model.json.BaseJsonModel; -import com.whizcontrol.datastore.exceptions.DsDataValidationException; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.datastore.exceptions.DsDataValidationException; /** * @author yongli diff --git a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/LocalDateValue.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/LocalDateValue.java similarity index 92% rename from base-models/src/main/java/com/whizcontrol/core/model/scheduler/LocalDateValue.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/LocalDateValue.java index 4e82b62..1675ff8 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/LocalDateValue.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/LocalDateValue.java @@ -1,13 +1,13 @@ /** * */ -package com.whizcontrol.core.model.scheduler; +package com.telecominfraproject.wlan.core.model.scheduler; import java.time.DateTimeException; import java.time.LocalDate; -import com.whizcontrol.core.model.json.BaseJsonModel; -import com.whizcontrol.datastore.exceptions.DsDataValidationException; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.datastore.exceptions.DsDataValidationException; /** * LocalDate is immutable. This is used for JSON serialization. diff --git a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/LocalTimeRangeSchedule.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/LocalTimeRangeSchedule.java similarity index 98% rename from base-models/src/main/java/com/whizcontrol/core/model/scheduler/LocalTimeRangeSchedule.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/LocalTimeRangeSchedule.java index 0f73569..7101522 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/LocalTimeRangeSchedule.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/LocalTimeRangeSchedule.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.model.scheduler; +package com.telecominfraproject.wlan.core.model.scheduler; import java.time.DateTimeException; import java.time.Duration; @@ -14,7 +14,7 @@ import java.time.ZonedDateTime; import java.util.Objects; import java.util.SortedSet; -import com.whizcontrol.datastore.exceptions.DsDataValidationException; +import com.telecominfraproject.wlan.datastore.exceptions.DsDataValidationException; /** * Time range with {@linkplain #timeBegin} and {@linkplain #timeEnd} diff --git a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/LocalTimeValue.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/LocalTimeValue.java similarity index 92% rename from base-models/src/main/java/com/whizcontrol/core/model/scheduler/LocalTimeValue.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/LocalTimeValue.java index b150b2b..d1180d8 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/LocalTimeValue.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/LocalTimeValue.java @@ -1,13 +1,13 @@ /** * */ -package com.whizcontrol.core.model.scheduler; +package com.telecominfraproject.wlan.core.model.scheduler; import java.time.DateTimeException; import java.time.LocalTime; -import com.whizcontrol.core.model.json.BaseJsonModel; -import com.whizcontrol.datastore.exceptions.DsDataValidationException; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.datastore.exceptions.DsDataValidationException; /** * LocalTime is immutable. This is used for JSON serialization. Only support diff --git a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/ScheduleRestriction.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/ScheduleRestriction.java similarity index 87% rename from base-models/src/main/java/com/whizcontrol/core/model/scheduler/ScheduleRestriction.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/ScheduleRestriction.java index d6eb1ee..611de52 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/ScheduleRestriction.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/ScheduleRestriction.java @@ -1,11 +1,11 @@ /** * */ -package com.whizcontrol.core.model.scheduler; +package com.telecominfraproject.wlan.core.model.scheduler; import java.time.Duration; -import com.whizcontrol.datastore.exceptions.DsDataValidationException; +import com.telecominfraproject.wlan.datastore.exceptions.DsDataValidationException; /** * Schedule restriction defined for the system. diff --git a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/ScheduleSetting.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/ScheduleSetting.java similarity index 94% rename from base-models/src/main/java/com/whizcontrol/core/model/scheduler/ScheduleSetting.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/ScheduleSetting.java index c6f9943..de82c0e 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/ScheduleSetting.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/ScheduleSetting.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.model.scheduler; +package com.telecominfraproject.wlan.core.model.scheduler; import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; @@ -18,9 +18,9 @@ import org.reflections.Reflections; import org.slf4j.Logger; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.whizcontrol.core.model.json.BaseJsonModel; -import com.whizcontrol.datastore.exceptions.DsDataValidationException; -import com.whizcontrol.server.exceptions.GenericErrorException; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.datastore.exceptions.DsDataValidationException; +import com.telecominfraproject.wlan.server.exceptions.GenericErrorException; /** * Setting used by scheduler. diff --git a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/ScheduleValue.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/ScheduleValue.java similarity index 81% rename from base-models/src/main/java/com/whizcontrol/core/model/scheduler/ScheduleValue.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/ScheduleValue.java index eb133d0..487017b 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/ScheduleValue.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/ScheduleValue.java @@ -1,12 +1,12 @@ /** * */ -package com.whizcontrol.core.model.scheduler; +package com.telecominfraproject.wlan.core.model.scheduler; import java.time.temporal.Temporal; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.whizcontrol.datastore.exceptions.DsDataValidationException; +import com.telecominfraproject.wlan.datastore.exceptions.DsDataValidationException; /** * Value class use to make Temporal value serializable using JSON. diff --git a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/TimeWindowValue.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/TimeWindowValue.java similarity index 95% rename from base-models/src/main/java/com/whizcontrol/core/model/scheduler/TimeWindowValue.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/TimeWindowValue.java index 846c56e..c494406 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/TimeWindowValue.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/TimeWindowValue.java @@ -1,12 +1,12 @@ /** * */ -package com.whizcontrol.core.model.scheduler; +package com.telecominfraproject.wlan.core.model.scheduler; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; /** * Time windows with from and to time (epoch). diff --git a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/ValidDaysCollector.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/ValidDaysCollector.java similarity index 98% rename from base-models/src/main/java/com/whizcontrol/core/model/scheduler/ValidDaysCollector.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/ValidDaysCollector.java index 0bfd9f3..9ad1c72 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/scheduler/ValidDaysCollector.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/scheduler/ValidDaysCollector.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.model.scheduler; +package com.telecominfraproject.wlan.core.model.scheduler; import java.time.DayOfWeek; import java.time.LocalDate; diff --git a/base-models/src/main/java/com/whizcontrol/core/model/serializers/PairLongLongDeserializer.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/serializers/PairLongLongDeserializer.java similarity index 79% rename from base-models/src/main/java/com/whizcontrol/core/model/serializers/PairLongLongDeserializer.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/serializers/PairLongLongDeserializer.java index ca9e471..facba98 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/serializers/PairLongLongDeserializer.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/serializers/PairLongLongDeserializer.java @@ -1,11 +1,11 @@ -package com.whizcontrol.core.model.serializers; +package com.telecominfraproject.wlan.core.model.serializers; import java.io.IOException; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.KeyDeserializer; -import com.whizcontrol.core.model.pair.PairLongLong; +import com.telecominfraproject.wlan.core.model.pair.PairLongLong; public class PairLongLongDeserializer extends KeyDeserializer { diff --git a/base-models/src/main/java/com/whizcontrol/core/model/service/CloudServiceConstants.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/service/CloudServiceConstants.java similarity index 82% rename from base-models/src/main/java/com/whizcontrol/core/model/service/CloudServiceConstants.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/service/CloudServiceConstants.java index c6e59eb..5da289c 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/service/CloudServiceConstants.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/service/CloudServiceConstants.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.service; +package com.telecominfraproject.wlan.core.model.service; /** * Constants used for Cloud Service diff --git a/base-models/src/main/java/com/whizcontrol/core/model/service/CloudServiceInformation.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/service/CloudServiceInformation.java similarity index 85% rename from base-models/src/main/java/com/whizcontrol/core/model/service/CloudServiceInformation.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/service/CloudServiceInformation.java index b02d14d..73fb516 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/service/CloudServiceInformation.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/service/CloudServiceInformation.java @@ -1,9 +1,10 @@ /** * */ -package com.whizcontrol.core.model.service; +package com.telecominfraproject.wlan.core.model.service; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.service.CloudServiceInformation; /** * Cloud Service Information diff --git a/base-models/src/main/java/com/whizcontrol/core/model/service/CloudServiceType.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/service/CloudServiceType.java similarity index 85% rename from base-models/src/main/java/com/whizcontrol/core/model/service/CloudServiceType.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/service/CloudServiceType.java index 65cf078..c243996 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/service/CloudServiceType.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/service/CloudServiceType.java @@ -1,13 +1,14 @@ /** * */ -package com.whizcontrol.core.model.service; +package com.telecominfraproject.wlan.core.model.service; import java.util.HashMap; import java.util.Map; import com.fasterxml.jackson.annotation.JsonCreator; -import com.whizcontrol.core.model.json.JsonDeserializationUtils; +import com.telecominfraproject.wlan.core.model.json.JsonDeserializationUtils; +import com.telecominfraproject.wlan.core.model.service.CloudServiceType; /** * Different type of Cloud Service diff --git a/base-models/src/main/java/com/whizcontrol/core/model/service/ServiceInstanceInformation.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/service/ServiceInstanceInformation.java similarity index 90% rename from base-models/src/main/java/com/whizcontrol/core/model/service/ServiceInstanceInformation.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/service/ServiceInstanceInformation.java index 58fd896..3765d2b 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/service/ServiceInstanceInformation.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/service/ServiceInstanceInformation.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.model.service; +package com.telecominfraproject.wlan.core.model.service; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -9,7 +9,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; -import com.whizcontrol.core.model.utils.SystemAndEnvPropertyResolver; +import com.telecominfraproject.wlan.core.model.service.CloudServiceConstants; +import com.telecominfraproject.wlan.core.model.service.ServiceInstanceInformation; +import com.telecominfraproject.wlan.core.model.utils.SystemAndEnvPropertyResolver; /** * @author yongli diff --git a/base-models/src/main/java/com/whizcontrol/core/model/service/bonjour/BonjourService.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/service/bonjour/BonjourService.java similarity index 96% rename from base-models/src/main/java/com/whizcontrol/core/model/service/bonjour/BonjourService.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/service/bonjour/BonjourService.java index bb19ed2..89c67bd 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/service/bonjour/BonjourService.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/service/bonjour/BonjourService.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.model.service.bonjour; +package com.telecominfraproject.wlan.core.model.service.bonjour; import java.util.Arrays; import java.util.List; diff --git a/base-models/src/main/java/com/whizcontrol/core/model/service/subscription/SubscriptionConstants.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/service/subscription/SubscriptionConstants.java similarity index 93% rename from base-models/src/main/java/com/whizcontrol/core/model/service/subscription/SubscriptionConstants.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/service/subscription/SubscriptionConstants.java index 4ebd26b..5ae977c 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/service/subscription/SubscriptionConstants.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/service/subscription/SubscriptionConstants.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.model.service.subscription; +package com.telecominfraproject.wlan.core.model.service.subscription; import java.util.concurrent.TimeUnit; diff --git a/base-models/src/main/java/com/whizcontrol/core/model/utils/CloneUtil.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/CloneUtil.java similarity index 92% rename from base-models/src/main/java/com/whizcontrol/core/model/utils/CloneUtil.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/CloneUtil.java index a8a2bed..50056fd 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/utils/CloneUtil.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/CloneUtil.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.utils; +package com.telecominfraproject.wlan.core.model.utils; import java.lang.reflect.Constructor; import java.lang.reflect.Field; @@ -9,7 +9,7 @@ import java.util.List; import org.springframework.beans.BeanUtils; -import com.whizcontrol.server.exceptions.GenericErrorException; +import com.telecominfraproject.wlan.server.exceptions.GenericErrorException; public class CloneUtil { diff --git a/base-models/src/main/java/com/whizcontrol/core/model/utils/DateTimeUtils.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/DateTimeUtils.java similarity index 93% rename from base-models/src/main/java/com/whizcontrol/core/model/utils/DateTimeUtils.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/DateTimeUtils.java index 5eb5d35..17f5b38 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/utils/DateTimeUtils.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/DateTimeUtils.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.model.utils; +package com.telecominfraproject.wlan.core.model.utils; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/base-models/src/main/java/com/whizcontrol/core/model/utils/DecibelUtils.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/DecibelUtils.java similarity index 97% rename from base-models/src/main/java/com/whizcontrol/core/model/utils/DecibelUtils.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/DecibelUtils.java index 283e7a3..f1cf63c 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/utils/DecibelUtils.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/DecibelUtils.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.utils; +package com.telecominfraproject.wlan.core.model.utils; import org.apache.commons.math3.stat.descriptive.rank.Percentile; diff --git a/base-models/src/main/java/com/whizcontrol/core/model/utils/FileUtils.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/FileUtils.java similarity index 93% rename from base-models/src/main/java/com/whizcontrol/core/model/utils/FileUtils.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/FileUtils.java index 2d7137d..4d0c0b6 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/utils/FileUtils.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/FileUtils.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.utils; +package com.telecominfraproject.wlan.core.model.utils; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/base-models/src/main/java/com/whizcontrol/core/model/utils/InetAddressUtils.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/InetAddressUtils.java similarity index 81% rename from base-models/src/main/java/com/whizcontrol/core/model/utils/InetAddressUtils.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/InetAddressUtils.java index 34618b0..8ff5a3a 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/utils/InetAddressUtils.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/InetAddressUtils.java @@ -1,12 +1,12 @@ /** * */ -package com.whizcontrol.core.model.utils; +package com.telecominfraproject.wlan.core.model.utils; import java.net.InetAddress; import java.net.UnknownHostException; -import com.whizcontrol.server.exceptions.GenericErrorException; +import com.telecominfraproject.wlan.server.exceptions.GenericErrorException; /** * @author yongli diff --git a/base-models/src/main/java/com/whizcontrol/core/model/utils/JWTUtil.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/JWTUtil.java similarity index 91% rename from base-models/src/main/java/com/whizcontrol/core/model/utils/JWTUtil.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/JWTUtil.java index 2b78f35..6d473be 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/utils/JWTUtil.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/JWTUtil.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.utils; +package com.telecominfraproject.wlan.core.model.utils; import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; @@ -9,7 +9,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.json.JacksonJsonParser; -import com.whizcontrol.server.exceptions.SerializationException; +import com.telecominfraproject.wlan.server.exceptions.SerializationException; public class JWTUtil { diff --git a/base-models/src/main/java/com/whizcontrol/core/model/utils/JsonPatchException.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/JsonPatchException.java similarity index 89% rename from base-models/src/main/java/com/whizcontrol/core/model/utils/JsonPatchException.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/JsonPatchException.java index da37abc..7cdad72 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/utils/JsonPatchException.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/JsonPatchException.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.utils; +package com.telecominfraproject.wlan.core.model.utils; public class JsonPatchException extends Exception { /** diff --git a/base-models/src/main/java/com/whizcontrol/core/model/utils/JsonPatchUtil.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/JsonPatchUtil.java similarity index 95% rename from base-models/src/main/java/com/whizcontrol/core/model/utils/JsonPatchUtil.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/JsonPatchUtil.java index c147078..093ccdd 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/utils/JsonPatchUtil.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/JsonPatchUtil.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.utils; +package com.telecominfraproject.wlan.core.model.utils; import java.io.IOException; @@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.github.fge.jackson.JsonLoader; import com.github.fge.jsonpatch.JsonPatch; import com.github.fge.jsonpatch.diff.JsonDiff; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; /** * diff --git a/base-models/src/main/java/com/whizcontrol/core/model/utils/NumberUtils.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/NumberUtils.java similarity index 96% rename from base-models/src/main/java/com/whizcontrol/core/model/utils/NumberUtils.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/NumberUtils.java index e8c784a..7fb9418 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/utils/NumberUtils.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/NumberUtils.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.model.utils; +package com.telecominfraproject.wlan.core.model.utils; /** * @author yongli diff --git a/base-models/src/main/java/com/whizcontrol/core/model/utils/ReflectionUtil.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/ReflectionUtil.java similarity index 94% rename from base-models/src/main/java/com/whizcontrol/core/model/utils/ReflectionUtil.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/ReflectionUtil.java index 59a4c9d..1e946d3 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/utils/ReflectionUtil.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/ReflectionUtil.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.utils; +package com.telecominfraproject.wlan.core.model.utils; import java.lang.reflect.Field; diff --git a/base-models/src/main/java/com/whizcontrol/core/model/utils/SystemAndEnvPropertyResolver.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/SystemAndEnvPropertyResolver.java similarity index 96% rename from base-models/src/main/java/com/whizcontrol/core/model/utils/SystemAndEnvPropertyResolver.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/SystemAndEnvPropertyResolver.java index 64b0841..9c9537c 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/utils/SystemAndEnvPropertyResolver.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/SystemAndEnvPropertyResolver.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.utils; +package com.telecominfraproject.wlan.core.model.utils; import java.lang.annotation.Annotation; import java.lang.reflect.Field; @@ -6,7 +6,7 @@ import java.lang.reflect.Field; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.whizcontrol.server.exceptions.ConfigurationException; +import com.telecominfraproject.wlan.server.exceptions.ConfigurationException; /** * This class is used to find property values when running outside of Spring environment diff --git a/base-models/src/main/java/com/whizcontrol/core/model/utils/TokenEncoder.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/TokenEncoder.java similarity index 95% rename from base-models/src/main/java/com/whizcontrol/core/model/utils/TokenEncoder.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/TokenEncoder.java index 8eafbab..3d7415e 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/utils/TokenEncoder.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/TokenEncoder.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.model.utils; +package com.telecominfraproject.wlan.core.model.utils; import java.util.Base64; diff --git a/base-models/src/main/java/com/whizcontrol/core/model/utils/TokenUtils.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/TokenUtils.java similarity index 97% rename from base-models/src/main/java/com/whizcontrol/core/model/utils/TokenUtils.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/TokenUtils.java index 5cb7101..948ec59 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/utils/TokenUtils.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/utils/TokenUtils.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.utils; +package com.telecominfraproject.wlan.core.model.utils; import javax.crypto.Cipher; import javax.crypto.spec.SecretKeySpec; @@ -6,7 +6,7 @@ import javax.crypto.spec.SecretKeySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; /** * diff --git a/base-models/src/main/java/com/whizcontrol/core/model/version/Version.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/version/Version.java similarity index 96% rename from base-models/src/main/java/com/whizcontrol/core/model/version/Version.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/version/Version.java index c8fa8fd..07583ec 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/version/Version.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/version/Version.java @@ -1,6 +1,6 @@ -package com.whizcontrol.core.model.version; +package com.telecominfraproject.wlan.core.model.version; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; /** * A model for storing properties related to the release version of the cloud diff --git a/base-models/src/main/java/com/whizcontrol/core/model/wrappers/CurrentAndPreviousState.java b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/wrappers/CurrentAndPreviousState.java similarity index 94% rename from base-models/src/main/java/com/whizcontrol/core/model/wrappers/CurrentAndPreviousState.java rename to base-models/src/main/java/com/telecominfraproject/wlan/core/model/wrappers/CurrentAndPreviousState.java index 33ad162..7a10178 100644 --- a/base-models/src/main/java/com/whizcontrol/core/model/wrappers/CurrentAndPreviousState.java +++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/wrappers/CurrentAndPreviousState.java @@ -1,8 +1,9 @@ -package com.whizcontrol.core.model.wrappers; +package com.telecominfraproject.wlan.core.model.wrappers; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; + import java.util.Objects; -import com.whizcontrol.core.model.json.BaseJsonModel; public class CurrentAndPreviousState> extends BaseJsonModel { private static final long serialVersionUID = -5487444646623716492L; diff --git a/base-models/src/test/java/com/whizcontrol/core/model/DeserializeTests.java b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/DeserializeTests.java similarity index 86% rename from base-models/src/test/java/com/whizcontrol/core/model/DeserializeTests.java rename to base-models/src/test/java/com/telecominfraproject/wlan/core/model/DeserializeTests.java index be82db1..7c0eb73 100644 --- a/base-models/src/test/java/com/whizcontrol/core/model/DeserializeTests.java +++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/DeserializeTests.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.model; +package com.telecominfraproject.wlan.core.model; import java.util.Set; @@ -10,11 +10,7 @@ import org.reflections.Reflections; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.whizcontrol.core.model.json.BaseJsonModel; -/** - * @author yongli - * - */ +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; /** * @author yongli diff --git a/base-models/src/test/java/com/whizcontrol/core/model/equipment/MacAddressTest.java b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/equipment/MacAddressTest.java similarity index 97% rename from base-models/src/test/java/com/whizcontrol/core/model/equipment/MacAddressTest.java rename to base-models/src/test/java/com/telecominfraproject/wlan/core/model/equipment/MacAddressTest.java index c19fb8c..f0bb17c 100644 --- a/base-models/src/test/java/com/whizcontrol/core/model/equipment/MacAddressTest.java +++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/equipment/MacAddressTest.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.equipment; +package com.telecominfraproject.wlan.core.model.equipment; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -14,6 +14,8 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.telecominfraproject.wlan.core.model.equipment.MacAddress; + public class MacAddressTest { private static final Logger LOG = LoggerFactory.getLogger(MacAddressTest.class); diff --git a/base-models/src/test/java/com/whizcontrol/core/model/equipment/NetworkInterfaceTypeTests.java b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/equipment/NetworkInterfaceTypeTests.java similarity index 86% rename from base-models/src/test/java/com/whizcontrol/core/model/equipment/NetworkInterfaceTypeTests.java rename to base-models/src/test/java/com/telecominfraproject/wlan/core/model/equipment/NetworkInterfaceTypeTests.java index b8219d5..28ea8bf 100644 --- a/base-models/src/test/java/com/whizcontrol/core/model/equipment/NetworkInterfaceTypeTests.java +++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/equipment/NetworkInterfaceTypeTests.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.equipment; +package com.telecominfraproject.wlan.core.model.equipment; import static org.junit.Assert.assertEquals; @@ -8,6 +8,9 @@ import java.util.TreeMap; import org.junit.Test; +import com.telecominfraproject.wlan.core.model.equipment.MacAddress; +import com.telecominfraproject.wlan.core.model.equipment.NetworkInterfaceType; + public class NetworkInterfaceTypeTests { @Test diff --git a/base-models/src/test/java/com/whizcontrol/core/model/equipment/WifiSessionUtilityTests.java b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/equipment/WifiSessionUtilityTests.java similarity index 69% rename from base-models/src/test/java/com/whizcontrol/core/model/equipment/WifiSessionUtilityTests.java rename to base-models/src/test/java/com/telecominfraproject/wlan/core/model/equipment/WifiSessionUtilityTests.java index aa38545..1950418 100644 --- a/base-models/src/test/java/com/whizcontrol/core/model/equipment/WifiSessionUtilityTests.java +++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/equipment/WifiSessionUtilityTests.java @@ -1,9 +1,11 @@ -package com.whizcontrol.core.model.equipment; +package com.telecominfraproject.wlan.core.model.equipment; import static org.junit.Assert.*; import org.junit.Test; +import com.telecominfraproject.wlan.core.model.equipment.WiFiSessionUtility; + public class WifiSessionUtilityTests { @Test diff --git a/base-models/src/test/java/com/whizcontrol/core/model/json/SerializationMainTest.java b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/json/SerializationMainTest.java similarity index 98% rename from base-models/src/test/java/com/whizcontrol/core/model/json/SerializationMainTest.java rename to base-models/src/test/java/com/telecominfraproject/wlan/core/model/json/SerializationMainTest.java index 1f283d6..aeed27d 100644 --- a/base-models/src/test/java/com/whizcontrol/core/model/json/SerializationMainTest.java +++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/json/SerializationMainTest.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.json; +package com.telecominfraproject.wlan.core.model.json; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -15,7 +15,9 @@ import org.slf4j.LoggerFactory; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import com.whizcontrol.core.model.testclasses.Vehicle; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.GenericResponse; +import com.telecominfraproject.wlan.core.model.testclasses.Vehicle; public class SerializationMainTest { private static final Logger LOG = LoggerFactory.getLogger(SerializationMainTest.class); diff --git a/base-models/src/test/java/com/whizcontrol/core/model/pagination/PaginationContextTest.java b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/pagination/PaginationContextTest.java similarity index 85% rename from base-models/src/test/java/com/whizcontrol/core/model/pagination/PaginationContextTest.java rename to base-models/src/test/java/com/telecominfraproject/wlan/core/model/pagination/PaginationContextTest.java index 0c888ed..c98e2dd 100644 --- a/base-models/src/test/java/com/whizcontrol/core/model/pagination/PaginationContextTest.java +++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/pagination/PaginationContextTest.java @@ -1,11 +1,12 @@ -package com.whizcontrol.core.model.pagination; +package com.telecominfraproject.wlan.core.model.pagination; import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.whizcontrol.core.model.pair.PairLongLong; -import com.whizcontrol.core.model.pair.PairStringLong; +import com.telecominfraproject.wlan.core.model.pagination.PaginationContext; +import com.telecominfraproject.wlan.core.model.pair.PairLongLong; +import com.telecominfraproject.wlan.core.model.pair.PairStringLong; public class PaginationContextTest { diff --git a/base-models/src/test/java/com/whizcontrol/core/model/scheduler/BaseLocalValueTests.java b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/BaseLocalValueTests.java similarity index 86% rename from base-models/src/test/java/com/whizcontrol/core/model/scheduler/BaseLocalValueTests.java rename to base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/BaseLocalValueTests.java index 9aebe9b..eab8a35 100644 --- a/base-models/src/test/java/com/whizcontrol/core/model/scheduler/BaseLocalValueTests.java +++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/BaseLocalValueTests.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.model.scheduler; +package com.telecominfraproject.wlan.core.model.scheduler; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -14,9 +14,9 @@ import java.util.Map.Entry; import org.junit.Test; import org.slf4j.Logger; -import com.whizcontrol.core.model.json.BaseJsonModel; -import com.whizcontrol.core.model.scheduler.ScheduleValue; -import com.whizcontrol.datastore.exceptions.DsDataValidationException; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.scheduler.ScheduleValue; +import com.telecominfraproject.wlan.datastore.exceptions.DsDataValidationException; /** * @author yongli diff --git a/base-models/src/test/java/com/whizcontrol/core/model/scheduler/DailyTimeRangeScheduleTests.java b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/DailyTimeRangeScheduleTests.java similarity index 94% rename from base-models/src/test/java/com/whizcontrol/core/model/scheduler/DailyTimeRangeScheduleTests.java rename to base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/DailyTimeRangeScheduleTests.java index 3a5cbc2..cbe87ce 100644 --- a/base-models/src/test/java/com/whizcontrol/core/model/scheduler/DailyTimeRangeScheduleTests.java +++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/DailyTimeRangeScheduleTests.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.core.model.scheduler; +package com.telecominfraproject.wlan.core.model.scheduler; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -18,8 +18,11 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.whizcontrol.core.model.json.BaseJsonModel; -import com.whizcontrol.datastore.exceptions.DsDataValidationException; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.scheduler.DailyTimeRangeSchedule; +import com.telecominfraproject.wlan.core.model.scheduler.EpochTimeWindow; +import com.telecominfraproject.wlan.core.model.scheduler.ScheduleSetting; +import com.telecominfraproject.wlan.datastore.exceptions.DsDataValidationException; /** * @author yongli diff --git a/base-models/src/test/java/com/whizcontrol/core/model/scheduler/DateTimeRangeScheduleTests.java b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/DateTimeRangeScheduleTests.java similarity index 92% rename from base-models/src/test/java/com/whizcontrol/core/model/scheduler/DateTimeRangeScheduleTests.java rename to base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/DateTimeRangeScheduleTests.java index 364f336..b05d0f1 100644 --- a/base-models/src/test/java/com/whizcontrol/core/model/scheduler/DateTimeRangeScheduleTests.java +++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/DateTimeRangeScheduleTests.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.scheduler; +package com.telecominfraproject.wlan.core.model.scheduler; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -16,8 +16,11 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.whizcontrol.core.model.json.BaseJsonModel; -import com.whizcontrol.datastore.exceptions.DsDataValidationException; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.scheduler.DateTimeRangeSchedule; +import com.telecominfraproject.wlan.core.model.scheduler.EpochTimeWindow; +import com.telecominfraproject.wlan.core.model.scheduler.ScheduleSetting; +import com.telecominfraproject.wlan.datastore.exceptions.DsDataValidationException; public class DateTimeRangeScheduleTests { diff --git a/base-models/src/test/java/com/whizcontrol/core/model/scheduler/DaysOfMonthTimeRangeScheduleTests.java b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/DaysOfMonthTimeRangeScheduleTests.java similarity index 96% rename from base-models/src/test/java/com/whizcontrol/core/model/scheduler/DaysOfMonthTimeRangeScheduleTests.java rename to base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/DaysOfMonthTimeRangeScheduleTests.java index 0b394db..99252b4 100644 --- a/base-models/src/test/java/com/whizcontrol/core/model/scheduler/DaysOfMonthTimeRangeScheduleTests.java +++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/DaysOfMonthTimeRangeScheduleTests.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.scheduler; +package com.telecominfraproject.wlan.core.model.scheduler; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -17,11 +17,11 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.whizcontrol.core.model.json.BaseJsonModel; -import com.whizcontrol.core.model.scheduler.DaysOfMonthTimeRangeSchedule; -import com.whizcontrol.core.model.scheduler.ScheduleSetting; -import com.whizcontrol.core.model.scheduler.EpochTimeWindow; -import com.whizcontrol.datastore.exceptions.DsDataValidationException; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.scheduler.DaysOfMonthTimeRangeSchedule; +import com.telecominfraproject.wlan.core.model.scheduler.EpochTimeWindow; +import com.telecominfraproject.wlan.core.model.scheduler.ScheduleSetting; +import com.telecominfraproject.wlan.datastore.exceptions.DsDataValidationException; public class DaysOfMonthTimeRangeScheduleTests { private static final String TIMEZONE = ZoneId.systemDefault().getId(); diff --git a/base-models/src/test/java/com/whizcontrol/core/model/scheduler/DaysOfWeekTimeRangeScheduleTests.java b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/DaysOfWeekTimeRangeScheduleTests.java similarity index 96% rename from base-models/src/test/java/com/whizcontrol/core/model/scheduler/DaysOfWeekTimeRangeScheduleTests.java rename to base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/DaysOfWeekTimeRangeScheduleTests.java index f58721a..fa8b15a 100644 --- a/base-models/src/test/java/com/whizcontrol/core/model/scheduler/DaysOfWeekTimeRangeScheduleTests.java +++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/DaysOfWeekTimeRangeScheduleTests.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.scheduler; +package com.telecominfraproject.wlan.core.model.scheduler; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -18,11 +18,11 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.whizcontrol.core.model.json.BaseJsonModel; -import com.whizcontrol.core.model.scheduler.DaysOfWeekTimeRangeSchedule; -import com.whizcontrol.core.model.scheduler.ScheduleSetting; -import com.whizcontrol.core.model.scheduler.EpochTimeWindow; -import com.whizcontrol.datastore.exceptions.DsDataValidationException; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.scheduler.DaysOfWeekTimeRangeSchedule; +import com.telecominfraproject.wlan.core.model.scheduler.EpochTimeWindow; +import com.telecominfraproject.wlan.core.model.scheduler.ScheduleSetting; +import com.telecominfraproject.wlan.datastore.exceptions.DsDataValidationException; public class DaysOfWeekTimeRangeScheduleTests { private static final String TIMEZONE = ZoneId.systemDefault().getId(); diff --git a/base-models/src/test/java/com/whizcontrol/core/model/scheduler/EmptyScheduleTests.java b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/EmptyScheduleTests.java similarity index 71% rename from base-models/src/test/java/com/whizcontrol/core/model/scheduler/EmptyScheduleTests.java rename to base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/EmptyScheduleTests.java index bf45b48..3bde49a 100644 --- a/base-models/src/test/java/com/whizcontrol/core/model/scheduler/EmptyScheduleTests.java +++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/EmptyScheduleTests.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.scheduler; +package com.telecominfraproject.wlan.core.model.scheduler; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -7,9 +7,9 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.whizcontrol.core.model.json.BaseJsonModel; -import com.whizcontrol.core.model.scheduler.EmptySchedule; -import com.whizcontrol.core.model.scheduler.ScheduleSetting; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.scheduler.EmptySchedule; +import com.telecominfraproject.wlan.core.model.scheduler.ScheduleSetting; public class EmptyScheduleTests { diff --git a/base-models/src/test/java/com/whizcontrol/core/model/scheduler/EpochTimeWindowTests.java b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/EpochTimeWindowTests.java similarity index 72% rename from base-models/src/test/java/com/whizcontrol/core/model/scheduler/EpochTimeWindowTests.java rename to base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/EpochTimeWindowTests.java index edb4479..0d7b710 100644 --- a/base-models/src/test/java/com/whizcontrol/core/model/scheduler/EpochTimeWindowTests.java +++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/EpochTimeWindowTests.java @@ -1,9 +1,11 @@ -package com.whizcontrol.core.model.scheduler; +package com.telecominfraproject.wlan.core.model.scheduler; import static org.junit.Assert.*; import org.junit.Test; +import com.telecominfraproject.wlan.core.model.scheduler.TimeWindowValue; + public class EpochTimeWindowTests { @Test diff --git a/base-models/src/test/java/com/whizcontrol/core/model/scheduler/LocalDateTimeValueTests.java b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/LocalDateTimeValueTests.java similarity index 88% rename from base-models/src/test/java/com/whizcontrol/core/model/scheduler/LocalDateTimeValueTests.java rename to base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/LocalDateTimeValueTests.java index a78d43e..9bf98ff 100644 --- a/base-models/src/test/java/com/whizcontrol/core/model/scheduler/LocalDateTimeValueTests.java +++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/LocalDateTimeValueTests.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.scheduler; +package com.telecominfraproject.wlan.core.model.scheduler; import java.time.LocalDateTime; import java.util.HashMap; @@ -8,9 +8,9 @@ import java.util.Map.Entry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.whizcontrol.core.model.scheduler.LocalDateTimeValue; -import com.whizcontrol.core.model.scheduler.LocalDateValue; -import com.whizcontrol.core.model.scheduler.LocalTimeValue; +import com.telecominfraproject.wlan.core.model.scheduler.LocalDateTimeValue; +import com.telecominfraproject.wlan.core.model.scheduler.LocalDateValue; +import com.telecominfraproject.wlan.core.model.scheduler.LocalTimeValue; public class LocalDateTimeValueTests extends BaseLocalValueTests { diff --git a/base-models/src/test/java/com/whizcontrol/core/model/scheduler/LocalDateValueTests.java b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/LocalDateValueTests.java similarity index 90% rename from base-models/src/test/java/com/whizcontrol/core/model/scheduler/LocalDateValueTests.java rename to base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/LocalDateValueTests.java index db26cfb..3e5ebbc 100644 --- a/base-models/src/test/java/com/whizcontrol/core/model/scheduler/LocalDateValueTests.java +++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/LocalDateValueTests.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.scheduler; +package com.telecominfraproject.wlan.core.model.scheduler; import java.time.LocalDate; import java.util.Map; @@ -6,7 +6,7 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.whizcontrol.core.model.scheduler.LocalDateValue; +import com.telecominfraproject.wlan.core.model.scheduler.LocalDateValue; public class LocalDateValueTests extends BaseLocalValueTests { diff --git a/base-models/src/test/java/com/whizcontrol/core/model/scheduler/LocalTimeValueTests.java b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/LocalTimeValueTests.java similarity index 89% rename from base-models/src/test/java/com/whizcontrol/core/model/scheduler/LocalTimeValueTests.java rename to base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/LocalTimeValueTests.java index a518252..c10c7cb 100644 --- a/base-models/src/test/java/com/whizcontrol/core/model/scheduler/LocalTimeValueTests.java +++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/LocalTimeValueTests.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.scheduler; +package com.telecominfraproject.wlan.core.model.scheduler; import java.time.LocalTime; import java.util.Map; @@ -6,7 +6,7 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.whizcontrol.core.model.scheduler.LocalTimeValue; +import com.telecominfraproject.wlan.core.model.scheduler.LocalTimeValue; public class LocalTimeValueTests extends BaseLocalValueTests { diff --git a/base-models/src/test/java/com/whizcontrol/core/model/scheduler/ScheduleSettingTests.java b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/ScheduleSettingTests.java similarity index 80% rename from base-models/src/test/java/com/whizcontrol/core/model/scheduler/ScheduleSettingTests.java rename to base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/ScheduleSettingTests.java index bce11f2..42a7b86 100644 --- a/base-models/src/test/java/com/whizcontrol/core/model/scheduler/ScheduleSettingTests.java +++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/scheduler/ScheduleSettingTests.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.scheduler; +package com.telecominfraproject.wlan.core.model.scheduler; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -9,7 +9,7 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.whizcontrol.core.model.scheduler.ScheduleSetting; +import com.telecominfraproject.wlan.core.model.scheduler.ScheduleSetting; public class ScheduleSettingTests { diff --git a/base-models/src/test/java/com/whizcontrol/core/model/testclasses/Vehicle.java b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/testclasses/Vehicle.java similarity index 95% rename from base-models/src/test/java/com/whizcontrol/core/model/testclasses/Vehicle.java rename to base-models/src/test/java/com/telecominfraproject/wlan/core/model/testclasses/Vehicle.java index cbc70d7..362358a 100644 --- a/base-models/src/test/java/com/whizcontrol/core/model/testclasses/Vehicle.java +++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/testclasses/Vehicle.java @@ -1,10 +1,10 @@ -package com.whizcontrol.core.model.testclasses; +package com.telecominfraproject.wlan.core.model.testclasses; import java.util.List; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; @JsonSerialize() @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/base-models/src/test/java/com/whizcontrol/core/model/utils/CloneUtilTests.java b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/utils/CloneUtilTests.java similarity index 90% rename from base-models/src/test/java/com/whizcontrol/core/model/utils/CloneUtilTests.java rename to base-models/src/test/java/com/telecominfraproject/wlan/core/model/utils/CloneUtilTests.java index ee52d4a..e483edb 100644 --- a/base-models/src/test/java/com/whizcontrol/core/model/utils/CloneUtilTests.java +++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/utils/CloneUtilTests.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.utils; +package com.telecominfraproject.wlan.core.model.utils; import static org.junit.Assert.*; @@ -7,7 +7,8 @@ import java.util.List; import org.junit.Test; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.utils.CloneUtil; public class CloneUtilTests { diff --git a/base-models/src/test/java/com/whizcontrol/core/model/utils/DateTimeUtilsTests.java b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/utils/DateTimeUtilsTests.java similarity index 84% rename from base-models/src/test/java/com/whizcontrol/core/model/utils/DateTimeUtilsTests.java rename to base-models/src/test/java/com/telecominfraproject/wlan/core/model/utils/DateTimeUtilsTests.java index a80d12c..2b25138 100644 --- a/base-models/src/test/java/com/whizcontrol/core/model/utils/DateTimeUtilsTests.java +++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/utils/DateTimeUtilsTests.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.utils; +package com.telecominfraproject.wlan.core.model.utils; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -7,6 +7,8 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.telecominfraproject.wlan.core.model.utils.DateTimeUtils; + public class DateTimeUtilsTests { private static final Logger LOG = LoggerFactory.getLogger(DateTimeUtilsTests.class); diff --git a/base-models/src/test/java/com/whizcontrol/core/model/utils/FileUtilsTests.java b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/utils/FileUtilsTests.java similarity index 92% rename from base-models/src/test/java/com/whizcontrol/core/model/utils/FileUtilsTests.java rename to base-models/src/test/java/com/telecominfraproject/wlan/core/model/utils/FileUtilsTests.java index c3edf17..d86052f 100644 --- a/base-models/src/test/java/com/whizcontrol/core/model/utils/FileUtilsTests.java +++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/utils/FileUtilsTests.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.utils; +package com.telecominfraproject.wlan.core.model.utils; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -13,6 +13,8 @@ import org.junit.rules.TestName; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.telecominfraproject.wlan.core.model.utils.FileUtils; + public class FileUtilsTests { private static final Logger LOG = LoggerFactory.getLogger(FileUtilsTests.class); diff --git a/base-models/src/test/java/com/whizcontrol/core/model/utils/InetAddressUtilsTest.java b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/utils/InetAddressUtilsTest.java similarity index 75% rename from base-models/src/test/java/com/whizcontrol/core/model/utils/InetAddressUtilsTest.java rename to base-models/src/test/java/com/telecominfraproject/wlan/core/model/utils/InetAddressUtilsTest.java index a8f103b..dc361b5 100644 --- a/base-models/src/test/java/com/whizcontrol/core/model/utils/InetAddressUtilsTest.java +++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/utils/InetAddressUtilsTest.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.utils; +package com.telecominfraproject.wlan.core.model.utils; import static org.junit.Assert.assertEquals; @@ -6,6 +6,8 @@ import java.net.InetAddress; import org.junit.Test; +import com.telecominfraproject.wlan.core.model.utils.InetAddressUtils; + public class InetAddressUtilsTest { @Test public void testBasic() throws Exception { diff --git a/base-models/src/test/java/com/whizcontrol/core/model/utils/JWTUtilTests.java b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/utils/JWTUtilTests.java similarity index 84% rename from base-models/src/test/java/com/whizcontrol/core/model/utils/JWTUtilTests.java rename to base-models/src/test/java/com/telecominfraproject/wlan/core/model/utils/JWTUtilTests.java index d9c64b4..c7f5121 100644 --- a/base-models/src/test/java/com/whizcontrol/core/model/utils/JWTUtilTests.java +++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/utils/JWTUtilTests.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.utils; +package com.telecominfraproject.wlan.core.model.utils; import static org.junit.Assert.assertEquals; @@ -6,6 +6,8 @@ import java.util.Map; import org.junit.Test; +import com.telecominfraproject.wlan.core.model.utils.JWTUtil; + public class JWTUtilTests { diff --git a/base-models/src/test/java/com/whizcontrol/core/model/utils/JsonPatchUtilTests.java b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/utils/JsonPatchUtilTests.java similarity index 93% rename from base-models/src/test/java/com/whizcontrol/core/model/utils/JsonPatchUtilTests.java rename to base-models/src/test/java/com/telecominfraproject/wlan/core/model/utils/JsonPatchUtilTests.java index aff5be9..617eba2 100644 --- a/base-models/src/test/java/com/whizcontrol/core/model/utils/JsonPatchUtilTests.java +++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/utils/JsonPatchUtilTests.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.utils; +package com.telecominfraproject.wlan.core.model.utils; import static org.junit.Assert.assertEquals; @@ -14,7 +14,8 @@ import org.junit.runners.Parameterized.Parameters; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.whizcontrol.core.model.testclasses.Vehicle; +import com.telecominfraproject.wlan.core.model.testclasses.Vehicle; +import com.telecominfraproject.wlan.core.model.utils.JsonPatchUtil; @RunWith(Parameterized.class) /** diff --git a/base-models/src/test/java/com/whizcontrol/core/model/utils/NumberUtilsTests.java b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/utils/NumberUtilsTests.java similarity index 84% rename from base-models/src/test/java/com/whizcontrol/core/model/utils/NumberUtilsTests.java rename to base-models/src/test/java/com/telecominfraproject/wlan/core/model/utils/NumberUtilsTests.java index ba31b81..3ca59ad 100644 --- a/base-models/src/test/java/com/whizcontrol/core/model/utils/NumberUtilsTests.java +++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/utils/NumberUtilsTests.java @@ -1,9 +1,11 @@ -package com.whizcontrol.core.model.utils; +package com.telecominfraproject.wlan.core.model.utils; import static org.junit.Assert.assertEquals; import org.junit.Test; +import com.telecominfraproject.wlan.core.model.utils.NumberUtils; + public class NumberUtilsTests { @Test diff --git a/base-models/src/test/java/com/whizcontrol/core/model/utils/OriginatingSwapTests.java b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/utils/OriginatingSwapTests.java similarity index 97% rename from base-models/src/test/java/com/whizcontrol/core/model/utils/OriginatingSwapTests.java rename to base-models/src/test/java/com/telecominfraproject/wlan/core/model/utils/OriginatingSwapTests.java index 84cc193..5662bc6 100644 --- a/base-models/src/test/java/com/whizcontrol/core/model/utils/OriginatingSwapTests.java +++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/utils/OriginatingSwapTests.java @@ -1,4 +1,4 @@ -package com.whizcontrol.core.model.utils; +package com.telecominfraproject.wlan.core.model.utils; import static org.junit.Assert.assertEquals; @@ -6,7 +6,8 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.whizcontrol.core.model.testclasses.Vehicle; +import com.telecominfraproject.wlan.core.model.testclasses.Vehicle; +import com.telecominfraproject.wlan.core.model.utils.JsonPatchUtil; public class OriginatingSwapTests { private static final Logger LOG = LoggerFactory.getLogger(OriginatingSwapTests.class); diff --git a/base-models/src/test/java/com/whizcontrol/core/model/utils/ReflectionUtilTests.java b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/utils/ReflectionUtilTests.java similarity index 90% rename from base-models/src/test/java/com/whizcontrol/core/model/utils/ReflectionUtilTests.java rename to base-models/src/test/java/com/telecominfraproject/wlan/core/model/utils/ReflectionUtilTests.java index 5df1808..64e5187 100644 --- a/base-models/src/test/java/com/whizcontrol/core/model/utils/ReflectionUtilTests.java +++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/utils/ReflectionUtilTests.java @@ -1,9 +1,11 @@ -package com.whizcontrol.core.model.utils; +package com.telecominfraproject.wlan.core.model.utils; import static org.junit.Assert.*; import org.junit.Test; +import com.telecominfraproject.wlan.core.model.utils.ReflectionUtil; + public class ReflectionUtilTests { private static class ClassA diff --git a/base-models/src/test/java/com/whizcontrol/core/model/utils/TokenUtilsTests.java b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/utils/TokenUtilsTests.java similarity index 87% rename from base-models/src/test/java/com/whizcontrol/core/model/utils/TokenUtilsTests.java rename to base-models/src/test/java/com/telecominfraproject/wlan/core/model/utils/TokenUtilsTests.java index b81d177..1a705ee 100644 --- a/base-models/src/test/java/com/whizcontrol/core/model/utils/TokenUtilsTests.java +++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/utils/TokenUtilsTests.java @@ -1,13 +1,15 @@ /** * */ -package com.whizcontrol.core.model.utils; +package com.telecominfraproject.wlan.core.model.utils; import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.utils.TokenEncoder; +import com.telecominfraproject.wlan.core.model.utils.TokenUtils; /** * @author yongli diff --git a/base-models/src/test/java/com/whizcontrol/core/model/version/VersionTest.java b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/version/VersionTest.java similarity index 90% rename from base-models/src/test/java/com/whizcontrol/core/model/version/VersionTest.java rename to base-models/src/test/java/com/telecominfraproject/wlan/core/model/version/VersionTest.java index 77be577..17e3b46 100644 --- a/base-models/src/test/java/com/whizcontrol/core/model/version/VersionTest.java +++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/version/VersionTest.java @@ -1,10 +1,12 @@ -package com.whizcontrol.core.model.version; +package com.telecominfraproject.wlan.core.model.version; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Test; +import com.telecominfraproject.wlan.core.model.version.Version; + public class VersionTest { @Test diff --git a/base-models/src/test/java/com/whizcontrol/core/model/wrappers/CurrentAndPreviousStateTests.java b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/wrappers/CurrentAndPreviousStateTests.java similarity index 82% rename from base-models/src/test/java/com/whizcontrol/core/model/wrappers/CurrentAndPreviousStateTests.java rename to base-models/src/test/java/com/telecominfraproject/wlan/core/model/wrappers/CurrentAndPreviousStateTests.java index abd6147..acb90b2 100644 --- a/base-models/src/test/java/com/whizcontrol/core/model/wrappers/CurrentAndPreviousStateTests.java +++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/wrappers/CurrentAndPreviousStateTests.java @@ -1,9 +1,11 @@ -package com.whizcontrol.core.model.wrappers; +package com.telecominfraproject.wlan.core.model.wrappers; import static org.junit.Assert.assertEquals; import org.junit.Test; +import com.telecominfraproject.wlan.core.model.wrappers.CurrentAndPreviousState; + public class CurrentAndPreviousStateTests { public static enum CrapState diff --git a/base-models/src/test/resources/com/whizcontrol/core/model/json/randomJsonClass.json b/base-models/src/test/resources/com/telecominfraproject/wlan/core/model/json/randomJsonClass.json similarity index 100% rename from base-models/src/test/resources/com/whizcontrol/core/model/json/randomJsonClass.json rename to base-models/src/test/resources/com/telecominfraproject/wlan/core/model/json/randomJsonClass.json diff --git a/base-models/src/test/resources/logback.xml b/base-models/src/test/resources/logback.xml index bcad42f..376abdb 100644 --- a/base-models/src/test/resources/logback.xml +++ b/base-models/src/test/resources/logback.xml @@ -39,7 +39,7 @@ --> - + diff --git a/cloud-metrics/src/main/java/com/whizcontrol/cloudmetrics/CloudMetricsUtils.java b/cloud-metrics/src/main/java/com/telecominfraproject/wlan/cloudmetrics/CloudMetricsUtils.java similarity index 98% rename from cloud-metrics/src/main/java/com/whizcontrol/cloudmetrics/CloudMetricsUtils.java rename to cloud-metrics/src/main/java/com/telecominfraproject/wlan/cloudmetrics/CloudMetricsUtils.java index 54472b7..28f70e7 100644 --- a/cloud-metrics/src/main/java/com/whizcontrol/cloudmetrics/CloudMetricsUtils.java +++ b/cloud-metrics/src/main/java/com/telecominfraproject/wlan/cloudmetrics/CloudMetricsUtils.java @@ -1,4 +1,4 @@ -package com.whizcontrol.cloudmetrics; +package com.telecominfraproject.wlan.cloudmetrics; import java.util.Map; import java.util.concurrent.Callable; diff --git a/cloud-metrics/src/main/java/com/whizcontrol/cloudmetrics/CloudWatchTags.java b/cloud-metrics/src/main/java/com/telecominfraproject/wlan/cloudmetrics/CloudWatchTags.java similarity index 93% rename from cloud-metrics/src/main/java/com/whizcontrol/cloudmetrics/CloudWatchTags.java rename to cloud-metrics/src/main/java/com/telecominfraproject/wlan/cloudmetrics/CloudWatchTags.java index c166386..44512f6 100644 --- a/cloud-metrics/src/main/java/com/whizcontrol/cloudmetrics/CloudWatchTags.java +++ b/cloud-metrics/src/main/java/com/telecominfraproject/wlan/cloudmetrics/CloudWatchTags.java @@ -1,4 +1,4 @@ -package com.whizcontrol.cloudmetrics; +package com.telecominfraproject.wlan.cloudmetrics; import java.util.Arrays; @@ -6,7 +6,7 @@ import com.netflix.servo.tag.BasicTag; import com.netflix.servo.tag.BasicTagList; import com.netflix.servo.tag.TagList; import com.netflix.servo.tag.aws.AwsInjectableTag; -import com.whizcontrol.core.model.utils.SystemAndEnvPropertyResolver; +import com.telecominfraproject.wlan.core.model.utils.SystemAndEnvPropertyResolver; /** * @author dtop diff --git a/cloud-metrics/src/main/java/com/whizcontrol/cloudmetrics/container/start/JvmStatsPublisher.java b/cloud-metrics/src/main/java/com/telecominfraproject/wlan/cloudmetrics/container/start/JvmStatsPublisher.java similarity index 98% rename from cloud-metrics/src/main/java/com/whizcontrol/cloudmetrics/container/start/JvmStatsPublisher.java rename to cloud-metrics/src/main/java/com/telecominfraproject/wlan/cloudmetrics/container/start/JvmStatsPublisher.java index d2d3649..6526cac 100644 --- a/cloud-metrics/src/main/java/com/whizcontrol/cloudmetrics/container/start/JvmStatsPublisher.java +++ b/cloud-metrics/src/main/java/com/telecominfraproject/wlan/cloudmetrics/container/start/JvmStatsPublisher.java @@ -1,4 +1,4 @@ -package com.whizcontrol.cloudmetrics.container.start; +package com.telecominfraproject.wlan.cloudmetrics.container.start; import java.lang.management.GarbageCollectorMXBean; import java.lang.management.ManagementFactory; @@ -29,7 +29,7 @@ import com.netflix.servo.monitor.Monitor; import com.netflix.servo.monitor.MonitorConfig; import com.netflix.servo.monitor.StepCounter; import com.netflix.servo.tag.TagList; -import com.whizcontrol.cloudmetrics.CloudWatchTags; +import com.telecominfraproject.wlan.cloudmetrics.CloudWatchTags; @Component @Profile("do_not_use") // will use JmxMetricsPoller instead diff --git a/cloud-metrics/src/main/java/com/whizcontrol/cloudmetrics/container/start/StartServoMetricsCollector.java b/cloud-metrics/src/main/java/com/telecominfraproject/wlan/cloudmetrics/container/start/StartServoMetricsCollector.java similarity index 98% rename from cloud-metrics/src/main/java/com/whizcontrol/cloudmetrics/container/start/StartServoMetricsCollector.java rename to cloud-metrics/src/main/java/com/telecominfraproject/wlan/cloudmetrics/container/start/StartServoMetricsCollector.java index 7b677d1..db52390 100644 --- a/cloud-metrics/src/main/java/com/whizcontrol/cloudmetrics/container/start/StartServoMetricsCollector.java +++ b/cloud-metrics/src/main/java/com/telecominfraproject/wlan/cloudmetrics/container/start/StartServoMetricsCollector.java @@ -1,4 +1,4 @@ -package com.whizcontrol.cloudmetrics.container.start; +package com.telecominfraproject.wlan.cloudmetrics.container.start; import java.lang.management.ManagementFactory; import java.net.UnknownHostException; @@ -37,8 +37,8 @@ import com.netflix.servo.publish.PollRunnable; import com.netflix.servo.publish.PollScheduler; import com.netflix.servo.publish.cloudwatch.CloudWatchMetricObserver; import com.netflix.servo.tag.aws.AwsInjectableTag; -import com.whizcontrol.cloudmetrics.observers.ElasticSearchMetricObserver; -import com.whizcontrol.server.exceptions.ConfigurationException; +import com.telecominfraproject.wlan.cloudmetrics.observers.ElasticSearchMetricObserver; +import com.telecominfraproject.wlan.server.exceptions.ConfigurationException; /** * @author dtop diff --git a/cloud-metrics/src/main/java/com/whizcontrol/cloudmetrics/elasticsearch/client/ElasticSearchAWSClientConfigurer.java b/cloud-metrics/src/main/java/com/telecominfraproject/wlan/cloudmetrics/elasticsearch/client/ElasticSearchAWSClientConfigurer.java similarity index 87% rename from cloud-metrics/src/main/java/com/whizcontrol/cloudmetrics/elasticsearch/client/ElasticSearchAWSClientConfigurer.java rename to cloud-metrics/src/main/java/com/telecominfraproject/wlan/cloudmetrics/elasticsearch/client/ElasticSearchAWSClientConfigurer.java index 814f169..590bf65 100644 --- a/cloud-metrics/src/main/java/com/whizcontrol/cloudmetrics/elasticsearch/client/ElasticSearchAWSClientConfigurer.java +++ b/cloud-metrics/src/main/java/com/telecominfraproject/wlan/cloudmetrics/elasticsearch/client/ElasticSearchAWSClientConfigurer.java @@ -1,7 +1,7 @@ /** * */ -package com.whizcontrol.cloudmetrics.elasticsearch.client; +package com.telecominfraproject.wlan.cloudmetrics.elasticsearch.client; import org.elasticsearch.client.transport.TransportClient; import org.slf4j.Logger; @@ -13,8 +13,8 @@ import org.springframework.core.env.Environment; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import com.whizcontrol.core.model.service.ServiceInstanceInformation; -import com.whizcontrol.elasticsearch.client.BaseElasticSearchAWSClientConfigurer; +import com.telecominfraproject.wlan.core.model.service.ServiceInstanceInformation; +import com.telecominfraproject.wlan.elasticsearch.client.BaseElasticSearchAWSClientConfigurer; /** * @author yongli diff --git a/cloud-metrics/src/main/java/com/whizcontrol/cloudmetrics/elasticsearch/client/ElasticSearchStaticClientConfigurer.java b/cloud-metrics/src/main/java/com/telecominfraproject/wlan/cloudmetrics/elasticsearch/client/ElasticSearchStaticClientConfigurer.java similarity index 85% rename from cloud-metrics/src/main/java/com/whizcontrol/cloudmetrics/elasticsearch/client/ElasticSearchStaticClientConfigurer.java rename to cloud-metrics/src/main/java/com/telecominfraproject/wlan/cloudmetrics/elasticsearch/client/ElasticSearchStaticClientConfigurer.java index 207b8ae..dca8a6e 100644 --- a/cloud-metrics/src/main/java/com/whizcontrol/cloudmetrics/elasticsearch/client/ElasticSearchStaticClientConfigurer.java +++ b/cloud-metrics/src/main/java/com/telecominfraproject/wlan/cloudmetrics/elasticsearch/client/ElasticSearchStaticClientConfigurer.java @@ -1,4 +1,4 @@ -package com.whizcontrol.cloudmetrics.elasticsearch.client; +package com.telecominfraproject.wlan.cloudmetrics.elasticsearch.client; import org.elasticsearch.client.transport.TransportClient; import org.slf4j.Logger; @@ -9,8 +9,8 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.core.env.Environment; -import com.whizcontrol.core.model.service.ServiceInstanceInformation; -import com.whizcontrol.elasticsearch.client.BaseElasticSearchStaticClientConfigurer; +import com.telecominfraproject.wlan.core.model.service.ServiceInstanceInformation; +import com.telecominfraproject.wlan.elasticsearch.client.BaseElasticSearchStaticClientConfigurer; @Configuration @Profile("cloud-metrics-elastic-search") diff --git a/cloud-metrics/src/main/java/com/whizcontrol/cloudmetrics/observers/ElasticSearchMetricObserver.java b/cloud-metrics/src/main/java/com/telecominfraproject/wlan/cloudmetrics/observers/ElasticSearchMetricObserver.java similarity index 98% rename from cloud-metrics/src/main/java/com/whizcontrol/cloudmetrics/observers/ElasticSearchMetricObserver.java rename to cloud-metrics/src/main/java/com/telecominfraproject/wlan/cloudmetrics/observers/ElasticSearchMetricObserver.java index b66ceef..9792702 100644 --- a/cloud-metrics/src/main/java/com/whizcontrol/cloudmetrics/observers/ElasticSearchMetricObserver.java +++ b/cloud-metrics/src/main/java/com/telecominfraproject/wlan/cloudmetrics/observers/ElasticSearchMetricObserver.java @@ -1,4 +1,4 @@ -package com.whizcontrol.cloudmetrics.observers; +package com.telecominfraproject.wlan.cloudmetrics.observers; import java.net.InetAddress; import java.net.UnknownHostException; @@ -33,7 +33,7 @@ import com.netflix.servo.tag.BasicTag; import com.netflix.servo.tag.Tag; import com.netflix.servo.tag.TagList; import com.netflix.servo.tag.aws.AwsInjectableTag; -import com.whizcontrol.cloudmetrics.CloudWatchTags; +import com.telecominfraproject.wlan.cloudmetrics.CloudWatchTags; public class ElasticSearchMetricObserver extends BaseMetricObserver {