Merge pull request uPortal-Attic#6 from UW-Madison-DoIT/benefit-confi…

…rmations-not-benefit-statements HRSPLT-154 : Changed spec to reflect change to spec on cypress side
apetro · Sep 23, 2014 · 2aae846 · 2aae846
2 parents bb80408 + 851bc09
commit 2aae846
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/hrs-portlets-api/src/main/java/edu/wisc/hr/dao/benconf/BenefitConfirmationDao.java b/hrs-portlets-api/src/main/java/edu/wisc/hr/dao/benconf/BenefitConfirmationDao.java
@@ -2,13 +2,13 @@
 
 import org.jasig.springframework.web.client.ExtendedRestOperations.ProxyResponse;
 
-import edu.wisc.hr.dm.benconf.BenefitStatements;
+import edu.wisc.hr.dm.benconf.BenefitConfirmations;
 
 public interface BenefitConfirmationDao {
     /**
      * Get the benefit confirmations for the specified emplid
      */
-    public BenefitStatements getBenefitConfirmations(String emplid);
+    public BenefitConfirmations getBenefitConfirmations(String emplid);
 
     public void getBenefitConfirmation(String docId, String emplid, ProxyResponse proxyResponse);
 }
diff --git a/hrs-portlets-api/src/main/resources/xsd/hrs-portlet-benconf-1.0.xsd b/hrs-portlets-api/src/main/resources/xsd/hrs-portlet-benconf-1.0.xsd
@@ -25,7 +25,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0">
 
-    <xs:element name="BenefitStatements">
+    <xs:element name="BenefitConfirmations">
         <xs:complexType>
             <xs:sequence>
                 <xs:element name="benefitConfirmations" type="BenefitConfirmation" minOccurs="0" maxOccurs="unbounded" />

diff --git a/...s-cypress-impl/src/main/java/edu/wisc/cypress/dao/benconf/RestBenefitConfirmationDao.java b/...s-cypress-impl/src/main/java/edu/wisc/cypress/dao/benconf/RestBenefitConfirmationDao.java
@@ -14,10 +14,10 @@
 import com.googlecode.ehcache.annotations.Cacheable;
 
 import edu.wisc.cypress.xdm.benconf.XmlBenefitConfirmation;
-import edu.wisc.cypress.xdm.benconf.XmlBenefitStatements;
+import edu.wisc.cypress.xdm.benconf.XmlBenefitConfirmations;
 import edu.wisc.hr.dao.benconf.BenefitConfirmationDao;
 import edu.wisc.hr.dm.benconf.BenefitConfirmation;
