Move Handler observers from handler to handler.observer

hawkular · May 26, 2015 · 34a8df2 · 34a8df2
1 parent ecd0b9d
commit 34a8df2
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 6 deletions.
diff --git a/...s-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/AvailabilityHandler.java b/...s-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/AvailabilityHandler.java
@@ -54,7 +54,8 @@
 import com.wordnik.swagger.annotations.ApiResponses;
 
 import org.hawkular.metrics.api.jaxrs.ApiError;
-import org.hawkular.metrics.api.jaxrs.ResultSetObserver;
+import org.hawkular.metrics.api.jaxrs.handler.observer.MetricCreatedObserver;
+import org.hawkular.metrics.api.jaxrs.handler.observer.ResultSetObserver;
 import org.hawkular.metrics.api.jaxrs.param.Duration;
 import org.hawkular.metrics.api.jaxrs.param.Tags;
 import org.hawkular.metrics.api.jaxrs.request.TagRequest;

diff --git a/api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/GaugeHandler.java b/api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/GaugeHandler.java
@@ -59,7 +59,8 @@
 import com.wordnik.swagger.annotations.ApiResponses;
 
 import org.hawkular.metrics.api.jaxrs.ApiError;
-import org.hawkular.metrics.api.jaxrs.ResultSetObserver;
+import org.hawkular.metrics.api.jaxrs.handler.observer.MetricCreatedObserver;
+import org.hawkular.metrics.api.jaxrs.handler.observer.ResultSetObserver;
 import org.hawkular.metrics.api.jaxrs.param.Duration;
 import org.hawkular.metrics.api.jaxrs.param.Tags;
 import org.hawkular.metrics.api.jaxrs.request.TagRequest;

diff --git a/...etrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/TenantsHandler.java b/...etrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/TenantsHandler.java
@@ -36,6 +36,7 @@
 import javax.ws.rs.core.UriInfo;
 
 import org.hawkular.metrics.api.jaxrs.ApiError;
+import org.hawkular.metrics.api.jaxrs.handler.observer.TenantCreatedObserver;
 import org.hawkular.metrics.core.api.MetricsService;
 import org.hawkular.metrics.core.api.Tenant;
 

diff --git a/.../jaxrs/handler/EntityCreatedObserver.java → ...ndler/observer/EntityCreatedObserver.java b/.../jaxrs/handler/EntityCreatedObserver.java → ...ndler/observer/EntityCreatedObserver.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.hawkular.metrics.api.jaxrs.handler;
+package org.hawkular.metrics.api.jaxrs.handler.observer;
 
 import static org.hawkular.metrics.api.jaxrs.util.ApiUtils.serverError;
 

diff --git a/.../jaxrs/handler/MetricCreatedObserver.java → ...ndler/observer/MetricCreatedObserver.java b/.../jaxrs/handler/MetricCreatedObserver.java → ...ndler/observer/MetricCreatedObserver.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.hawkular.metrics.api.jaxrs.handler;
+package org.hawkular.metrics.api.jaxrs.handler.observer;
 
 import java.net.URI;
 

diff --git a/.../metrics/api/jaxrs/ResultSetObserver.java → ...s/handler/observer/ResultSetObserver.java b/.../metrics/api/jaxrs/ResultSetObserver.java → ...s/handler/observer/ResultSetObserver.java
@@ -14,7 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.api.jaxrs;
+package org.hawkular.metrics.api.jaxrs.handler.observer;
+
+import org.hawkular.metrics.api.jaxrs.ApiError;
 
 import com.datastax.driver.core.ResultSet;
 

diff --git a/.../jaxrs/handler/TenantCreatedObserver.java → ...ndler/observer/TenantCreatedObserver.java b/.../jaxrs/handler/TenantCreatedObserver.java → ...ndler/observer/TenantCreatedObserver.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.hawkular.metrics.api.jaxrs.handler;
+package org.hawkular.metrics.api.jaxrs.handler.observer;
 
 import java.net.URI;