Merge pull request #41 from qcri-social/staging

Merging staging to master (Release 2.0)

aidr-analytics/pom.xml

@@ -17,12 +17,12 @@
 			<artifactId>aidr-common</artifactId>
 			<version>1.0</version>
 		</dependency>
-		<dependency>
+		<!-- dependency>
 			<groupId>qa.qcri.aidr.output</groupId>
 			<artifactId>aidr-output</artifactId>
 			<version>1.0</version>
 			<type>jar</type>
-		</dependency>
+		</dependency -->
 
 		<!-- Web dependencies -->
 

aidr-analytics/src/main/java/qa/qcri/aidr/analysis/api/ApplicationConfig.java

@@ -14,7 +14,7 @@
  *
  * @author Imran
  */
-@javax.ws.rs.ApplicationPath("rest")
+@javax.ws.rs.ApplicationPath("/rest/analytics/")
 public class ApplicationConfig extends Application {
 
     @Override

aidr-analytics/src/main/java/qa/qcri/aidr/analysis/api/GetConfidenceStatistics.java

@@ -20,7 +20,6 @@
 
 import qa.qcri.aidr.analysis.facade.ConfidenceStatisticsResourceFacade;
 import qa.qcri.aidr.common.code.DateFormatConfig;
-import qa.qcri.aidr.output.getdata.ChannelBufferManager;
 
 
 /**
@@ -31,7 +30,7 @@
  */
 
 @Path("/confData/")
-public class GetConfidenceStatistics extends GetStatistics implements ServletContextListener {
+public class GetConfidenceStatistics implements ServletContextListener {
 
 	// Debugging
 	private static Logger logger = Logger.getLogger(GetConfidenceStatistics.class);
@@ -64,25 +63,6 @@ public Response ping() {
 		return Response.ok(obj).build();
 	}
 
-
-	@GET
-	@Path("/manage/restart/{passcode}")
-	@Produces("application/json")
-	public Response restartAnalyticsService(@PathParam("passcode") String passcode) {
-		logger.info("Request received");
-		if (passcode.equals("sysadmin2013")) {
-			if (masterCBManager != null) {
-				masterCBManager.close();
-			}
-			masterCBManager = new ChannelBufferManager();
-			masterCBManager.initiateChannelBufferManager(CHANNEL_REG_EX);
-			logger.info("aidr-output analytics service restarted...");
-			final String statusStr = "{\"aidr-output analytics ConfidenceStats service\":\"RESTARTED\"}";
-			return Response.ok(statusStr).build();
-		}
-		return Response.ok(new String("{\"password\":\"invalid\"}")).build();
-	}
-
 	@Override
 	public void contextDestroyed(ServletContextEvent arg0) {
 		// TODO Auto-generated method stub

aidr-analytics/src/main/java/qa/qcri/aidr/analysis/api/GetStatistics.java

@@ -1,6 +1,5 @@
 package qa.qcri.aidr.analysis.api;
 
-import qa.qcri.aidr.output.getdata.ChannelBufferManager;
 
 
 public abstract class GetStatistics {
@@ -9,6 +8,4 @@ public abstract class GetStatistics {
 	public static final String CHANNEL_REG_EX = "aidr_predict.*";
 	public static final String CHANNEL_PREFIX_STRING = "aidr_predict.";
 
-	public volatile static ChannelBufferManager masterCBManager = null; 			// managing buffers for each publishing channel
-
 }

aidr-analytics/src/main/java/qa/qcri/aidr/analysis/api/GetTagDataStatistics.java

@@ -2,6 +2,7 @@
 package qa.qcri.aidr.analysis.api;
 
 
+import javax.ejb.EJB;
 import javax.json.Json;
 import javax.json.JsonObject;
 import javax.servlet.ServletContextEvent;
@@ -19,19 +20,62 @@
 
 import org.apache.log4j.Logger;
 
-
+import qa.qcri.aidr.analysis.facade.TagDataStatisticsResourceFacade;
 import qa.qcri.aidr.analysis.service.GetTagDataStatisticsService;
 
 /** 
  * This is the REST API interface for accessing the aidr_analytics DB's tag_data entity. 
  */
 
-@Path("/tagData/")
-public class GetTagDataStatistics extends GetStatistics implements ServletContextListener {
+/**
+ * @author koushik
+ *
+ */
+@Path("/tagdata/")
+public class GetTagDataStatistics implements ServletContextListener {
 
 	// Debugging
 	private static Logger logger = Logger.getLogger(GetTagDataStatistics.class);
 
+	@EJB
+	private GetTagDataStatisticsService tagDataService;
+
+
+	/**
+	 * @param crisisCode
+	 * @param granularity
+	 * @param startTime
+	 * @return Tag counts for individual attributes of a crisis, only for the specified granularity and since 'startTime'
+	 */
+	@GET
+	@Path("/getlabelsum/{crisisCode}/{granularity}")
+	@Produces(MediaType.APPLICATION_JSON)
+	public Response getTagCountSumForAllAttributesFromTime(@PathParam("crisisCode") String crisisCode,
+			@PathParam("granularity") Long granularity,
+			@DefaultValue("0") @QueryParam("startTime") Long startTime) {
+
+		JSONObject json = tagDataService.getTagCountSumForAllAttributesFromTime(crisisCode, granularity, startTime);
+		return Response.ok(json.toJSONString()).build();
+	}
+
+
+
+	/**
+	 * @param crisisCode
+	 * @param startTime
+	 * @return Tag counts over all attributes for a crisis, sorted by granularity levels
+	 */
+	@GET
+	@Path("/getlabelsum/{crisisCode}")
+	@Produces(MediaType.APPLICATION_JSON)
+	public Response getTagCountSumForAllGranularitiesFromTime(@PathParam("crisisCode") String crisisCode,
+			@DefaultValue("0") @QueryParam("startTime") Long startTime) {
+
+		JSONObject json = tagDataService.getTagCountSumByGranularity(crisisCode, startTime);
+		return Response.ok(json.toJSONString()).build();
+	}
+
+
 	/**
 	 * 
 	 * @param crisisCode
@@ -41,14 +85,14 @@ public class GetTagDataStatistics extends GetStatistics implements ServletContex
 	 * @return Count sum per label from startTime to current time at the given granularity, for crisisCode and attributeCode
 	 */
 	@GET
-	@Path("/getLabelSum/{crisisCode}/{classifierCode}/{granularity}")
+	@Path("/getlabelsum/{crisisCode}/{attributeCode}/{granularity}")
 	@Produces(MediaType.APPLICATION_JSON)
 	public Response getTagCountSumFromTime(@PathParam("crisisCode") String crisisCode,
 			@PathParam("attributeCode") String attributeCode,
 			@PathParam("granularity") Long granularity,
 			@DefaultValue("0") @QueryParam("startTime") Long startTime) {
 
-		JSONObject json = new GetTagDataStatisticsService().getTagCountSumFromTime(crisisCode, attributeCode, granularity, startTime);
+		JSONObject json = tagDataService.getTagCountSumFromTime(crisisCode, attributeCode, granularity, startTime);
 		return Response.ok(json.toJSONString()).build();
 	}
 
@@ -61,14 +105,14 @@ public Response getTagCountSumFromTime(@PathParam("crisisCode") String crisisCod
 	 * @return Count per label in the specified time window at the given granularity, for crisisCode and attributeCode
 	 */
 	@GET
-	@Path("/getLabelCount/{crisisCode}/{attributeCode}/{granularity}")
+	@Path("/getlabelcount/{crisisCode}/{attributeCode}/{granularity}")
 	@Produces(MediaType.APPLICATION_JSON)
 	public Response getTagCountInTimeWindow(@PathParam("crisisCode") String crisisCode,
 			@PathParam("attributeCode") String attributeCode,
 			@PathParam("granularity") Long granularity,
 			@DefaultValue("0") @QueryParam("startTime") Long startTime) {
 
-		JSONObject json = new GetTagDataStatisticsService().getTagCountInTimeWindow(crisisCode, attributeCode, granularity, startTime);
+		JSONObject json = tagDataService.getTagCountInTimeWindow(crisisCode, attributeCode, granularity, startTime);
 		return Response.ok(json.toJSONString()).build();
 	}
 
@@ -82,7 +126,7 @@ public Response getTagCountInTimeWindow(@PathParam("crisisCode") String crisisCo
 	 * @return Time series data for each label in the interval [startTime, endTime] at the given granularity, for crisisCode and attributeCode
 	 */
 	@GET
-	@Path("/getLabelTimeSeries/{crisisCode}/{attributeCode}/{granularity}")
+	@Path("/getlabeltimeseries/{crisisCode}/{attributeCode}/{granularity}")
 	@Produces(MediaType.APPLICATION_JSON)
 	public Response getTagCountTimeSeries(@PathParam("crisisCode") String crisisCode,
 			@PathParam("attributeCode") String attributeCode,
@@ -93,7 +137,7 @@ public Response getTagCountTimeSeries(@PathParam("crisisCode") String crisisCode
 		if (null == endTime || endTime < startTime) {
 			endTime = System.currentTimeMillis();
 		}
-		JSONObject json = new GetTagDataStatisticsService().getTagCountTimeSeries(crisisCode, attributeCode, granularity, startTime, endTime);
+		JSONObject json = tagDataService.getTagCountTimeSeries(crisisCode, attributeCode, granularity, startTime, endTime);
 		return Response.ok(json.toJSONString()).build();
 	}
 
@@ -107,15 +151,15 @@ public Response getTagCountTimeSeries(@PathParam("crisisCode") String crisisCode
 	 * @return Count sum for each label in the interval [startTime, endTime] at the given granularity, for crisisCode and attributeCode
 	 */
 	@GET
-	@Path("/getIntervalLabelSum/{crisisCode}/{attributeCode}/{granularity}")
+	@Path("/getintervallabelsum/{crisisCode}/{attributeCode}/{granularity}")
 	@Produces(MediaType.APPLICATION_JSON)
 	public Response getTagCountSumInInterval(@PathParam("crisisCode") String crisisCode,
 			@PathParam("attributeCode") String attributeCode,
 			@PathParam("granularity") Long granularity,
 			@DefaultValue("0") @QueryParam("startTime") Long startTime,
 			@QueryParam("endTime") Long endTime) {
 
-		JSONObject json = new GetTagDataStatisticsService().getTagCountSumInInterval(crisisCode, attributeCode, granularity, startTime, endTime);
+		JSONObject json = tagDataService.getTagCountSumInInterval(crisisCode, attributeCode, granularity, startTime, endTime);
 		return Response.ok(json.toJSONString()).build();
 	}
 
@@ -130,14 +174,14 @@ public Response getTagCountSumInInterval(@PathParam("crisisCode") String crisisC
 	 * @return The count for a label in the specified time window at the given granularity, for crisisCode and attributeCode
 	 */
 	@GET
-	@Path("/getOneLabelData/{crisisCode}/{attributeCode}/{labelCode}/{granularity}/{startTime}")
+	@Path("/getonelabeldata/{crisisCode}/{attributeCode}/{labelCode}/{granularity}/{startTime}")
 	@Produces(MediaType.APPLICATION_JSON)
 	public Response getSingleItem(@PathParam("crisisCode") String crisisCode,
 			@PathParam("attributeCode") String attributeCode,
 			@PathParam("labelCode") String labelCode, 
 			@PathParam("granularity") Long granularity,
 			@PathParam("startTime") Long startTime) {
-		JSONObject json = new GetTagDataStatisticsService().getSingleItem(crisisCode, attributeCode, labelCode, granularity, startTime);
+		JSONObject json = tagDataService.getSingleItem(crisisCode, attributeCode, labelCode, granularity, startTime);
 		return Response.ok(json.toJSONString()).build();
 	}