[Hawkular-commits] [hawkular/hawkular-metrics] c65964: [HWKMETRICS-41] initial refactoring for consistent...

Branch: refs/heads/master Home: https://github.com/hawkular/hawkular-metrics Commit: c65964aa722dd4485c228ec784b159e31099f057 https://github.com/hawkular/hawkular-metrics/commit/c65964aa722dd4485c228... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-03-24 (Tue, 24 Mar 2015) Changed paths: M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/MetricHandler.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/callback/SimpleDataCallback.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/influx/InfluxSeriesHandler.java M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricsService.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/AvailabilityBucketedOutputMapper.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/BucketedOutputMapper.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/DataAccess.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/DataAccessImpl.java A core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/Functions.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/MetricsServiceCassandra.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/NumericBucketedOutputMapper.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/NumericDataMapper.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/cassandra/AvailabilityBucketedOutputMapperTest.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/cassandra/DataAccessITest.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/cassandra/DelegatingDataAccess.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/cassandra/MetricsServiceCassandraITest.java M rest-tests/src/test/groovy/org/hawkular/metrics/rest/CassandraBackendITest.groovy Log Message: ----------- [HWKMETRICS-41] initial refactoring for consistent, non-null return types Commit: 6dd546b25860f223683220219bde98bbab80e515 https://github.com/hawkular/hawkular-metrics/commit/6dd546b25860f22368322... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-03-24 (Tue, 24 Mar 2015) Changed paths: M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/MetricHandler.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/callback/SimpleDataCallback.java Log Message: ----------- [HWKMETRICS-41] refactor response handling I first updated SimpleDataCallback to handle the various return types which include Metric, List, and Map. This resulted in some complicated logic in SimpleDataCallback which involves a lot of type checking. SimplDataCallback is and was brittle because a REST end point could easily break if a new return type is added and SimpleDataCallback is not updated accordingly. I opted for a more functional approach. Commit: 7e65734363faca1003c3cfe912d6ab29b5a7cfc9 https://github.com/hawkular/hawkular-metrics/commit/7e65734363faca1003c3c... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-03-24 (Tue, 24 Mar 2015) Changed paths: M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/MetricsServiceCassandra.java Log Message: ----------- [HWKMETRICS-41] fix merge conflicts from rebase Commit: e0d8cd7426af1f71b1c86ca24f4b94a8269a4680 https://github.com/hawkular/hawkular-metrics/commit/e0d8cd7426af1f71b1c86... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-03-24 (Tue, 24 Mar 2015) Changed paths: M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/MetricHandler.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/TenantsHandler.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/influx/InfluxSeriesHandler.java R core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/MetricUtils.java Log Message: ----------- [HWKMETRICS-41] move functions and response helper methods into new ApiUtils Commit: 9f7a1c7f74fccd00974cd7001d7b2c1432d09a93 https://github.com/hawkular/hawkular-metrics/commit/9f7a1c7f74fccd00974cd... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-03-24 (Tue, 24 Mar 2015) Changed paths: A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/util/ApiUtils.java Log Message: ----------- [HWKMETRICS-41] initial commit for ApiUtils Commit: 2840a07f1e13dc1d7e831a22bd6fe7e27fd8ef58 https://github.com/hawkular/hawkular-metrics/commit/2840a07f1e13dc1d7e831... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-03-24 (Tue, 24 Mar 2015) Changed paths: M rest-tests/src/test/groovy/org/hawkular/metrics/rest/CassandraBackendITest.groovy Log Message: ----------- [HWKMETRICS-41] adding some tests to verify status code when there is no data Commit: e780211b079fa467a2085385088a590ef919150a https://github.com/hawkular/hawkular-metrics/commit/e780211b079fa467a2085... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-03-25 (Wed, 25 Mar 2015) Changed paths: M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/MetricHandler.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/TenantsHandler.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/influx/InfluxSeriesHandler.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/util/ApiUtils.java R core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/AvailabilityDataMapper.java R core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/AvailabilityMetricMapper.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/Functions.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/MetricsServiceCassandra.java R core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/NumericMetricMapper.java R core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/TenantMapper.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/cassandra/DataAccessITest.java Log Message: ----------- [HWKMETRICS-41] remove unused mapper classes, make ApiUtils application scoped Commit: b5f036e24444198e0def060f1c9e398fae008fbc https://github.com/hawkular/hawkular-metrics/commit/b5f036e24444198e0def0... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-03-25 (Wed, 25 Mar 2015) Changed paths: M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/util/ApiUtils.java Log Message: ----------- [HWKMETRICS-41] make ApiUtils static singleton Commit: e5a8f5581c603b285ea04b845a16635d5cc07079 https://github.com/hawkular/hawkular-metrics/commit/e5a8f5581c603b285ea04... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-03-25 (Wed, 25 Mar 2015) Changed paths: M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/MetricHandler.java Log Message: ----------- [HWKMETRICS-41] remove injection of ApiUtils Commit: 5a72f93c8eeaa2e5581edbf495e0d6a42d7701ab https://github.com/hawkular/hawkular-metrics/commit/5a72f93c8eeaa2e5581ed... Author: Thomas Segismont <tsegismont(a)gmail.com&gt; Date: 2015-03-25 (Wed, 25 Mar 2015) Changed paths: M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/MetricHandler.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/TenantsHandler.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/callback/SimpleDataCallback.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/influx/InfluxSeriesHandler.java A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/util/ApiUtils.java M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricsService.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/AvailabilityBucketedOutputMapper.java R core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/AvailabilityDataMapper.java R core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/AvailabilityMetricMapper.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/BucketedOutputMapper.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/DataAccess.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/DataAccessImpl.java A core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/Functions.java R core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/MetricUtils.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/MetricsServiceCassandra.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/NumericBucketedOutputMapper.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/NumericDataMapper.java R core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/NumericMetricMapper.java R core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/TenantMapper.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/cassandra/AvailabilityBucketedOutputMapperTest.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/cassandra/DataAccessITest.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/cassandra/DelegatingDataAccess.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/cassandra/MetricsServiceCassandraITest.java M rest-tests/src/test/groovy/org/hawkular/metrics/rest/CassandraBackendITest.groovy Log Message: ----------- Merge pull request #188 from jsanda/HWKMETRICS-41 Do not return null from core API methods Compare: https://github.com/hawkular/hawkular-metrics/compare/7b5fc00e085c...5a72f...