Details
diff --git a/analytics/src/main/java/com/ning/billing/analytics/setup/AnalyticsModule.java b/analytics/src/main/java/com/ning/billing/analytics/setup/AnalyticsModule.java
index 82433ec..1f4e3c9 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/setup/AnalyticsModule.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/setup/AnalyticsModule.java
@@ -16,14 +16,13 @@
package com.ning.billing.analytics.setup;
-
-import com.google.inject.AbstractModule;
import com.ning.billing.analytics.AnalyticsListener;
import com.ning.billing.analytics.BusinessAccountRecorder;
import com.ning.billing.analytics.BusinessSubscriptionTransitionRecorder;
import com.ning.billing.analytics.BusinessTagRecorder;
import com.ning.billing.analytics.api.AnalyticsService;
import com.ning.billing.analytics.api.DefaultAnalyticsService;
+import com.ning.billing.analytics.api.user.AnalyticsUserApi;
import com.ning.billing.analytics.api.user.DefaultAnalyticsUserApi;
import com.ning.billing.analytics.dao.AnalyticsDao;
import com.ning.billing.analytics.dao.BusinessAccountSqlDao;
@@ -42,7 +41,10 @@ import com.ning.billing.analytics.dao.BusinessSubscriptionTransitionSqlDao;
import com.ning.billing.analytics.dao.BusinessSubscriptionTransitionTagSqlDao;
import com.ning.billing.analytics.dao.DefaultAnalyticsDao;
+import com.google.inject.AbstractModule;
+
public class AnalyticsModule extends AbstractModule {
+
@Override
protected void configure() {
bind(BusinessAccountSqlDao.class).toProvider(new BusinessSqlProvider<BusinessAccountSqlDao>(BusinessAccountSqlDao.class));
@@ -68,5 +70,6 @@ public class AnalyticsModule extends AbstractModule {
bind(AnalyticsService.class).to(DefaultAnalyticsService.class).asEagerSingleton();
bind(DefaultAnalyticsUserApi.class).asEagerSingleton();
+ bind(AnalyticsUserApi.class).to(DefaultAnalyticsUserApi.class).asEagerSingleton();
}
}
diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/TimeSeriesDataJson.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/TimeSeriesDataJson.java
new file mode 100644
index 0000000..cbfbfe5
--- /dev/null
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/TimeSeriesDataJson.java
@@ -0,0 +1,103 @@
+/*
+ * 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.jaxrs.json;
+
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import org.joda.time.LocalDate;
+
+import com.ning.billing.analytics.api.TimeSeriesData;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.base.Function;
+import com.google.common.collect.Collections2;
+import com.google.common.collect.ImmutableList;
+
+public class TimeSeriesDataJson {
+
+ private final List<String> dates;
+ private final List<Double> values;
+
+ @JsonCreator
+ public TimeSeriesDataJson(@JsonProperty("dates") final List<String> dates,
+ @JsonProperty("values") final List<Double> values) {
+ this.dates = dates;
+ this.values = values;
+ }
+
+ public TimeSeriesDataJson(final TimeSeriesData data) {
+ this(ImmutableList.<String>copyOf(Collections2.transform(data.getDates(), new Function<LocalDate, String>() {
+ @Override
+ public String apply(@Nullable final LocalDate input) {
+ if (input == null) {
+ return null;
+ } else {
+ return input.toString();
+ }
+ }
+ })), data.getValues());
+ }
+
+ public List<String> getDates() {
+ return dates;
+ }
+
+ public List<Double> getValues() {
+ return values;
+ }
+
+ @Override
+ public String toString() {
+ final StringBuilder sb = new StringBuilder();
+ sb.append("TimeSeriesDataJson");
+ sb.append("{dates=").append(dates);
+ sb.append(", values=").append(values);
+ 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 TimeSeriesDataJson that = (TimeSeriesDataJson) o;
+
+ if (dates != null ? !dates.equals(that.dates) : that.dates != null) {
+ return false;
+ }
+ if (values != null ? !values.equals(that.values) : that.values != null) {
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = dates != null ? dates.hashCode() : 0;
+ result = 31 * result + (values != null ? values.hashCode() : 0);
+ return result;
+ }
+}
diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/AnalyticsResource.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/AnalyticsResource.java
new file mode 100644
index 0000000..fbc3623
--- /dev/null
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/AnalyticsResource.java
@@ -0,0 +1,53 @@
+/*
+ * 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.jaxrs.resources;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+
+import com.ning.billing.analytics.api.TimeSeriesData;
+import com.ning.billing.analytics.api.user.AnalyticsUserApi;
+import com.ning.billing.jaxrs.json.TimeSeriesDataJson;
+
+import com.google.inject.Singleton;
+
+import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+
+@Singleton
+@Path(JaxrsResource.ANALYTICS_PATH)
+public class AnalyticsResource {
+
+ private final AnalyticsUserApi analyticsUserApi;
+
+ @Inject
+ public AnalyticsResource(final AnalyticsUserApi analyticsUserApi) {
+ this.analyticsUserApi = analyticsUserApi;
+ }
+
+ @GET
+ @Path("/accountsCreatedOverTime")
+ @Produces(APPLICATION_JSON)
+ public Response getAccountsCreatedOverTime() {
+ final TimeSeriesData data = analyticsUserApi.getAccountsCreatedOverTime();
+ final TimeSeriesDataJson json = new TimeSeriesDataJson(data);
+ return Response.status(Status.OK).entity(json).build();
+ }
+}
diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/JaxrsResource.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/JaxrsResource.java
index eeb1034..6e83cc8 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/JaxrsResource.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/JaxrsResource.java
@@ -77,6 +77,9 @@ public interface JaxrsResource {
public static final String ACCOUNTS = "accounts";
public static final String ACCOUNTS_PATH = PREFIX + "/" + ACCOUNTS;
+ public static final String ANALYTICS = "analytics";
+ public static final String ANALYTICS_PATH = PREFIX + "/" + ANALYTICS;
+
public static final String BUNDLES = "bundles";
public static final String BUNDLES_PATH = PREFIX + "/" + BUNDLES;
