Details
diff --git a/usage/src/main/java/com/ning/billing/usage/timeline/metrics/MetricAndId.java b/usage/src/main/java/com/ning/billing/usage/timeline/metrics/MetricAndId.java
new file mode 100644
index 0000000..760eaf1
--- /dev/null
+++ b/usage/src/main/java/com/ning/billing/usage/timeline/metrics/MetricAndId.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2010-2012 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.usage.timeline.metrics;
+
+public class MetricAndId {
+
+ private final String metric;
+ private final int metricId;
+
+ public MetricAndId(final String metric, final int metricId) {
+ this.metric = metric;
+ this.metricId = metricId;
+ }
+
+ public String getMetric() {
+ return metric;
+ }
+
+ public int getMetricId() {
+ return metricId;
+ }
+
+ @Override
+ public String toString() {
+ final StringBuilder sb = new StringBuilder();
+ sb.append("MetricAndId");
+ sb.append("{metric='").append(metric).append('\'');
+ sb.append(", metricId=").append(metricId);
+ sb.append('}');
+ return sb.toString();
+ }
+
+ @Override
+ public boolean equals(final Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ final MetricAndId that = (MetricAndId) o;
+
+ if (metricId != that.metricId) {
+ return false;
+ }
+ if (metric != null ? !metric.equals(that.metric) : that.metric != null) {
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = metric != null ? metric.hashCode() : 0;
+ result = 31 * result + metricId;
+ return result;
+ }
+}
diff --git a/usage/src/main/java/com/ning/billing/usage/timeline/metrics/MetricAndIdMapper.java b/usage/src/main/java/com/ning/billing/usage/timeline/metrics/MetricAndIdMapper.java
new file mode 100644
index 0000000..4c457c2
--- /dev/null
+++ b/usage/src/main/java/com/ning/billing/usage/timeline/metrics/MetricAndIdMapper.java
@@ -0,0 +1,15 @@
+package com.ning.billing.usage.timeline.metrics;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import org.skife.jdbi.v2.StatementContext;
+import org.skife.jdbi.v2.tweak.ResultSetMapper;
+
+public class MetricAndIdMapper implements ResultSetMapper<MetricAndId> {
+
+ @Override
+ public MetricAndId map(final int index, final ResultSet r, final StatementContext ctx) throws SQLException {
+ return new MetricAndId(r.getString("sample_kind"), r.getInt("sample_kind_id"));
+ }
+}
diff --git a/usage/src/main/java/com/ning/billing/usage/timeline/metrics/SamplesForMetricAndSource.java b/usage/src/main/java/com/ning/billing/usage/timeline/metrics/SamplesForMetricAndSource.java
new file mode 100644
index 0000000..acb0cb7
--- /dev/null
+++ b/usage/src/main/java/com/ning/billing/usage/timeline/metrics/SamplesForMetricAndSource.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2010-2012 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.usage.timeline.metrics;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class SamplesForMetricAndSource {
+
+ @JsonProperty
+ private final String sourceName;
+
+ @JsonProperty
+ private final String eventCategory;
+
+ @JsonProperty
+ private final String metric;
+
+ @JsonProperty
+ private final String samples;
+
+ @JsonCreator
+ public SamplesForMetricAndSource(@JsonProperty("sourceName") final String sourceName, @JsonProperty("eventCategory") final String eventCategory,
+ @JsonProperty("metric") final String metric, @JsonProperty("samples") final String samples) {
+ this.sourceName = sourceName;
+ this.eventCategory = eventCategory;
+ this.metric = metric;
+ this.samples = samples;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public String getEventCategory() {
+ return eventCategory;
+ }
+
+ public String getMetric() {
+ return metric;
+ }
+
+ public String getSamples() {
+ return samples;
+ }
+
+ @Override
+ public String toString() {
+ final StringBuilder sb = new StringBuilder();
+ sb.append("SamplesForMetricAndSource");
+ sb.append("{eventCategory='").append(eventCategory).append('\'');
+ sb.append(", sourceName='").append(sourceName).append('\'');
+ sb.append(", metric='").append(metric).append('\'');
+ sb.append(", samples='").append(samples).append('\'');
+ sb.append('}');
+ return sb.toString();
+ }
+
+ @Override
+ public boolean equals(final Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ final SamplesForMetricAndSource that = (SamplesForMetricAndSource) o;
+
+ if (!eventCategory.equals(that.eventCategory)) {
+ return false;
+ }
+ if (!sourceName.equals(that.sourceName)) {
+ return false;
+ }
+ if (!metric.equals(that.metric)) {
+ return false;
+ }
+ if (!samples.equals(that.samples)) {
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = sourceName.hashCode();
+ result = 31 * result + eventCategory.hashCode();
+ result = 31 * result + metric.hashCode();
+ result = 31 * result + samples.hashCode();
+ return result;
+ }
+}
