package refactoring
diff --git a/pom.xml b/pom.xml index ecfb9ed..7893d22 100644 --- a/pom.xml +++ b/pom.xml
@@ -21,7 +21,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <dropwizard.version>1.2.0</dropwizard.version> - <mainClass>org.eclipse.openK.MicsCentralApplication</mainClass> + <mainClass>org.eclipse.openk.MicsCentralApplication</mainClass> <easymock.version>3.4</easymock.version> <powermock-api-easymock.version>1.6.6</powermock-api-easymock.version> <jacoco-maven-plugin.version>0.7.9</jacoco-maven-plugin.version>
diff --git a/src/main/java/org/eclipse/openK/MicsCentralApplication.java b/src/main/java/org/eclipse/openk/MicsCentralApplication.java similarity index 93% rename from src/main/java/org/eclipse/openK/MicsCentralApplication.java rename to src/main/java/org/eclipse/openk/MicsCentralApplication.java index 6e87550..582e7a0 100644 --- a/src/main/java/org/eclipse/openK/MicsCentralApplication.java +++ b/src/main/java/org/eclipse/openk/MicsCentralApplication.java
@@ -10,16 +10,16 @@ ****************************************************************************** */ -package org.eclipse.openK; +package org.eclipse.openk; import com.codahale.metrics.health.HealthCheck; import io.dropwizard.Application; import io.dropwizard.setup.Bootstrap; import io.dropwizard.setup.Environment; import org.eclipse.jetty.servlets.CrossOriginFilter; -import org.eclipse.openK.core.controller.InitServicesConfigCacheJob; -import org.eclipse.openK.health.ConfigFilePresentHealthCheck; -import org.eclipse.openK.resources.MicsCentralResource; +import org.eclipse.openk.core.controller.InitServicesConfigCacheJob; +import org.eclipse.openk.health.ConfigFilePresentHealthCheck; +import org.eclipse.openk.resources.MicsCentralResource; import javax.servlet.DispatcherType; import javax.servlet.FilterRegistration;
diff --git a/src/main/java/org/eclipse/openK/MicsCentralConfiguration.java b/src/main/java/org/eclipse/openk/MicsCentralConfiguration.java similarity index 97% rename from src/main/java/org/eclipse/openK/MicsCentralConfiguration.java rename to src/main/java/org/eclipse/openk/MicsCentralConfiguration.java index 5fb7850..df9553e 100644 --- a/src/main/java/org/eclipse/openK/MicsCentralConfiguration.java +++ b/src/main/java/org/eclipse/openk/MicsCentralConfiguration.java
@@ -10,7 +10,7 @@ ****************************************************************************** */ -package org.eclipse.openK; +package org.eclipse.openk; import io.dropwizard.Configuration; import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/org/eclipse/openK/api/ServiceDistributionCluster.java b/src/main/java/org/eclipse/openk/api/ServiceDistributionCluster.java similarity index 98% rename from src/main/java/org/eclipse/openK/api/ServiceDistributionCluster.java rename to src/main/java/org/eclipse/openk/api/ServiceDistributionCluster.java index 8a7acb3..a4a3ddb 100644 --- a/src/main/java/org/eclipse/openK/api/ServiceDistributionCluster.java +++ b/src/main/java/org/eclipse/openk/api/ServiceDistributionCluster.java
@@ -10,7 +10,7 @@ ****************************************************************************** */ -package org.eclipse.openK.api; +package org.eclipse.openk.api; import com.fasterxml.jackson.annotation.JsonProperty; import org.hibernate.validator.constraints.NotEmpty;
diff --git a/src/main/java/org/eclipse/openK/api/ServiceRequestEnvelope.java b/src/main/java/org/eclipse/openk/api/ServiceRequestEnvelope.java similarity index 98% rename from src/main/java/org/eclipse/openK/api/ServiceRequestEnvelope.java rename to src/main/java/org/eclipse/openk/api/ServiceRequestEnvelope.java index ce7b93f..b9efc98 100644 --- a/src/main/java/org/eclipse/openK/api/ServiceRequestEnvelope.java +++ b/src/main/java/org/eclipse/openk/api/ServiceRequestEnvelope.java
@@ -10,7 +10,7 @@ ****************************************************************************** */ -package org.eclipse.openK.api; +package org.eclipse.openk.api; import com.fasterxml.jackson.annotation.JsonProperty; import org.glassfish.jersey.internal.util.Base64;
diff --git a/src/main/java/org/eclipse/openK/api/VersionInfo.java b/src/main/java/org/eclipse/openk/api/VersionInfo.java similarity index 95% rename from src/main/java/org/eclipse/openK/api/VersionInfo.java rename to src/main/java/org/eclipse/openk/api/VersionInfo.java index 7cd5c2b..a5bc079 100644 --- a/src/main/java/org/eclipse/openK/api/VersionInfo.java +++ b/src/main/java/org/eclipse/openk/api/VersionInfo.java
@@ -10,7 +10,7 @@ ****************************************************************************** */ -package org.eclipse.openK.api; +package org.eclipse.openk.api; public class VersionInfo { private String backendVersion;
diff --git a/src/main/java/org/eclipse/openK/core/common/Globals.java b/src/main/java/org/eclipse/openk/core/common/Globals.java similarity index 94% rename from src/main/java/org/eclipse/openK/core/common/Globals.java rename to src/main/java/org/eclipse/openk/core/common/Globals.java index 1f789c8..0331396 100644 --- a/src/main/java/org/eclipse/openK/core/common/Globals.java +++ b/src/main/java/org/eclipse/openk/core/common/Globals.java
@@ -10,7 +10,7 @@ ****************************************************************************** */ -package org.eclipse.openK.core.common; +package org.eclipse.openk.core.common; public final class Globals {
diff --git a/src/main/java/org/eclipse/openK/core/common/GsonUTCDateAdapter.java b/src/main/java/org/eclipse/openk/core/common/GsonUTCDateAdapter.java similarity index 97% rename from src/main/java/org/eclipse/openK/core/common/GsonUTCDateAdapter.java rename to src/main/java/org/eclipse/openk/core/common/GsonUTCDateAdapter.java index 86d7bfa..e284869 100644 --- a/src/main/java/org/eclipse/openK/core/common/GsonUTCDateAdapter.java +++ b/src/main/java/org/eclipse/openk/core/common/GsonUTCDateAdapter.java
@@ -10,7 +10,7 @@ ****************************************************************************** */ -package org.eclipse.openK.core.common; +package org.eclipse.openk.core.common; import com.google.gson.*;
diff --git a/src/main/java/org/eclipse/openK/core/common/JsonGeneratorBase.java b/src/main/java/org/eclipse/openk/core/common/JsonGeneratorBase.java similarity index 95% rename from src/main/java/org/eclipse/openK/core/common/JsonGeneratorBase.java rename to src/main/java/org/eclipse/openk/core/common/JsonGeneratorBase.java index 4627bae..5f1a734 100644 --- a/src/main/java/org/eclipse/openK/core/common/JsonGeneratorBase.java +++ b/src/main/java/org/eclipse/openk/core/common/JsonGeneratorBase.java
@@ -10,7 +10,7 @@ ****************************************************************************** */ -package org.eclipse.openK.core.common; +package org.eclipse.openk.core.common; import com.google.gson.Gson; import com.google.gson.GsonBuilder;
diff --git a/src/main/java/org/eclipse/openK/core/common/util/ResourceLoaderBase.java b/src/main/java/org/eclipse/openk/core/common/util/ResourceLoaderBase.java similarity index 96% rename from src/main/java/org/eclipse/openK/core/common/util/ResourceLoaderBase.java rename to src/main/java/org/eclipse/openk/core/common/util/ResourceLoaderBase.java index 96534c2..0619003 100644 --- a/src/main/java/org/eclipse/openK/core/common/util/ResourceLoaderBase.java +++ b/src/main/java/org/eclipse/openk/core/common/util/ResourceLoaderBase.java
@@ -10,7 +10,7 @@ ****************************************************************************** */ -package org.eclipse.openK.core.common.util; +package org.eclipse.openk.core.common.util; import org.apache.commons.io.IOUtils;
diff --git a/src/main/java/org/eclipse/openK/core/communication/RestServiceWrapper.java b/src/main/java/org/eclipse/openk/core/communication/RestServiceWrapper.java similarity index 97% rename from src/main/java/org/eclipse/openK/core/communication/RestServiceWrapper.java rename to src/main/java/org/eclipse/openk/core/communication/RestServiceWrapper.java index 642c729..560f0f9 100644 --- a/src/main/java/org/eclipse/openK/core/communication/RestServiceWrapper.java +++ b/src/main/java/org/eclipse/openk/core/communication/RestServiceWrapper.java
@@ -10,7 +10,7 @@ ****************************************************************************** */ -package org.eclipse.openK.core.communication; +package org.eclipse.openk.core.communication; import org.apache.http.HttpResponse; @@ -25,8 +25,8 @@ import org.apache.http.ssl.SSLContextBuilder; import org.apache.http.util.EntityUtils; import org.apache.log4j.Logger; -import org.eclipse.openK.core.common.Globals; -import org.eclipse.openK.core.exceptions.HttpStatusException; +import org.eclipse.openk.core.common.Globals; +import org.eclipse.openk.core.exceptions.HttpStatusException; import javax.ws.rs.core.Response; import java.io.IOException;
diff --git a/src/main/java/org/eclipse/openK/core/controller/BackendController.java b/src/main/java/org/eclipse/openk/core/controller/BackendController.java similarity index 92% rename from src/main/java/org/eclipse/openK/core/controller/BackendController.java rename to src/main/java/org/eclipse/openk/core/controller/BackendController.java index 1c528fa..249a4be 100644 --- a/src/main/java/org/eclipse/openK/core/controller/BackendController.java +++ b/src/main/java/org/eclipse/openk/core/controller/BackendController.java
@@ -10,15 +10,15 @@ ****************************************************************************** */ -package org.eclipse.openK.core.controller; +package org.eclipse.openk.core.controller; import org.apache.log4j.Logger; import org.eclipse.jetty.http.HttpStatus; -import org.eclipse.openK.api.VersionInfo; -import org.eclipse.openK.api.ServiceDistributionCluster; -import org.eclipse.openK.core.common.Globals; -import org.eclipse.openK.core.communication.RestServiceWrapper; -import org.eclipse.openK.core.exceptions.HttpStatusException; +import org.eclipse.openk.api.VersionInfo; +import org.eclipse.openk.api.ServiceDistributionCluster; +import org.eclipse.openk.core.common.Globals; +import org.eclipse.openk.core.communication.RestServiceWrapper; +import org.eclipse.openk.core.exceptions.HttpStatusException; import java.util.Arrays; import java.util.List;
diff --git a/src/main/java/org/eclipse/openK/core/controller/BaseWebService.java b/src/main/java/org/eclipse/openk/core/controller/BaseWebService.java similarity index 94% rename from src/main/java/org/eclipse/openK/core/controller/BaseWebService.java rename to src/main/java/org/eclipse/openk/core/controller/BaseWebService.java index c26136d..1d321f7 100644 --- a/src/main/java/org/eclipse/openK/core/controller/BaseWebService.java +++ b/src/main/java/org/eclipse/openk/core/controller/BaseWebService.java
@@ -10,11 +10,11 @@ ****************************************************************************** */ -package org.eclipse.openK.core.controller; +package org.eclipse.openk.core.controller; import org.apache.log4j.Logger; import org.eclipse.jetty.http.HttpStatus; -import org.eclipse.openK.core.exceptions.HttpStatusException; +import org.eclipse.openk.core.exceptions.HttpStatusException; import javax.ws.rs.core.Response; import java.io.IOException;
diff --git a/src/main/java/org/eclipse/openK/core/controller/DispatchController.java b/src/main/java/org/eclipse/openk/core/controller/DispatchController.java similarity index 89% rename from src/main/java/org/eclipse/openK/core/controller/DispatchController.java rename to src/main/java/org/eclipse/openk/core/controller/DispatchController.java index 18fd05e..62cae57 100644 --- a/src/main/java/org/eclipse/openK/core/controller/DispatchController.java +++ b/src/main/java/org/eclipse/openk/core/controller/DispatchController.java
@@ -10,16 +10,16 @@ ****************************************************************************** */ -package org.eclipse.openK.core.controller; +package org.eclipse.openk.core.controller; import com.google.common.collect.Lists; import org.apache.log4j.Logger; import org.eclipse.jetty.http.HttpStatus; -import org.eclipse.openK.api.ServiceDistributionCluster; -import org.eclipse.openK.api.ServiceDistributionCluster.ServiceDistribution; -import org.eclipse.openK.api.ServiceRequestEnvelope; -import org.eclipse.openK.core.communication.RestServiceWrapper; -import org.eclipse.openK.core.exceptions.HttpStatusException; +import org.eclipse.openk.api.ServiceDistributionCluster; +import org.eclipse.openk.api.ServiceDistributionCluster.ServiceDistribution; +import org.eclipse.openk.api.ServiceRequestEnvelope; +import org.eclipse.openk.core.communication.RestServiceWrapper; +import org.eclipse.openk.core.exceptions.HttpStatusException; import javax.ws.rs.core.Response; import java.util.List;
diff --git a/src/main/java/org/eclipse/openK/core/controller/InitServicesConfigCacheJob.java b/src/main/java/org/eclipse/openk/core/controller/InitServicesConfigCacheJob.java similarity index 95% rename from src/main/java/org/eclipse/openK/core/controller/InitServicesConfigCacheJob.java rename to src/main/java/org/eclipse/openk/core/controller/InitServicesConfigCacheJob.java index 1b9a088..41642d0 100644 --- a/src/main/java/org/eclipse/openK/core/controller/InitServicesConfigCacheJob.java +++ b/src/main/java/org/eclipse/openk/core/controller/InitServicesConfigCacheJob.java
@@ -10,7 +10,7 @@ ****************************************************************************** */ -package org.eclipse.openK.core.controller; +package org.eclipse.openk.core.controller; import org.apache.log4j.Logger;
diff --git a/src/main/java/org/eclipse/openK/core/controller/ServiceResolver.java b/src/main/java/org/eclipse/openk/core/controller/ServiceResolver.java similarity index 89% rename from src/main/java/org/eclipse/openK/core/controller/ServiceResolver.java rename to src/main/java/org/eclipse/openk/core/controller/ServiceResolver.java index 1bc06f8..fe6e12c 100644 --- a/src/main/java/org/eclipse/openK/core/controller/ServiceResolver.java +++ b/src/main/java/org/eclipse/openk/core/controller/ServiceResolver.java
@@ -10,10 +10,10 @@ ****************************************************************************** */ -package org.eclipse.openK.core.controller; +package org.eclipse.openk.core.controller; -import org.eclipse.openK.api.ServiceDistributionCluster; -import org.eclipse.openK.api.ServiceDistributionCluster.ServiceDistribution; +import org.eclipse.openk.api.ServiceDistributionCluster; +import org.eclipse.openk.api.ServiceDistributionCluster.ServiceDistribution; import java.util.Arrays; import java.util.Optional;
diff --git a/src/main/java/org/eclipse/openK/core/controller/ServicesConfigCache.java b/src/main/java/org/eclipse/openk/core/controller/ServicesConfigCache.java similarity index 94% rename from src/main/java/org/eclipse/openK/core/controller/ServicesConfigCache.java rename to src/main/java/org/eclipse/openk/core/controller/ServicesConfigCache.java index ae5f0d6..ea276d7 100644 --- a/src/main/java/org/eclipse/openK/core/controller/ServicesConfigCache.java +++ b/src/main/java/org/eclipse/openk/core/controller/ServicesConfigCache.java
@@ -10,13 +10,13 @@ ****************************************************************************** */ -package org.eclipse.openK.core.controller; +package org.eclipse.openk.core.controller; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.log4j.Logger; import org.eclipse.jetty.http.HttpStatus; -import org.eclipse.openK.api.ServiceDistributionCluster; -import org.eclipse.openK.core.exceptions.HttpStatusException; +import org.eclipse.openk.api.ServiceDistributionCluster; +import org.eclipse.openk.core.exceptions.HttpStatusException; import javax.validation.ConstraintViolation; import javax.validation.Validation;
diff --git a/src/main/java/org/eclipse/openK/core/controller/ServicesConfigCacheTimerTask.java b/src/main/java/org/eclipse/openk/core/controller/ServicesConfigCacheTimerTask.java similarity index 82% rename from src/main/java/org/eclipse/openK/core/controller/ServicesConfigCacheTimerTask.java rename to src/main/java/org/eclipse/openk/core/controller/ServicesConfigCacheTimerTask.java index 2c4a8cd..136a26f 100644 --- a/src/main/java/org/eclipse/openK/core/controller/ServicesConfigCacheTimerTask.java +++ b/src/main/java/org/eclipse/openk/core/controller/ServicesConfigCacheTimerTask.java
@@ -10,10 +10,10 @@ ****************************************************************************** */ -package org.eclipse.openK.core.controller; +package org.eclipse.openk.core.controller; import org.apache.log4j.Logger; -import org.eclipse.openK.core.exceptions.HttpStatusException; +import org.eclipse.openk.core.exceptions.HttpStatusException; import java.util.TimerTask; @@ -28,14 +28,10 @@ @Override public void run() { - //logger.debug("ServicesConfigCacheTimerTask started"); - try { ServicesConfigCache.getInstance().readServerDistribution(this.configFileName); } catch (HttpStatusException e) { logger.error("Error reading ServerDistributionFile", e); } - - //logger.debug("ServicesConfigCacheTimerTask finished"); } }
diff --git a/src/main/java/org/eclipse/openK/core/exceptions/HttpStatusException.java b/src/main/java/org/eclipse/openk/core/exceptions/HttpStatusException.java similarity index 94% rename from src/main/java/org/eclipse/openK/core/exceptions/HttpStatusException.java rename to src/main/java/org/eclipse/openk/core/exceptions/HttpStatusException.java index c13fd02..f9348b7 100644 --- a/src/main/java/org/eclipse/openK/core/exceptions/HttpStatusException.java +++ b/src/main/java/org/eclipse/openk/core/exceptions/HttpStatusException.java
@@ -10,7 +10,7 @@ ****************************************************************************** */ -package org.eclipse.openK.core.exceptions; +package org.eclipse.openk.core.exceptions; public class HttpStatusException extends Exception { private final int httpStatus;
diff --git a/src/main/java/org/eclipse/openK/health/ConfigFilePresentHealthCheck.java b/src/main/java/org/eclipse/openk/health/ConfigFilePresentHealthCheck.java similarity index 86% rename from src/main/java/org/eclipse/openK/health/ConfigFilePresentHealthCheck.java rename to src/main/java/org/eclipse/openk/health/ConfigFilePresentHealthCheck.java index 30bad60..924d1e7 100644 --- a/src/main/java/org/eclipse/openK/health/ConfigFilePresentHealthCheck.java +++ b/src/main/java/org/eclipse/openk/health/ConfigFilePresentHealthCheck.java
@@ -10,11 +10,11 @@ ****************************************************************************** */ -package org.eclipse.openK.health; +package org.eclipse.openk.health; import com.codahale.metrics.health.HealthCheck; -import org.eclipse.openK.api.ServiceDistributionCluster; -import org.eclipse.openK.core.controller.ServicesConfigCache; +import org.eclipse.openk.api.ServiceDistributionCluster; +import org.eclipse.openk.core.controller.ServicesConfigCache; public class ConfigFilePresentHealthCheck extends HealthCheck { @Override
diff --git a/src/main/java/org/eclipse/openK/resources/MicsCentralResource.java b/src/main/java/org/eclipse/openk/resources/MicsCentralResource.java similarity index 85% rename from src/main/java/org/eclipse/openK/resources/MicsCentralResource.java rename to src/main/java/org/eclipse/openk/resources/MicsCentralResource.java index 19a7fc2..4241164 100644 --- a/src/main/java/org/eclipse/openK/resources/MicsCentralResource.java +++ b/src/main/java/org/eclipse/openk/resources/MicsCentralResource.java
@@ -10,17 +10,17 @@ ****************************************************************************** */ -package org.eclipse.openK.resources; +package org.eclipse.openk.resources; import org.apache.log4j.Logger; -import org.eclipse.openK.core.common.JsonGeneratorBase; -import org.eclipse.openK.core.controller.DispatchController; +import org.eclipse.openk.core.common.JsonGeneratorBase; +import org.eclipse.openk.core.controller.DispatchController; import org.hibernate.validator.constraints.NotEmpty; -import org.eclipse.openK.api.ServiceRequestEnvelope; -import org.eclipse.openK.core.controller.BackendController; -import org.eclipse.openK.core.controller.BaseWebService; -import org.eclipse.openK.core.exceptions.HttpStatusException; +import org.eclipse.openk.api.ServiceRequestEnvelope; +import org.eclipse.openk.core.controller.BackendController; +import org.eclipse.openk.core.controller.BaseWebService; +import org.eclipse.openk.core.exceptions.HttpStatusException; import javax.ws.rs.*; import javax.ws.rs.core.MediaType;
diff --git a/src/test/java/org/eclipse/openK/MicsCentralApplicationTest.java b/src/test/java/org/eclipse/openk/MicsCentralApplicationTest.java similarity index 98% rename from src/test/java/org/eclipse/openK/MicsCentralApplicationTest.java rename to src/test/java/org/eclipse/openk/MicsCentralApplicationTest.java index 9f4df5c..191c246 100644 --- a/src/test/java/org/eclipse/openK/MicsCentralApplicationTest.java +++ b/src/test/java/org/eclipse/openk/MicsCentralApplicationTest.java
@@ -10,7 +10,7 @@ ****************************************************************************** */ -package org.eclipse.openK; +package org.eclipse.openk; import com.codahale.metrics.health.HealthCheckRegistry; import io.dropwizard.jersey.setup.JerseyEnvironment;
diff --git a/src/test/java/org/eclipse/openK/api/ServiceDistributionClusterTest.java b/src/test/java/org/eclipse/openk/api/ServiceDistributionClusterTest.java similarity index 98% rename from src/test/java/org/eclipse/openK/api/ServiceDistributionClusterTest.java rename to src/test/java/org/eclipse/openk/api/ServiceDistributionClusterTest.java index ff0b8f0..d488d59 100644 --- a/src/test/java/org/eclipse/openK/api/ServiceDistributionClusterTest.java +++ b/src/test/java/org/eclipse/openk/api/ServiceDistributionClusterTest.java
@@ -10,7 +10,7 @@ ****************************************************************************** */ -package org.eclipse.openK.api; +package org.eclipse.openk.api; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Test;
diff --git a/src/test/java/org/eclipse/openK/api/ServiceRequestEnvelopeTest.java b/src/test/java/org/eclipse/openk/api/ServiceRequestEnvelopeTest.java similarity index 91% rename from src/test/java/org/eclipse/openK/api/ServiceRequestEnvelopeTest.java rename to src/test/java/org/eclipse/openk/api/ServiceRequestEnvelopeTest.java index 55e3e6f..13b6ac5 100644 --- a/src/test/java/org/eclipse/openK/api/ServiceRequestEnvelopeTest.java +++ b/src/test/java/org/eclipse/openk/api/ServiceRequestEnvelopeTest.java
@@ -10,7 +10,7 @@ ****************************************************************************** */ -package org.eclipse.openK.api; +package org.eclipse.openk.api; import org.glassfish.jersey.internal.util.Base64; import org.junit.Test; @@ -50,5 +50,11 @@ assertEquals(2, env.getHeaders().length); assertEquals("2ndAttr", env.getHeaders()[1].getAttribute()); assertEquals("1stValue", env.getHeaders()[0].getValue()); + + env.setPayload(null); + assertEquals("", env.getPayloadDecode()); + + env.setPayload(""); + assertEquals("", env.getPayloadDecode()); } }
diff --git a/src/test/java/org/eclipse/openK/api/VersionInfoTest.java b/src/test/java/org/eclipse/openk/api/VersionInfoTest.java similarity index 96% rename from src/test/java/org/eclipse/openK/api/VersionInfoTest.java rename to src/test/java/org/eclipse/openk/api/VersionInfoTest.java index 26517c3..fa9b197 100644 --- a/src/test/java/org/eclipse/openK/api/VersionInfoTest.java +++ b/src/test/java/org/eclipse/openk/api/VersionInfoTest.java
@@ -10,7 +10,7 @@ ****************************************************************************** */ -package org.eclipse.openK.api; +package org.eclipse.openk.api; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Test;
diff --git a/src/test/java/org/eclipse/openK/core/common/GsonUTCDateAdapterTest.java b/src/test/java/org/eclipse/openk/core/common/GsonUTCDateAdapterTest.java similarity index 97% rename from src/test/java/org/eclipse/openK/core/common/GsonUTCDateAdapterTest.java rename to src/test/java/org/eclipse/openk/core/common/GsonUTCDateAdapterTest.java index efd4d3c..06c574c 100644 --- a/src/test/java/org/eclipse/openK/core/common/GsonUTCDateAdapterTest.java +++ b/src/test/java/org/eclipse/openk/core/common/GsonUTCDateAdapterTest.java
@@ -10,7 +10,7 @@ ****************************************************************************** */ -package org.eclipse.openK.core.common; +package org.eclipse.openk.core.common; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonElement;
diff --git a/src/test/java/org/eclipse/openK/core/common/util/ResourceLoaderBaseTest.java b/src/test/java/org/eclipse/openk/core/common/util/ResourceLoaderBaseTest.java similarity index 94% rename from src/test/java/org/eclipse/openK/core/common/util/ResourceLoaderBaseTest.java rename to src/test/java/org/eclipse/openk/core/common/util/ResourceLoaderBaseTest.java index 976ac64..9247f87 100644 --- a/src/test/java/org/eclipse/openK/core/common/util/ResourceLoaderBaseTest.java +++ b/src/test/java/org/eclipse/openk/core/common/util/ResourceLoaderBaseTest.java
@@ -10,7 +10,7 @@ ****************************************************************************** */ -package org.eclipse.openK.core.common.util; +package org.eclipse.openk.core.common.util; import org.junit.Test;
diff --git a/src/test/java/org/eclipse/openK/core/controller/BackendControllerTest.java b/src/test/java/org/eclipse/openk/core/controller/BackendControllerTest.java similarity index 86% rename from src/test/java/org/eclipse/openK/core/controller/BackendControllerTest.java rename to src/test/java/org/eclipse/openk/core/controller/BackendControllerTest.java index d97234a..868b9f5 100644 --- a/src/test/java/org/eclipse/openK/core/controller/BackendControllerTest.java +++ b/src/test/java/org/eclipse/openk/core/controller/BackendControllerTest.java
@@ -10,14 +10,14 @@ ****************************************************************************** */ -package org.eclipse.openK.core.controller; +package org.eclipse.openk.core.controller; import org.eclipse.jetty.http.HttpStatus; -import org.eclipse.openK.core.common.util.ResourceLoaderBase; +import org.eclipse.openk.core.common.util.ResourceLoaderBase; import org.junit.Test; import org.powermock.reflect.Whitebox; -import org.eclipse.openK.api.ServiceDistributionCluster; -import org.eclipse.openK.core.exceptions.HttpStatusException; +import org.eclipse.openk.api.ServiceDistributionCluster; +import org.eclipse.openk.core.exceptions.HttpStatusException; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -45,9 +45,9 @@ @Test public void testReadServerDistribution() throws Exception { - ServiceDistributionCluster sdc = baseTestReadServerDistribution("elogbook.openK", "testServiceDistributions.json"); + ServiceDistributionCluster sdc = baseTestReadServerDistribution("elogbook.openk", "testServiceDistributions.json"); - assertEquals("elogbook.openK", sdc.getClustername()); + assertEquals("elogbook.openk", sdc.getClustername()); assertEquals(1, sdc.getDistributions().length); assertEquals("172.18.22.160", sdc.getDistributions()[0].getHost()); } @@ -72,7 +72,7 @@ @Test public void testReadServerDistribution_activeInactive() throws Exception { - ServiceDistributionCluster sdc = baseTestReadServerDistribution( "elogbook.openK", "testServiceDistributionsTwo_OneIsInactive.json"); + ServiceDistributionCluster sdc = baseTestReadServerDistribution( "elogbook.openk", "testServiceDistributionsTwo_OneIsInactive.json"); assertEquals( 1, sdc.getDistributions().length); assertTrue( sdc.getDistributions()[0].isActive());
diff --git a/src/test/java/org/eclipse/openK/core/controller/BaseWebServiceTest.java b/src/test/java/org/eclipse/openk/core/controller/BaseWebServiceTest.java similarity index 92% rename from src/test/java/org/eclipse/openK/core/controller/BaseWebServiceTest.java rename to src/test/java/org/eclipse/openk/core/controller/BaseWebServiceTest.java index 7deef09..2b5ac28 100644 --- a/src/test/java/org/eclipse/openK/core/controller/BaseWebServiceTest.java +++ b/src/test/java/org/eclipse/openk/core/controller/BaseWebServiceTest.java
@@ -10,13 +10,13 @@ ****************************************************************************** */ -package org.eclipse.openK.core.controller; +package org.eclipse.openk.core.controller; import org.eclipse.jetty.http.HttpStatus; -import org.eclipse.openK.core.common.util.ResourceLoaderBase; +import org.eclipse.openk.core.common.util.ResourceLoaderBase; import org.junit.Test; import org.powermock.reflect.Whitebox; -import org.eclipse.openK.core.exceptions.HttpStatusException; +import org.eclipse.openk.core.exceptions.HttpStatusException; import javax.ws.rs.core.Response;
diff --git a/src/test/java/org/eclipse/openK/core/controller/DispatchControllerTest.java b/src/test/java/org/eclipse/openk/core/controller/DispatchControllerTest.java similarity index 89% rename from src/test/java/org/eclipse/openK/core/controller/DispatchControllerTest.java rename to src/test/java/org/eclipse/openk/core/controller/DispatchControllerTest.java index 9cc5507..6d7aad3 100644 --- a/src/test/java/org/eclipse/openK/core/controller/DispatchControllerTest.java +++ b/src/test/java/org/eclipse/openk/core/controller/DispatchControllerTest.java
@@ -10,19 +10,19 @@ ****************************************************************************** */ -package org.eclipse.openK.core.controller; +package org.eclipse.openk.core.controller; import org.easymock.EasyMock; import org.eclipse.jetty.http.HttpStatus; import org.junit.Before; import org.junit.Test; import org.powermock.reflect.Whitebox; -import org.eclipse.openK.api.ServiceDistributionCluster; -import org.eclipse.openK.api.ServiceRequestEnvelope; -import org.eclipse.openK.core.common.JsonGeneratorBase; -import org.eclipse.openK.core.common.util.ResourceLoaderBase; -import org.eclipse.openK.core.communication.RestServiceWrapper; -import org.eclipse.openK.core.exceptions.HttpStatusException; +import org.eclipse.openk.api.ServiceDistributionCluster; +import org.eclipse.openk.api.ServiceRequestEnvelope; +import org.eclipse.openk.core.common.JsonGeneratorBase; +import org.eclipse.openk.core.common.util.ResourceLoaderBase; +import org.eclipse.openk.core.communication.RestServiceWrapper; +import org.eclipse.openk.core.exceptions.HttpStatusException; import javax.ws.rs.core.Response; @@ -61,7 +61,7 @@ } }; - Response resp2 = controller.dispatch("elogbook.openK", envelope); + Response resp2 = controller.dispatch("elogbook.openk", envelope); assertEquals(HttpStatus.OK_200, resp2.getStatus()); }
diff --git a/src/test/java/org/eclipse/openK/core/controller/ServicesConfigCacheTest.java b/src/test/java/org/eclipse/openk/core/controller/ServicesConfigCacheTest.java similarity index 88% rename from src/test/java/org/eclipse/openK/core/controller/ServicesConfigCacheTest.java rename to src/test/java/org/eclipse/openk/core/controller/ServicesConfigCacheTest.java index 3cf869b..152facd 100644 --- a/src/test/java/org/eclipse/openK/core/controller/ServicesConfigCacheTest.java +++ b/src/test/java/org/eclipse/openk/core/controller/ServicesConfigCacheTest.java
@@ -10,14 +10,14 @@ ****************************************************************************** */ -package org.eclipse.openK.core.controller; +package org.eclipse.openk.core.controller; import org.eclipse.jetty.http.HttpStatus; import org.junit.Test; import org.powermock.reflect.Whitebox; -import org.eclipse.openK.api.ServiceDistributionCluster; -import org.eclipse.openK.core.common.util.ResourceLoaderBase; -import org.eclipse.openK.core.exceptions.HttpStatusException; +import org.eclipse.openk.api.ServiceDistributionCluster; +import org.eclipse.openk.core.common.util.ResourceLoaderBase; +import org.eclipse.openk.core.exceptions.HttpStatusException; import static org.junit.Assert.assertEquals; @@ -37,7 +37,7 @@ ServiceDistributionCluster[] sdc = baseTestReadServerDistribution("testServiceDistributions.json"); - assertEquals("elogbook.openK", sdc[0].getClustername()); + assertEquals("elogbook.openk", sdc[0].getClustername()); assertEquals(1, sdc[0].getDistributions().length); assertEquals("172.18.22.160", sdc[0].getDistributions()[0].getHost()); }
diff --git a/src/test/java/org/eclipse/openK/core/controller/ServicesConfigCacheTimerTaskTest.java b/src/test/java/org/eclipse/openk/core/controller/ServicesConfigCacheTimerTaskTest.java similarity index 95% rename from src/test/java/org/eclipse/openK/core/controller/ServicesConfigCacheTimerTaskTest.java rename to src/test/java/org/eclipse/openk/core/controller/ServicesConfigCacheTimerTaskTest.java index 31c45c6..e8f6557 100644 --- a/src/test/java/org/eclipse/openK/core/controller/ServicesConfigCacheTimerTaskTest.java +++ b/src/test/java/org/eclipse/openk/core/controller/ServicesConfigCacheTimerTaskTest.java
@@ -10,11 +10,11 @@ ****************************************************************************** */ -package org.eclipse.openK.core.controller; +package org.eclipse.openk.core.controller; import org.easymock.EasyMock; import org.eclipse.jetty.http.HttpStatus; -import org.eclipse.openK.core.exceptions.HttpStatusException; +import org.eclipse.openk.core.exceptions.HttpStatusException; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test;
diff --git a/src/test/java/org/eclipse/openK/core/exceptions/HttpStatusExceptionTest.java b/src/test/java/org/eclipse/openk/core/exceptions/HttpStatusExceptionTest.java similarity index 94% rename from src/test/java/org/eclipse/openK/core/exceptions/HttpStatusExceptionTest.java rename to src/test/java/org/eclipse/openk/core/exceptions/HttpStatusExceptionTest.java index 19589b2..7ffc901 100644 --- a/src/test/java/org/eclipse/openK/core/exceptions/HttpStatusExceptionTest.java +++ b/src/test/java/org/eclipse/openk/core/exceptions/HttpStatusExceptionTest.java
@@ -10,7 +10,7 @@ ****************************************************************************** */ -package org.eclipse.openK.core.exceptions; +package org.eclipse.openk.core.exceptions; import org.eclipse.jetty.http.HttpStatus;
diff --git a/src/test/java/org/eclipse/openK/health/ConfigFilePresentHealthCheckTest.java b/src/test/java/org/eclipse/openk/health/ConfigFilePresentHealthCheckTest.java similarity index 92% rename from src/test/java/org/eclipse/openK/health/ConfigFilePresentHealthCheckTest.java rename to src/test/java/org/eclipse/openk/health/ConfigFilePresentHealthCheckTest.java index f33c91e..0ebe951 100644 --- a/src/test/java/org/eclipse/openK/health/ConfigFilePresentHealthCheckTest.java +++ b/src/test/java/org/eclipse/openk/health/ConfigFilePresentHealthCheckTest.java
@@ -10,11 +10,11 @@ ****************************************************************************** */ -package org.eclipse.openK.health; +package org.eclipse.openk.health; import com.codahale.metrics.health.HealthCheck; -import org.eclipse.openK.api.ServiceDistributionCluster; -import org.eclipse.openK.core.controller.ServicesConfigCache; +import org.eclipse.openk.api.ServiceDistributionCluster; +import org.eclipse.openk.core.controller.ServicesConfigCache; import org.junit.Test; import org.powermock.reflect.Whitebox;
diff --git a/src/test/java/org/eclipse/openK/resources/MicsCentralResourceTest.java b/src/test/java/org/eclipse/openk/resources/MicsCentralResourceTest.java similarity index 85% rename from src/test/java/org/eclipse/openK/resources/MicsCentralResourceTest.java rename to src/test/java/org/eclipse/openk/resources/MicsCentralResourceTest.java index ffecb61..4597aef 100644 --- a/src/test/java/org/eclipse/openK/resources/MicsCentralResourceTest.java +++ b/src/test/java/org/eclipse/openk/resources/MicsCentralResourceTest.java
@@ -10,11 +10,11 @@ ****************************************************************************** */ -package org.eclipse.openK.resources; +package org.eclipse.openk.resources; import org.eclipse.jetty.http.HttpStatus; -import org.eclipse.openK.core.controller.ServicesConfigCache; -import org.eclipse.openK.core.exceptions.HttpStatusException; +import org.eclipse.openk.core.controller.ServicesConfigCache; +import org.eclipse.openk.core.exceptions.HttpStatusException; import org.junit.Test; import javax.ws.rs.core.Response; @@ -32,7 +32,7 @@ @Test public void testGetServiceDistribution() throws HttpStatusException { ServicesConfigCache.getInstance().readServerDistribution("servicesDistributionDevLocal.json"); - Response r = new MicsCentralResource().getServiceDistribution("elogbook.openK" ); + Response r = new MicsCentralResource().getServiceDistribution("elogbook.openk" ); assertEquals(HttpStatus.OK_200, r.getStatus()); }