added /Subscription/{subscriptionId/UsagePoint and /{usagePointId}

Author: jateeter

src/main/java/org/energyos/espi/common/domain/Routes.java

@@ -124,6 +124,8 @@ public class Routes {
     public static final String BATCH_UPLOAD_MY_DATA = "/espi/1_1/resource/Batch/RetailCustomer/{retailCustomerId}/UsagePoint";
     public static final String BATCH_BULK_MEMBER = "/espi/1_1/resource/Batch/Bulk/{bulkId}";
     public static final String BATCH_SUBSCRIPTION = "/espi/1_1/resource/Batch/Subscription/{subscriptionId}";
+    public static final String BATCH_SUBSCRIPTION_USAGEPOINT = "/espi/1_1/resource/Batch/Subscription/{subscriptionId}/UsagePoint";
+    public static final String BATCH_SUBSCRIPTION_USAGEPOINT_MEMBER = "/espi/1_1/resource/Batch/Subscription/{subscriptionId}/UsagePoint/{usagePointId}";
 
     public static String buildDataCustodianRESTUsagePointCollection(String retailCustomerHashedId) {
         return DATA_CUSTODIAN_REST_USAGE_POINT_COLLECTION.replace("{retailCustomerId}", retailCustomerHashedId);

src/main/java/org/energyos/espi/common/service/ExportService.java

@@ -405,4 +405,21 @@ void exportUsagePointFull(Long subscriptionId, Long usagePointId, Long RetailCus
 	 */
 	public void exportBatchSubscription(Long subscriptionId, OutputStream outputStream, ExportFilter exportFilter) throws IOException;
 
+	/**
+	 * @param subscriptionId
+	 * @param outputStream
+	 * @param exportFilter
+	 * @throws IOException
+	 */
+	public void exportBatchSubscriptionUsagePoint(Long subscriptionId, OutputStream outputStream, ExportFilter exportFilter) throws IOException;
+	
+	/**
+	 * @param subscriptionId
+	 * @param usagePointId
+	 * @param outputStream
+	 * @param exportFilter
+	 * @throws IOException
+	 */
+	public void exportBatchSubscriptionUsagePoint(Long subscriptionId, Long usagePointId, OutputStream outputStream, ExportFilter exportFilter) throws IOException;
+	
 }

src/main/java/org/energyos/espi/common/service/impl/ExportServiceImpl.java

@@ -674,6 +674,33 @@ public void exportBatchSubscription(Long subscriptionId,
 				usagePointIdList, UsagePoint.class), stream, exportFilter,
 				hrefFragment);
 	}
+	
+	@Override
+	public void exportBatchSubscriptionUsagePoint(Long subscriptionId,
+			OutputStream stream, ExportFilter exportFilter) throws IOException {
+		String hrefFragment = "/Batch/Subscription/" + subscriptionId + "/UsagePoint";
+		// first find all the usagePointIds this subscription is related to
+		List<Long> usagePointIdList = subscriptionService
+				.findUsagePointIds(subscriptionId);
+		exportEntriesFull(subscriptionId, resourceService.findEntryTypeIterator(
+				usagePointIdList, UsagePoint.class), stream, exportFilter,
+				hrefFragment);
+	}
+
+	@Override
+	public void exportBatchSubscriptionUsagePoint(Long subscriptionId, Long usagePointId,
+			OutputStream stream, ExportFilter exportFilter) throws IOException {
+		String hrefFragment = "/Batch/Subscription/" + subscriptionId + "/UsagePoint/" + usagePointId;
+		List<Long> usagePointIdList = new ArrayList<Long> ();
+		List<Long> temp = subscriptionService
+				.findUsagePointIds(subscriptionId);
+		if (temp.contains(usagePointId)) {
+		     usagePointIdList.add(usagePointId);
+		}
+		exportEntriesFull(subscriptionId, resourceService.findEntryTypeIterator(
+				usagePointIdList, UsagePoint.class), stream, exportFilter,
+				hrefFragment);
+	}
 
 	@Override
 	public void exportBatchBulk(Long bulkId, String thirdParty, OutputStream outputStream,
@@ -757,8 +784,7 @@ private void exportEntries(EntryTypeIterator entries, OutputStream stream,
 	}
 
 	@SuppressWarnings({ "rawtypes", "unchecked" })
-	// TODO: this needs to be templated and RetailCustomer inherited from
-	// IdentifiedObject to remove the above supress warnings
+
 	private void exportEntries(Long subscriptionId, EntryTypeIterator entries, OutputStream stream,
 			ExportFilter exportFilter, Class resourceClass, String hrefFragment)
 			throws IOException {
@@ -884,18 +910,17 @@ private void exportEntries_Root(Long subscriptionId, EntryTypeIterator entries,
 
 
 	private String adjustFragment(String fragment, EntryType entry) {
-		// TODO there may be other setup things - Likely BatchList
-		// if that still exists.
+
 		String result = fragment;
 		if (fragment.contains("DownloadMyData")) {
 			result.replace("DownloadMyData", "UsagePoint");
 		}
 		if (fragment.contains("Batch")) {
 			if (fragment.contains("Bulk")) {
-				// ToDo need the proper URI fragment for a Bulk
+			
 				UsagePoint up = entry.getContent().getUsagePoint();
 				RetailCustomer rc = up.getRetailCustomer();
-				// TODO here need the proper URI fragment for a subscription
+			
 				result = "/RetailCustomer/" + rc.getId() + "/UsagePoint";
 			}
 			// if (fragment.contains("Subscription")) {