Branch: refs/heads/master Home: https://github.com/hawkular/hawkular-metrics Commit: e6237dfa483333ea81f41e7a887c2f2dd23cfca1 https://github.com/hawkular/hawkular-metrics/commit/e6237dfa483333ea81f41... Author: Thomas Segismont <tsegismo(a)redhat.com&gt; Date: 2015-09-09 (Wed, 09 Sep 2015) Changed paths: M api/diff.txt A api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/codehaus/jackson/AvailabilityTypeSerializer.java A api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/codehaus/jackson/MetricTypeDeserializer.java A api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/codehaus/jackson/MetricTypeSerializer.java A api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/fasterxml/jackson/AvailabilityTypeSerializer.java A api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/fasterxml/jackson/MetricTypeDeserializer.java A api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/fasterxml/jackson/MetricTypeSerializer.java M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/Availability.java M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/AvailabilityDataPoint.java M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/Counter.java M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/CounterDataPoint.java M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/Gauge.java M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/GaugeDataPoint.java A api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/MetricDefinition.java A api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/MixedMetricsRequest.java A api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/TagRequest.java A api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/TenantDefinition.java R api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/request/MixedMetricsRequest.java R api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/request/TagRequest.java R api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/request/TenantParam.java 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/exception/mappers/ExceptionMapperUtils.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/handler/TenantsHandler.java R api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/jackson/MetricTypeDeserializer.java R api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/jackson/MetricTypeSerializer.java R api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/request/MetricDefinition.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/exception/mappers/ExceptionMapperUtils.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/handler/TenantsHandler.java R api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/jackson/MetricTypeDeserializer.java R api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/jackson/MetricTypeSerializer.java R api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/request/MetricDefinition.java M rest-tests/src/test/groovy/org/hawkular/metrics/rest/AvailabilityITest.groovy M rest-tests/src/test/groovy/org/hawkular/metrics/rest/CountersITest.groovy M rest-tests/src/test/groovy/org/hawkular/metrics/rest/GaugesITest.groovy M rest-tests/src/test/groovy/org/hawkular/metrics/rest/RESTTest.groovy Log Message: ----------- HWKMETRICS-244 Internal server error when sending malformed availability data points We should only accept data with a valid timestamp and value. This commit consolidates the models: - all model classes (request and response) under the same package for clarity - renamed TenantParam to TenantDefinition because it's both a request and response model - shared MetricDefinition model class - all model classes immutable - use @JsonCreator for deserialization and basic, on-the-fly validation - annotate getters for serialization when it makes sense (filter out empty collections/maps, serializer selection) This commit also solves "HWKMETRICS-126 Data points timestamp defaults to 0" as well (we won't provide a way to use server timestamp). Commit: e309f126b2a7de69d45ddc3eec05232e1902573d https://github.com/hawkular/hawkular-metrics/commit/e309f126b2a7de69d45dd... Author: Thomas Segismont <tsegismo(a)redhat.com&gt; Date: 2015-09-09 (Wed, 09 Sep 2015) Changed paths: M api/diff.txt A api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/codehaus/jackson/MetricTypeKeyDeserializer.java A api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/codehaus/jackson/MetricTypeKeySerializer.java A api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/fasterxml/jackson/MetricTypeKeyDeserializer.java A api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/fasterxml/jackson/MetricTypeKeySerializer.java M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/TenantDefinition.java M api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/TenantsHandler.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/TenantsHandler.java M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Tenant.java M rest-tests/src/test/groovy/org/hawkular/metrics/rest/TenantITest.groovy Log Message: ----------- HWKMETRICS-127 Add back support for specifying data retention with tenant creation Retention settings property name is "retentions" in JSON (a bit shorter than "retentionSettings") Commit: 4cb87bb781ad9a7ca456d942b48e82f228906cf0 https://github.com/hawkular/hawkular-metrics/commit/4cb87bb781ad9a7ca456d... Author: Thomas Segismont <tsegismo(a)redhat.com&gt; Date: 2015-09-09 (Wed, 09 Sep 2015) Changed paths: M rest-tests/src/test/groovy/org/hawkular/metrics/rest/AvailabilityITest.groovy M rest-tests/src/test/groovy/org/hawkular/metrics/rest/CountersITest.groovy M rest-tests/src/test/groovy/org/hawkular/metrics/rest/GaugesITest.groovy M rest-tests/src/test/groovy/org/hawkular/metrics/rest/RESTTest.groovy Log Message: ----------- Side work: factored out duplicated code for large payload checks Commit: b5a34dfb045c90964c2f470d26459ece3cc7b606 https://github.com/hawkular/hawkular-metrics/commit/b5a34dfb045c90964c2f4... Author: Thomas Segismont <tsegismo(a)redhat.com&gt; Date: 2015-09-09 (Wed, 09 Sep 2015) Changed paths: M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/Availability.java M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/AvailabilityDataPoint.java M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/Counter.java M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/CounterDataPoint.java M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/Gauge.java M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/GaugeDataPoint.java M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/MetricDefinition.java M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/TenantDefinition.java Log Message: ----------- Faster equals and hashCode implementations: - avoid unnecessary boxing - avoid unnecessary null checks - compare MetricType with identity operator Also, fixed an equals/hashCode consistency issue in MetricDefinition Commit: 6def66fc34611cbe04372bf9cbadb5d990fd1984 https://github.com/hawkular/hawkular-metrics/commit/6def66fc34611cbe04372... Author: Thomas Segismont <tsegismo(a)redhat.com&gt; Date: 2015-09-09 (Wed, 09 Sep 2015) Changed paths: M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/TenantDefinition.java Log Message: ----------- Use unmodifiableMap, not synchronizedMap Commit: 27a2cb64bc223c7419a1bcb2f11bb1bfcea5633b https://github.com/hawkular/hawkular-metrics/commit/27a2cb64bc223c7419a1b... Author: Thomas Segismont <tsegismo(a)redhat.com&gt; Date: 2015-09-09 (Wed, 09 Sep 2015) Changed paths: M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Tenant.java Log Message: ----------- Use ImmutableMap#of instead of Collections#unmodifiableMap Commit: 1de1f7b4d88b081bcbf1014f22984c859960b7da https://github.com/hawkular/hawkular-metrics/commit/1de1f7b4d88b081bcbf10... Author: Thomas Segismont <tsegismo(a)redhat.com&gt; Date: 2015-09-09 (Wed, 09 Sep 2015) Changed paths: M api/diff.txt M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/TenantDefinition.java Log Message: ----------- Indicate in the API doc that retention settings are expressed in days Commit: 4f48033db4df7f5073d4fbf7516c2f88defe8de6 https://github.com/hawkular/hawkular-metrics/commit/4f48033db4df7f5073d4f... Author: Thomas Segismont <tsegismo(a)redhat.com&gt; Date: 2015-09-09 (Wed, 09 Sep 2015) Changed paths: M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/Availability.java M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/AvailabilityDataPoint.java M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/Counter.java M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/CounterDataPoint.java M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/Gauge.java M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/GaugeDataPoint.java M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/MetricDefinition.java M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/MixedMetricsRequest.java Log Message: ----------- Some doc updates Commit: 67e8eb171a3c2d93bc948b0fad5bad671ab553ab https://github.com/hawkular/hawkular-metrics/commit/67e8eb171a3c2d93bc948... Author: jsanda <jsanda(a)redhat.com&gt; Date: 2015-09-09 (Wed, 09 Sep 2015) Changed paths: M api/diff.txt A api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/codehaus/jackson/AvailabilityTypeSerializer.java A api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/codehaus/jackson/MetricTypeDeserializer.java A api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/codehaus/jackson/MetricTypeKeyDeserializer.java A api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/codehaus/jackson/MetricTypeKeySerializer.java A api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/codehaus/jackson/MetricTypeSerializer.java A api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/fasterxml/jackson/AvailabilityTypeSerializer.java A api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/fasterxml/jackson/MetricTypeDeserializer.java A api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/fasterxml/jackson/MetricTypeKeyDeserializer.java A api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/fasterxml/jackson/MetricTypeKeySerializer.java A api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/fasterxml/jackson/MetricTypeSerializer.java M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/Availability.java M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/AvailabilityDataPoint.java M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/Counter.java M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/CounterDataPoint.java M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/Gauge.java M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/GaugeDataPoint.java A api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/MetricDefinition.java A api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/MixedMetricsRequest.java A api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/TagRequest.java A api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/TenantDefinition.java R api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/request/MixedMetricsRequest.java R api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/request/TagRequest.java R api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/request/TenantParam.java 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/exception/mappers/ExceptionMapperUtils.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/handler/TenantsHandler.java R api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/jackson/MetricTypeDeserializer.java R api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/jackson/MetricTypeSerializer.java R api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/request/MetricDefinition.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/exception/mappers/ExceptionMapperUtils.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/handler/TenantsHandler.java R api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/jackson/MetricTypeDeserializer.java R api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/jackson/MetricTypeSerializer.java R api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/request/MetricDefinition.java M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Tenant.java M rest-tests/src/test/groovy/org/hawkular/metrics/rest/AvailabilityITest.groovy M rest-tests/src/test/groovy/org/hawkular/metrics/rest/CountersITest.groovy M rest-tests/src/test/groovy/org/hawkular/metrics/rest/GaugesITest.groovy M rest-tests/src/test/groovy/org/hawkular/metrics/rest/RESTTest.groovy M rest-tests/src/test/groovy/org/hawkular/metrics/rest/TenantITest.groovy Log Message: ----------- Merge pull request #340 from tsegismont/jira/HWKMETRICS-127 HWKMETRICS-127 Add back support for specifying data retention with tenant creation Compare: https://github.com/hawkular/hawkular-metrics/compare/dcdf030eb82a...67e8e...