Merge pull request #235 from jsanda/HWKMETRICS-112

[HWKMETRICS-112] move classes up one level
hawkular · Jun 1, 2015 · eb6e3fd · eb6e3fd
2 parents 1165191 + 7990d6b
commit eb6e3fd
Show file tree

Hide file tree

Showing 26 changed files with 39 additions and 41 deletions.
diff --git a/...etrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/MetricsServiceProducer.java b/...etrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/MetricsServiceProducer.java
@@ -33,8 +33,8 @@
 import org.hawkular.metrics.api.jaxrs.config.ConfigurationProperty;
 import org.hawkular.metrics.api.jaxrs.util.Eager;
 import org.hawkular.metrics.core.api.MetricsService;
-import org.hawkular.metrics.core.impl.cassandra.CassandraSession;
-import org.hawkular.metrics.core.impl.cassandra.MetricsServiceCassandra;
+import org.hawkular.metrics.core.impl.CassandraSession;
+import org.hawkular.metrics.core.impl.MetricsServiceImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -69,7 +69,7 @@ public class MetricsServiceProducer {
     @PostConstruct
     void init() {
         LOG.info("Initializing metrics service");
-        metricsService = new MetricsServiceCassandra();
+        metricsService = new MetricsServiceImpl();
         Map<String, String> options = new HashMap<>();
         options.put("cqlport", cqlPort);
         options.put("nodes", nodes);

diff --git a/...dra/AvailabilityBucketedOutputMapper.java → ...mpl/AvailabilityBucketedOutputMapper.java b/...dra/AvailabilityBucketedOutputMapper.java → ...mpl/AvailabilityBucketedOutputMapper.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.core.impl.cassandra;
+package org.hawkular.metrics.core.impl;
 
 import static org.hawkular.metrics.core.api.AvailabilityType.DOWN;
 

diff --git a/.../impl/cassandra/BucketedOutputMapper.java → ...trics/core/impl/BucketedOutputMapper.java b/.../impl/cassandra/BucketedOutputMapper.java → ...trics/core/impl/BucketedOutputMapper.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.core.impl.cassandra;
+package org.hawkular.metrics.core.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/...core/impl/cassandra/CassandraSession.java → ...r/metrics/core/impl/CassandraSession.java b/...core/impl/cassandra/CassandraSession.java → ...r/metrics/core/impl/CassandraSession.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.core.impl.cassandra;
+package org.hawkular.metrics.core.impl;
 
 import com.datastax.driver.core.Cluster;
 import com.datastax.driver.core.Session;
@@ -44,7 +44,7 @@
  */
 public class CassandraSession {
 
-    private static final Logger logger = LoggerFactory.getLogger(MetricsServiceCassandra.class);
+    private static final Logger logger = LoggerFactory.getLogger(MetricsServiceImpl.class);
 
     private static final String CASSANDRA_STORAGE_SERVICE = "org.apache.cassandra.db:type=StorageService";
 

diff --git a/...trics/core/impl/cassandra/ComputeTTL.java → ...awkular/metrics/core/impl/ComputeTTL.java b/...trics/core/impl/cassandra/ComputeTTL.java → ...awkular/metrics/core/impl/ComputeTTL.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.core.impl.cassandra;
+package org.hawkular.metrics.core.impl;
 
 import java.util.List;
 

diff --git a/...s/core/impl/cassandra/CountersMapper.java → ...lar/metrics/core/impl/CountersMapper.java b/...s/core/impl/cassandra/CountersMapper.java → ...lar/metrics/core/impl/CountersMapper.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.core.impl.cassandra;
+package org.hawkular.metrics.core.impl;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...trics/core/impl/cassandra/DataAccess.java → ...awkular/metrics/core/impl/DataAccess.java b/...trics/core/impl/cassandra/DataAccess.java → ...awkular/metrics/core/impl/DataAccess.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.core.impl.cassandra;
+package org.hawkular.metrics.core.impl;
 
 import java.util.Collection;
 import java.util.List;

diff --git a/...s/core/impl/cassandra/DataAccessImpl.java → ...lar/metrics/core/impl/DataAccessImpl.java b/...s/core/impl/cassandra/DataAccessImpl.java → ...lar/metrics/core/impl/DataAccessImpl.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.core.impl.cassandra;
+package org.hawkular.metrics.core.impl;
 
 import static java.util.stream.Collectors.toMap;
 

diff --git a/.../impl/cassandra/DataRetentionsMapper.java → ...trics/core/impl/DataRetentionsMapper.java b/.../impl/cassandra/DataRetentionsMapper.java → ...trics/core/impl/DataRetentionsMapper.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.core.impl.cassandra;
+package org.hawkular.metrics.core.impl;
 
 import java.util.HashSet;
 import java.util.Set;

diff --git a/...etrics/core/impl/cassandra/Functions.java → ...hawkular/metrics/core/impl/Functions.java b/...etrics/core/impl/cassandra/Functions.java → ...hawkular/metrics/core/impl/Functions.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.core.impl.cassandra;
+package org.hawkular.metrics.core.impl;
 
 import static java.util.stream.Collectors.toList;
 

diff --git a/...rics/core/impl/cassandra/GaugeAndTTL.java → ...wkular/metrics/core/impl/GaugeAndTTL.java b/...rics/core/impl/cassandra/GaugeAndTTL.java → ...wkular/metrics/core/impl/GaugeAndTTL.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.core.impl.cassandra;
+package org.hawkular.metrics.core.impl;
 
 import org.hawkular.metrics.core.api.Gauge;
 

diff --git a/.../cassandra/GaugeBucketedOutputMapper.java → .../core/impl/GaugeBucketedOutputMapper.java b/.../cassandra/GaugeBucketedOutputMapper.java → .../core/impl/GaugeBucketedOutputMapper.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.core.impl.cassandra;
+package org.hawkular.metrics.core.impl;
 
 import java.util.List;
 import java.util.ListIterator;
@@ -29,7 +29,7 @@
 import org.hawkular.metrics.core.api.GaugeData;
 
 /**
- * A {@link org.hawkular.metrics.core.impl.cassandra.BucketedOutputMapper} for {@link org.hawkular.metrics.core.api
+ * A {@link BucketedOutputMapper} for {@link org.hawkular.metrics.core.api
  * .Gauge}.
  *
  * @author Thomas Segismont

diff --git a/.../core/impl/cassandra/GaugeDataMapper.java → ...ar/metrics/core/impl/GaugeDataMapper.java b/.../core/impl/cassandra/GaugeDataMapper.java → ...ar/metrics/core/impl/GaugeDataMapper.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.core.impl.cassandra;
+package org.hawkular.metrics.core.impl;
 
 import static java.util.stream.Collectors.toList;
 

diff --git a/...re/impl/cassandra/MetricsIndexMapper.java → ...metrics/core/impl/MetricsIndexMapper.java b/...re/impl/cassandra/MetricsIndexMapper.java → ...metrics/core/impl/MetricsIndexMapper.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.core.impl.cassandra;
+package org.hawkular.metrics.core.impl;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...pl/cassandra/MetricsServiceCassandra.java → ...metrics/core/impl/MetricsServiceImpl.java b/...pl/cassandra/MetricsServiceCassandra.java → ...metrics/core/impl/MetricsServiceImpl.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.core.impl.cassandra;
+package org.hawkular.metrics.core.impl;
 
 import static org.joda.time.Hours.hours;
 
@@ -79,8 +79,8 @@
 /**
  * @author John Sanda
  */
-public class MetricsServiceCassandra implements MetricsService {
-    private static final Logger logger = LoggerFactory.getLogger(MetricsServiceCassandra.class);
+public class MetricsServiceImpl implements MetricsService {
+    private static final Logger logger = LoggerFactory.getLogger(MetricsServiceImpl.class);
 
     public static final String REQUEST_LIMIT = "hawkular.metrics.request.limit";
 
@@ -146,7 +146,7 @@ public int hashCode() {
      */
     private final Map<DataRetentionKey, Integer> dataRetentions = new ConcurrentHashMap<>();
 
-    public MetricsServiceCassandra() {
+    public MetricsServiceImpl() {
         this.state = State.STARTING;
     }
 

diff --git a/...ar/metrics/core/impl/cassandra/Order.java → ...org/hawkular/metrics/core/impl/Order.java b/...ar/metrics/core/impl/cassandra/Order.java → ...org/hawkular/metrics/core/impl/Order.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.core.impl.cassandra;
+package org.hawkular.metrics.core.impl;
 
 /**
  * @author John Sanda

diff --git a/...ar/metrics/core/impl/cassandra/Table.java → ...org/hawkular/metrics/core/impl/Table.java b/...ar/metrics/core/impl/cassandra/Table.java → ...org/hawkular/metrics/core/impl/Table.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.core.impl.cassandra;
+package org.hawkular.metrics.core.impl;
 
 /**
  * @author John Sanda

diff --git a/...l/cassandra/TaggedAvailabilityMapper.java → ...s/core/impl/TaggedAvailabilityMapper.java b/...l/cassandra/TaggedAvailabilityMapper.java → ...s/core/impl/TaggedAvailabilityMapper.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.core.impl.cassandra;
+package org.hawkular.metrics.core.impl;
 
 import java.util.HashMap;
 import java.util.LinkedHashSet;

diff --git a/...impl/cassandra/TaggedGaugeDataMapper.java → ...rics/core/impl/TaggedGaugeDataMapper.java b/...impl/cassandra/TaggedGaugeDataMapper.java → ...rics/core/impl/TaggedGaugeDataMapper.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.core.impl.cassandra;
+package org.hawkular.metrics.core.impl;
 
 import java.util.HashMap;
 import java.util.LinkedHashSet;

diff --git a/...s/core/impl/cassandra/VoidSubscriber.java → ...lar/metrics/core/impl/VoidSubscriber.java b/...s/core/impl/cassandra/VoidSubscriber.java → ...lar/metrics/core/impl/VoidSubscriber.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.core.impl.cassandra;
+package org.hawkular.metrics.core.impl;
 
 import rx.Subscriber;
 

diff --git a/...a/AvailabilityBucketDataPointMatcher.java → ...l/AvailabilityBucketDataPointMatcher.java b/...a/AvailabilityBucketDataPointMatcher.java → ...l/AvailabilityBucketDataPointMatcher.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.core.impl.cassandra;
+package org.hawkular.metrics.core.impl;
 
 import org.hamcrest.Description;
 import org.hamcrest.Factory;

diff --git a/...AvailabilityBucketedOutputMapperTest.java → ...AvailabilityBucketedOutputMapperTest.java b/...AvailabilityBucketedOutputMapperTest.java → ...AvailabilityBucketedOutputMapperTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.core.impl.cassandra;
+package org.hawkular.metrics.core.impl;
 
 import static org.hawkular.metrics.core.api.AvailabilityType.DOWN;
 import static org.hawkular.metrics.core.api.AvailabilityType.UP;
-import static org.hawkular.metrics.core.impl.cassandra.AvailabilityBucketDataPointMatcher
+import static org.hawkular.metrics.core.impl.AvailabilityBucketDataPointMatcher
         .matchesAvailabilityBucketDataPoint;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;

diff --git a/.../core/impl/cassandra/DataAccessITest.java → ...ar/metrics/core/impl/DataAccessITest.java b/.../core/impl/cassandra/DataAccessITest.java → ...ar/metrics/core/impl/DataAccessITest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.core.impl.cassandra;
+package org.hawkular.metrics.core.impl;
 
 import static java.util.Arrays.asList;
-import static org.hawkular.metrics.core.impl.cassandra.MetricsServiceCassandra.DEFAULT_TTL;
+import static org.hawkular.metrics.core.impl.MetricsServiceImpl.DEFAULT_TTL;
 import static org.joda.time.DateTime.now;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;

diff --git a/.../impl/cassandra/DelegatingDataAccess.java → ...trics/core/impl/DelegatingDataAccess.java b/.../impl/cassandra/DelegatingDataAccess.java → ...trics/core/impl/DelegatingDataAccess.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.core.impl.cassandra;
+package org.hawkular.metrics.core.impl;
 
 import java.util.Collection;
 import java.util.List;
@@ -23,7 +23,6 @@
 
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.ResultSetFuture;
-
 import org.hawkular.metrics.core.api.Availability;
 import org.hawkular.metrics.core.api.AvailabilityData;
 import org.hawkular.metrics.core.api.Counter;
@@ -36,7 +35,6 @@
 import org.hawkular.metrics.core.api.MetricType;
 import org.hawkular.metrics.core.api.Retention;
 import org.hawkular.metrics.core.api.Tenant;
-
 import rx.Observable;
 
 /**

diff --git a/...ics/core/impl/cassandra/MetricsITest.java → ...kular/metrics/core/impl/MetricsITest.java b/...ics/core/impl/cassandra/MetricsITest.java → ...kular/metrics/core/impl/MetricsITest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.core.impl.cassandra;
+package org.hawkular.metrics.core.impl;
 
 import static org.joda.time.DateTime.now;
 

diff --git a/...ssandra/MetricsServiceCassandraITest.java → ...etrics/core/impl/MetricsServiceITest.java b/...ssandra/MetricsServiceCassandraITest.java → ...etrics/core/impl/MetricsServiceITest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.core.impl.cassandra;
+package org.hawkular.metrics.core.impl;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyMap;
@@ -25,7 +25,7 @@
 import static org.hawkular.metrics.core.api.Metric.DPART;
 import static org.hawkular.metrics.core.api.MetricType.AVAILABILITY;
 import static org.hawkular.metrics.core.api.MetricType.GAUGE;
-import static org.hawkular.metrics.core.impl.cassandra.MetricsServiceCassandra.DEFAULT_TTL;
+import static org.hawkular.metrics.core.impl.MetricsServiceImpl.DEFAULT_TTL;
 import static org.joda.time.DateTime.now;
 import static org.joda.time.Days.days;
 import static org.joda.time.Hours.hours;
@@ -77,9 +77,9 @@
 /**
  * @author John Sanda
  */
-public class MetricsServiceCassandraITest extends MetricsITest {
+public class MetricsServiceITest extends MetricsITest {
 
-    private MetricsServiceCassandra metricsService;
+    private MetricsServiceImpl metricsService;
 
     private DataAccess dataAccess;
 
@@ -90,7 +90,7 @@ public class MetricsServiceCassandraITest extends MetricsITest {
     @BeforeClass
     public void initClass() {
         initSession();
-        metricsService = new MetricsServiceCassandra();
+        metricsService = new MetricsServiceImpl();
         metricsService.startUp(session);
         dataAccess = metricsService.getDataAccess();