-import edu.wisc.hr.dm.benconf.BenefitStatements;
+import edu.wisc.hr.dm.benconf.BenefitConfirmations;
 
 @Repository("restBenefitConfirmationDao")
 public class RestBenefitConfirmationDao implements BenefitConfirmationDao {
@@ -42,12 +42,12 @@ public void setStatementUrl(String statementUrl) {
 
     @Cacheable(cacheName="benefitConfirmations", exceptionCacheName="cypressUnknownExceptionCache")
     @Override
-    public BenefitStatements getBenefitConfirmations(String emplid) {
+    public BenefitConfirmations getBenefitConfirmations(String emplid) {
         final HttpHeaders httpHeaders = new HttpHeaders();
         httpHeaders.set("HRID", emplid);
 
-        final XmlBenefitStatements xmlBenefitConfirmations = 
-                this.restOperations.getForObject(this.statementsUrl, XmlBenefitStatements.class, httpHeaders, emplid);
+        final XmlBenefitConfirmations xmlBenefitConfirmations = 
+                this.restOperations.getForObject(this.statementsUrl, XmlBenefitConfirmations.class, httpHeaders, emplid);
 
         return this.getBenefitConfirmations(xmlBenefitConfirmations);
     }
@@ -59,10 +59,10 @@ public void getBenefitConfirmation(String docId, String emplid, ProxyResponse pr
         this.restOperations.proxyRequest(proxyResponse, this.statementUrl, HttpMethod.GET, httpHeaders, docId);
     }
 
-    protected BenefitStatements getBenefitConfirmations(XmlBenefitStatements xmlBenefitConfirmations) {
+    protected BenefitConfirmations getBenefitConfirmations(XmlBenefitConfirmations xmlBenefitConfirmations) {
         final List<XmlBenefitConfirmation> xmlBenefitConfirmationList = xmlBenefitConfirmations.getBenefitConfirmations();
 
-        final BenefitStatements benefitConfirmations = new BenefitStatements();
+        final BenefitConfirmations benefitConfirmations = new BenefitConfirmations();
         final List<BenefitConfirmation> benefitConfirmationList = benefitConfirmations.getBenefitConfirmations();
 
         for (final XmlBenefitConfirmation input : xmlBenefitConfirmationList) {

diff --git a/hrs-portlets-cypress-impl/src/main/resources/xsd/cypress/benefit-confirmations.xsd b/hrs-portlets-cypress-impl/src/main/resources/xsd/cypress/benefit-confirmations.xsd
@@ -23,7 +23,7 @@
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   targetNamespace="http://cypress.doit.wisc.edu/schema/benefit-confirmations">
 
-  <xs:element name="benefit-statements">
+  <xs:element name="benefit-confirmations">
     <xs:complexType>
       <xs:sequence>
         <xs:element name="benefit-confirmation" maxOccurs="unbounded" type="benefit-confirmation"/>

diff --git a/...-cypress-impl/src/test/java/edu/wisc/cypress/dao/bnconf/RestBenefitConfirmationDaoIT.java b/...-cypress-impl/src/test/java/edu/wisc/cypress/dao/bnconf/RestBenefitConfirmationDaoIT.java
@@ -33,7 +33,7 @@
 import edu.wisc.cypress.dao.benconf.RestBenefitConfirmationDao;
 import edu.wisc.cypress.dm.MockProxyResponse;
 import edu.wisc.hr.dm.benconf.BenefitConfirmation;
-import edu.wisc.hr.dm.benconf.BenefitStatements;
+import edu.wisc.hr.dm.benconf.BenefitConfirmations;
 
 /**
  * Test out the benefit confirmation. This is an integration test.
@@ -59,7 +59,7 @@ public void testGetStatement() throws Exception {
 
     @Test
     public void testGetStatements() throws Exception {
-        final BenefitStatements benefitStatements = client.getBenefitConfirmations("00001234");
+        final BenefitConfirmations benefitStatements = client.getBenefitConfirmations("00001234");
         assertNotNull(benefitStatements);
         final List<BenefitConfirmation> statements = benefitStatements.getBenefitConfirmations();
         assertNotNull(statements);
@@ -68,7 +68,7 @@ public void testGetStatements() throws Exception {
 
     @Test
     public void testNoStatements() throws Exception {
-        final BenefitStatements benefitStatements = client.getBenefitConfirmations("00000000");
+        final BenefitConfirmations benefitStatements = client.getBenefitConfirmations("00000000");
         assertNotNull(benefitStatements);
         final List<BenefitConfirmation> statements = benefitStatements.getBenefitConfirmations();
         assertNotNull(statements);
@@ -77,7 +77,7 @@ public void testNoStatements() throws Exception {
 
     @Test
     public void testBadEmplId() throws Exception {
-        final BenefitStatements benefitStatements = client.getBenefitConfirmations("");
+        final BenefitConfirmations benefitStatements = client.getBenefitConfirmations("");
         assertNotNull(benefitStatements);
         final List<BenefitConfirmation> statements = benefitStatements.getBenefitConfirmations();
         assertNotNull(statements);

diff --git a/...pp/src/main/java/edu/wisc/portlet/hrs/web/benefits/BenefitConfirmationDataController.java b/...pp/src/main/java/edu/wisc/portlet/hrs/web/benefits/BenefitConfirmationDataController.java
@@ -18,7 +18,7 @@
 
 import edu.wisc.hr.dao.benconf.BenefitConfirmationDao;
 import edu.wisc.hr.dm.benconf.BenefitConfirmation;
-import edu.wisc.hr.dm.benconf.BenefitStatements;
+import edu.wisc.hr.dm.benconf.BenefitConfirmations;
 import edu.wisc.portlet.hrs.util.HrsDownloadControllerUtils;
 
 @Controller
@@ -41,7 +41,7 @@ public void setBenefitConfirmationDao(BenefitConfirmationDao benefitConfirmation
     @ResourceMapping("benefitConfirmations")
     public String getBenefitConfirmations(ModelMap modelMap) {
         final String emplid = PrimaryAttributeUtils.getPrimaryId();
-        final BenefitStatements benefitConfirmations = this.benefitConfirmationDao.getBenefitConfirmations(emplid);
+        final BenefitConfirmations benefitConfirmations = this.benefitConfirmationDao.getBenefitConfirmations(emplid);
 
         List<BenefitConfirmation> benefitConfirmationsList = benefitConfirmations.getBenefitConfirmations();