Moved to Spring 4.0.6

Added SFTP to the Notification Service

Author: jateeter

pom.xml

@@ -12,32 +12,29 @@
     <name>Common</name>
 
     <profiles>
+    
+<!--         <profile> -->
+<!--             <id>dev</id> -->
+<!--             <activation> -->
+<!--                 <activeByDefault>true</activeByDefault> -->
+<!--             </activation> -->
+<!--             <properties> -->
+<!--                 <profile>dev</profile> -->
+<!--                 <database>hsql</database> -->
+<!--             </properties> -->
+<!--         </profile> -->
+        
         <profile>
-            <id>dev</id>
+            <id>devmysql</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
-            <properties>
-                <profile>dev</profile>
-                <database>hsql</database>
-            </properties>
-        </profile>
-        <profile>
-            <id>devmysql</id>
             <properties>
                 <profile>devmysql</profile>
                 <database>mysql</database>
             </properties>
         </profile>
 
-        <profile>
-            <id>devmysql-regeneratedatabase</id>
-            <properties>
-                <profile>devmysql-regeneratedatabase</profile>
-                <database>mysql</database>
-            </properties>
-        </profile>
-
         <profile>
             <id>greenbuttondata</id>
             <properties>
@@ -50,7 +47,7 @@
 
     <properties>
         <!-- Spring -->
-        <spring.version>4.0.3.RELEASE</spring.version>
+        <spring.version>4.0.6.RELEASE</spring.version>
         <spring.security.version>3.2.3.RELEASE</spring.security.version>
         <spring-security-oauth.version>2.0.2.RELEASE</spring-security-oauth.version>
 

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

@@ -2,6 +2,7 @@
 
 import javax.xml.datatype.XMLGregorianCalendar;
 
+import org.energyos.espi.common.domain.ApplicationInformation;
 import org.energyos.espi.common.domain.RetailCustomer;
 import org.energyos.espi.common.domain.Subscription;
 import org.springframework.stereotype.Service;
@@ -14,4 +15,6 @@ public interface NotificationService {
 
     void notifyAllNeed();
 
+    void notify(ApplicationInformation applicationInformation, Long bulkId);
+    
 }

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

@@ -21,10 +21,12 @@
 
 import javax.xml.datatype.XMLGregorianCalendar;
 
+import org.energyos.espi.common.domain.ApplicationInformation;
 import org.energyos.espi.common.domain.Authorization;
 import org.energyos.espi.common.domain.BatchList;
 import org.energyos.espi.common.domain.RetailCustomer;
 import org.energyos.espi.common.domain.Subscription;
+import org.energyos.espi.common.service.ApplicationInformationService;
 import org.energyos.espi.common.service.AuthorizationService;
 import org.energyos.espi.common.service.NotificationService;
 import org.energyos.espi.common.service.ResourceService;
@@ -34,6 +36,10 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
+/**
+ * @author steph
+ *
+ */
 @Service
 public class NotificationServiceImpl implements NotificationService {
     @Autowired
@@ -134,6 +140,18 @@ public void setRestTemplate(RestTemplate restTemplate) {
         this.restTemplate = restTemplate;
    }
 
+
+   @Override
+   public void notify(ApplicationInformation applicationInformation, Long bulkId) {
+	String bulkRequestUri = applicationInformation.getDataCustodianBulkRequestURI() + "/" + bulkId;
+	String thirdPartyNotificationURI = applicationInformation.getThirdPartyNotifyUri();
+    BatchList batchList = new BatchList();
+    batchList.getResources().add(bulkRequestUri);
+    
+    notifyInternal(thirdPartyNotificationURI, batchList);
+	
+   }
+
    public RestTemplate getRestTemplate () {
         return this.restTemplate;
    }
@@ -144,6 +162,7 @@ public void setResourceService(ResourceService resourceService) {
    public ResourceService getResourceService () {
         return this.resourceService;
    }
+  
    public void setAuthorizationService(AuthorizationService authorizationService) {
         this.authorizationService = authorizationService;
    }