[Hawkular-commits] [hawkular/hawkular-metrics] e86199: HWKMETRICS-212 Eliminate duplicate methods in Metr...

jsanda jsanda at redhat.com
Wed Aug 26 11:58:26 EDT 2015 

  Branch: refs/heads/master
  Home:   https://github.com/hawkular/hawkular-metrics
  Commit: e8619964479ad226a9dfe8535ad083925276568f
      https://github.com/hawkular/hawkular-metrics/commit/e8619964479ad226a9dfe8535ad083925276568f
  Author: Thomas Segismont <tsegismo at redhat.com>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

  Changed paths:
    M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/util/ApiUtils.java
    M api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/AvailabilityHandler.java
    M api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/CounterHandler.java
    M api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/GaugeHandler.java
    M api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java
    M api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/param/MetricTypeConverter.java
    M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/AvailabilityHandler.java
    M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/CounterHandler.java
    M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/GaugeHandler.java
    M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.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/param/MetricTypeConverter.java
    M api/metrics-api-jaxrs/src/test/java/org/hawkular/metrics/api/jaxrs/param/MetricTypeConverterTest.java
    R core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Counter.java
    M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Metric.java
    M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricId.java
    M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricType.java
    M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricsService.java
    M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Retention.java
    M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Tenant.java
    R core/metrics-core-api/src/test/java/org/hawkular/metrics/core/api/MetricTypeTest.java
    R core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/CountersMapper.java
    M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/DataAccess.java
    M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/DataAccessImpl.java
    M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/DataRetentionsMapper.java
    M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/Functions.java
    M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/GenerateRate.java
    M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsServiceImpl.java
    M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/TaggedAvailabilityDataPointMapper.java
    M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/TaggedGaugeDataPointMapper.java
    A core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/transformers/MetricsIndexRowTransformer.java
    M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/transformers/TagsIndexRowTransformer.java
    M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/DataAccessITest.java
    M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/DelegatingDataAccess.java
    M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/GenerateRateITest.java
    M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/MetricsServiceITest.java
    M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/RatesITest.java
    M rest-tests/src/test/groovy/org/hawkular/metrics/rest/CassandraBackendITest.groovy

  Log Message:
  -----------
  HWKMETRICS-212 Eliminate duplicate methods in MetricsService

Made MetricType and MetricId generic. As Enums cannot be generic,
I had to translate MetricType to the old style type safe enum.

Replaced all #addXXXData and #findXXXData with generic #addDataPoints
and #findDataPoints methods.

Removed calls to deprecated methods in core-impl
Remove unused Counter related classes


  Commit: e145d970c780388ed1e2243ab471d3e11fd9005e
      https://github.com/hawkular/hawkular-metrics/commit/e145d970c780388ed1e2243ab471d3e11fd9005e
  Author: Thomas Segismont <tsegismo at redhat.com>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

  Changed paths:
    M api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/AvailabilityHandler.java
    M api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/CounterHandler.java
    M api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/GaugeHandler.java
    M api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java
    M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/AvailabilityHandler.java
    M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/CounterHandler.java
    M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/GaugeHandler.java
    M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.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/GenerateRate.java
    M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsServiceImpl.java
    M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/GenerateRateITest.java
    M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/MetricsServiceITest.java
    M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/RatesITest.java

  Log Message:
  -----------
  Enforce metric type in #addDataPoints


  Commit: 4bb1f5e26510c755e06287fa1e980c7c137ac176
      https://github.com/hawkular/hawkular-metrics/commit/4bb1f5e26510c755e06287fa1e980c7c137ac176
  Author: Thomas Segismont <tsegismo at redhat.com>
  Date:   2015-08-26 (Wed, 26 Aug 2015)

  Changed paths:
    M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsServiceImpl.java

  Log Message:
  -----------
  Cache function instances


  Commit: ed8b2c02ee0e7da76665b32d01427f705da5e086
      https://github.com/hawkular/hawkular-metrics/commit/ed8b2c02ee0e7da76665b32d01427f705da5e086
  Author: jsanda <jsanda at redhat.com>
  Date:   2015-08-26 (Wed, 26 Aug 2015)

  Changed paths:
    M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/util/ApiUtils.java
    M api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/AvailabilityHandler.java
    M api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/CounterHandler.java
    M api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/GaugeHandler.java
    M api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java
    M api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/param/MetricTypeConverter.java
    M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/AvailabilityHandler.java
    M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/CounterHandler.java
    M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/GaugeHandler.java
    M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.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/param/MetricTypeConverter.java
    M api/metrics-api-jaxrs/src/test/java/org/hawkular/metrics/api/jaxrs/param/MetricTypeConverterTest.java
    R core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Counter.java
    M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Metric.java
    M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricId.java
    M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricType.java
    M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricsService.java
    M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Retention.java
    M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Tenant.java
    R core/metrics-core-api/src/test/java/org/hawkular/metrics/core/api/MetricTypeTest.java
    R core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/CountersMapper.java
    M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/DataAccess.java
    M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/DataAccessImpl.java
    M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/DataRetentionsMapper.java
    M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/Functions.java
    M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/GenerateRate.java
    M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsServiceImpl.java
    M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/TaggedAvailabilityDataPointMapper.java
    M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/TaggedGaugeDataPointMapper.java
    A core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/transformers/MetricsIndexRowTransformer.java
    M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/transformers/TagsIndexRowTransformer.java
    M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/DataAccessITest.java
    M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/DelegatingDataAccess.java
    M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/GenerateRateITest.java
    M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/MetricsServiceITest.java
    M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/RatesITest.java
    M rest-tests/src/test/groovy/org/hawkular/metrics/rest/CassandraBackendITest.groovy

  Log Message:
  -----------
  Merge pull request #313 from tsegismont/jira/HWKMETRICS-212

HWKMETRICS-212 Eliminate duplicate methods in MetricsService


Compare: https://github.com/hawkular/hawkular-metrics/compare/c39729e3990f...ed8b2c02ee0e

More information about the hawkular-commits mailing list