Routes change for upload/download my data

partial support of (application local) href generation

Author: jateeter

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

@@ -58,8 +58,6 @@ public class Routes {
     public static final String ROOT_SUBSCRIPTION_MEMBER = "/espi/1_1/resource/Subscription/{subscriptionId}";
     public static final String ROOT_APPLICATION_INFORMATION_COLLECTION = "/espi/1_1/resource/ApplicationInformation";
     public static final String ROOT_APPLICATION_INFORMATION_MEMBER = "/espi/1_1/resource/ApplicationInformation/{applicationInformationId}";
-    public static final String ROOT_RETAIL_CUSTOMER_COLLECTION = "/espi/1_1/resource/RetailCustomer/";
-    public static final String ROOT_RETAIL_CUSTOMER_MEMBER = "/espi/1_1/resource/RetailCustomer/{retailCustomerId}";
 
     // patterns for RESTful xpath access to management entities
     //
@@ -101,6 +99,12 @@ public class Routes {
     public static final String ELECTRIC_POWER_USAGE_SUMMARY_COLLECTION = "/espi/1_1/resource/RetailCustomer/{retailCustomerId}/UsagePoint/{usagePointId}/ElectricPowerUsageSummary";
     public static final String ELECTRIC_POWER_USAGE_SUMMARY_MEMBER = "/espi/1_1/resource/RetailCustomer/{retailCustomerId}/UsagePoint/{usagePointId}/ElectricPowerUsageSummary/{electricPowerUsageSummaryId}";
 
+    // patterns for RESTful RetailCustomer services
+    public static final String RETAIL_CUSTOMER_COLLECTION = "/espi/1_1/resource/RetailCustomer";
+    public static final String RETAIL_CUSTOMER_MEMBER = "/espi/1_1/resource/RetailCustomer/{retailCustomerId}";
+    public static final String RETAIL_CUSTOMER_MEMBER_DOWNLOAD_MY_DATA = "/espi/1_1/resource/RetailCustomer/{retailCustomerId}/DownloadMyData";
+    public static final String RETAIL_CUSTOMER_MEMBER_UPLOAD_MY_DATA = "/espi/1_1/resource/RetailCustomer/{retailCustomerId}/UploadMyData";
+
     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

@@ -96,7 +96,7 @@ public void exportMeterReadings(Long retailCustomerId, Long usagePointId,
 	void exportReadingType(Long readingTypeId, OutputStream outputStream, ExportFilter exportFilter) throws IOException;
 
 	// - XPath form
-	public void exportReadingType(Long retailCustomerId, Long usagePointId,	Long meterTypeId, Long readingTypeId,
+	public void exportReadingType(Long retailCustomerId, Long usagePointId,	Long meterReadingId, Long readingTypeId,
 				      OutputStream stream, ExportFilter exportFilter) throws IOException;
 
 	public void exportReadingTypes(Long retailCustomerId, Long usagePointId,