Merge pull request #27 from LitleCo/8.22

== Version 8.22.1 (December 18, 2013)
Vantiv · Dec 18, 2013 · 97d4d68 · 97d4d68
2 parents 1ca457e + 1e1f9e8
commit 97d4d68
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 30 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,10 @@
 = LitleOnline CHANGELOG
 
-== Version 8.22.0 (Oct 22, 2013)
+== Version 8.22.1 (December 18, 2013)
+* Bugfix: Corrected sdk version in batch & xml version in online and batch
+* Bugfix: Changed the hardcoded xsd files to be generated correctly when built
+
+== Version 8.22.0 (October 22, 2013)
 * Feature: Support for the following new gift card transactions: ActivateReversal, DeactivateReversal, LoadReversal, RefundReversal, UnloadReversal, DepositReversal
 * Feature: UpdateSubscription now can take token or paypage updates, and can return token in the response
 * Feature: Support for virtualGiftCard in giftCard activations and can be returned in EnhancedAuthResponses

diff --git a/build/build.xml b/build/build.xml
@@ -5,7 +5,7 @@
     </description>
 	<!-- set global properties for this build -->
 	<property name="version.schema" value="8.22" />
-	<property name="version.jar" value="8.22.0" />
+	<property name="version.jar" value="8.22.1" />
 	<property file="build/build.properties" />
 
 	<property name="src" location="src" />
@@ -84,7 +84,36 @@
 		<!-- Allow jaxb tags in our schema -->
 		<replaceregexp file="generated/litleTransaction_v${version.schema}.xsd" match="(attributeFormDefault=&quot;unqualified&quot;)>" replace="\1 xmlns:jaxb=&quot;http://java.sun.com/xml/ns/jaxb&quot; jaxb:version=&quot;2.0&quot;>" byline="true" />
 		<replaceregexp file="generated/litleCommon_v${version.schema}.xsd" match="(elementFormDefault=&quot;qualified&quot;)>" replace="\1 xmlns:jaxb=&quot;http://java.sun.com/xml/ns/jaxb&quot; jaxb:version=&quot;2.0&quot;>" byline="true" />
-
+
+		<!-- Make litle transaction interface generated -->
+		<replaceregexp file="generated/litleTransaction_v${version.schema}.xsd" match="transaction&quot; type=&quot;xp:transactionType&quot; abstract=&quot;true&quot;/>" replace="transaction&quot; type=&quot;xp:transactionType&quot; abstract=&quot;true&quot;/>
+			${line.separator}${line.separator}    &lt;xs:complexType name=&quot;litleTransactionInterface&quot; abstract=&quot;true&quot;/>" byline="true" />
+		<replaceregexp file="generated/litleTransaction_v${version.schema}.xsd" match="name=&quot;transactionType&quot;>" replace="name=&quot;transactionType&quot;>
+			${line.separator}        &lt;xs:complexContent>
+			${line.separator}            &lt;xs:extension base=&quot;xp:litleTransactionInterface&quot;>" byline="true" />
+		<replaceregexp file="generated/litleTransaction_v${version.schema}.xsd" match="&lt;xs:attribute name=&quot;id&quot; type=&quot;xp:string25Type&quot;/>" replace="       &lt;xs:attribute name=&quot;id&quot; type=&quot;xp:string25Type&quot;/>" byline="true" />
+	    <replaceregexp file="generated/litleTransaction_v${version.schema}.xsd" match="&lt;xs:attribute name=&quot;customerId&quot; type=&quot;xp:customerIdType&quot; use=&quot;optional&quot;/>" replace="       &lt;xs:attribute name=&quot;customerId&quot; type=&quot;xp:customerIdType&quot; use=&quot;optional&quot;/>
+	    	${line.separator}            &lt;/xs:extension>
+	    	${line.separator}        &lt;/xs:complexContent>" byline="true" />
+		<replaceregexp file="generated/litleRecurring_v${version.schema}.xsd" match="name=&quot;recurringTransactionType&quot;>" replace="name=&quot;recurringTransactionType&quot;>
+			${line.separator}        &lt;xs:complexContent>
+			${line.separator}            &lt;xs:extension base=&quot;xp:litleTransactionInterface&quot;>
+			${line.separator}            &lt;/xs:extension>
+			${line.separator}        &lt;/xs:complexContent>" byline="" />
+		<replaceregexp file="generated/litleRecurring_v${version.schema}.xsd" match="name=&quot;recurringTransactionResponseType&quot;>" replace="name=&quot;recurringTransactionResponseType&quot;>
+			${line.separator}        &lt;xs:complexContent>
+			${line.separator}            &lt;xs:extension base=&quot;xp:litleTransactionInterface&quot;>" byline="true" />
+		<replaceregexp file="generated/litleRecurring_v${version.schema}.xsd" match="&lt;xs:sequence>" replace="        &lt;xs:sequence>" byline="" />
+		<replaceregexp file="generated/litleRecurring_v${version.schema}.xsd" match="&lt;xs:element name=&quot;litleTxnId&quot; type=&quot;xp:litleIdType&quot; />" replace="         &lt;xs:element name=&quot;litleTxnId&quot; type=&quot;xp:litleIdType&quot; />" byline="" />
+		<replaceregexp file="generated/litleRecurring_v${version.schema}.xsd" match="&lt;xs:element name=&quot;response&quot; type=&quot;xp:responseType&quot; />" replace="         &lt;xs:element name=&quot;response&quot; type=&quot;xp:responseType&quot; />" byline="" />
+		<replaceregexp file="generated/litleRecurring_v${version.schema}.xsd" match="&lt;xs:element name=&quot;message&quot; type=&quot;xs:string&quot; />" replace="         &lt;xs:element name=&quot;message&quot; type=&quot;xs:string&quot; />" byline="" />
+		<replaceregexp file="generated/litleRecurring_v${version.schema}.xsd" match="&lt;xs:element name=&quot;responseTime&quot; type=&quot;xs:dateTime&quot; />" replace="         &lt;xs:element name=&quot;responseTime&quot; type=&quot;xs:dateTime&quot; />" byline="" />
+		<replaceregexp file="generated/litleRecurring_v${version.schema}.xsd" match="&lt;/xs:sequence>" replace="        &lt;/xs:sequence>
+			${line.separator}            &lt;/xs:extension>
+			${line.separator}        &lt;/xs:complexContent>" byline="" />
+		<replaceregexp file="generated/litleRecurring_v${version.schema}.xsd" match="" replace="" byline="" />
+		<replaceregexp file="generated/litleRecurring_v${version.schema}.xsd" match="" replace="" byline="" />
+
 		<!--Make enums even if they begin with numbers -->
 		<replaceregexp file="generated/litleTransaction_v${version.schema}.xsd" match="enumeration value=(.*?3dsAuthenticated.*?)/>" replace="enumeration value=\1>&lt;xs:annotation>&lt;xs:appinfo>&lt;jaxb:typesafeEnumMember name=&quot;AUTHENTICATED_3DS&quot;/>&lt;/xs:appinfo>&lt;/xs:annotation>&lt;/xs:enumeration>" byline="true" />
 		<replaceregexp file="generated/litleTransaction_v${version.schema}.xsd" match="enumeration value=(.*?3dsAttempted.*?)/>" replace="enumeration value=\1>&lt;xs:annotation>&lt;xs:appinfo>&lt;jaxb:typesafeEnumMember name=&quot;ATTEMPTED_3DS&quot;/>&lt;/xs:appinfo>&lt;/xs:annotation>&lt;/xs:enumeration>" byline="true" />
@@ -157,6 +186,9 @@
 			</classpath>
 		</javac>
 		<mkdir dir="dist/lib" />
+		<mkdir dir="reports/unit"/>
+		<mkdir dir="reports/functional"/>
+		<mkdir dir="reports/certification"/>
 		<jar jarfile="dist/lib/litle-sdk-for-java-${version.jar}-tests.jar" basedir="${bin}/test" />
 
 		<junit haltonfailure="true" printsummary="true" fork="yes">

diff --git a/src/com/litle/sdk/LitleBatchFileRequest.java b/src/com/litle/sdk/LitleBatchFileRequest.java
@@ -408,7 +408,7 @@ private LitleRequest buildLitleRequest() {
 			litleRequest.setId(requestId);
 		}
 		litleRequest.setAuthentication(authentication);
-		litleRequest.setVersion("8.21");
+		litleRequest.setVersion("8.22");
 		BigInteger numOfBatches = BigInteger.valueOf(this.litleBatchRequestList.size());
 		litleRequest.setNumBatchRequests(numOfBatches);
 		return litleRequest;

diff --git a/src/com/litle/sdk/LitleBatchRequest.java b/src/com/litle/sdk/LitleBatchRequest.java
@@ -69,6 +69,7 @@ public class LitleBatchRequest {
 	LitleBatchRequest(String merchantId, LitleBatchFileRequest lbfr) throws LitleBatchException{
 		this.batchRequest = new BatchRequest();
 		this.batchRequest.setMerchantId(merchantId);
+		this.batchRequest.setMerchantSdk("Java;8.22.1");
 		this.objFac = new ObjectFactory();
 		this.lbfr = lbfr;
 		File tmpFile = new File(lbfr.getConfig().getProperty("batchRequestFolder")+"/tmp");

diff --git a/src/com/litle/sdk/LitleOnline.java b/src/com/litle/sdk/LitleOnline.java
@@ -688,9 +688,9 @@ private LitleOnlineRequest fillInMissingFieldsFromConfig(LitleOnlineRequest requ
 		else {
 			retVal.setMerchantId(request.getMerchantId());
 		}
-        retVal.setVersion("8.21");
+        retVal.setVersion("8.22");
 		if(request.getMerchantSdk() == null) {
-			retVal.setMerchantSdk("Java;8.21.0");
+			retVal.setMerchantSdk("Java;8.22.1");
 		}
 		else {
 			retVal.setMerchantSdk(request.getMerchantSdk());

diff --git a/src/com/litle/sdk/LitleRFRFileRequest.java b/src/com/litle/sdk/LitleRFRFileRequest.java
@@ -135,7 +135,7 @@ private LitleRequest buildLitleRequest() {
             litleRequest.setId(requestId);
         }
         litleRequest.setAuthentication(authentication);
-        litleRequest.setVersion("8.21");
+        litleRequest.setVersion("8.22");
         BigInteger numOfBatches = BigInteger.valueOf(0);
         litleRequest.setNumBatchRequests(numOfBatches);
         return litleRequest;

diff --git a/test/functional/com/litle/sdk/TestBatchFile.java b/test/functional/com/litle/sdk/TestBatchFile.java
@@ -773,7 +773,7 @@ private void assertJavaApi(LitleBatchFileRequest request, LitleBatchFileResponse
 		assertNotNull(response.getLitleSessionId());
 		assertEquals("0", response.getResponse());
 		assertEquals("Valid Format", response.getMessage());
-		assertEquals("8.21", response.getVersion());
+		assertEquals("8.22", response.getVersion());
 
 		LitleBatchResponse batchResponse1 = response.getNextLitleBatchResponse();
 		assertNotNull(batchResponse1);

diff --git a/xsd/litleRecurring_v8.22.xsd b/xsd/litleRecurring_v8.22.xsd
@@ -7,23 +7,15 @@
     <xs:element name="recurringTransactionResponse" type="xp:recurringTransactionResponseType" abstract="true" />
 
     <xs:complexType name="recurringTransactionType">
-        <xs:complexContent>
-            <xs:extension base="xp:litleTransactionInterface">
-            </xs:extension>
-        </xs:complexContent>
     </xs:complexType>
 
     <xs:complexType name="recurringTransactionResponseType">
-        <xs:complexContent>
-            <xs:extension base="xp:litleTransactionInterface">
-                <xs:sequence>
-                    <xs:element name="litleTxnId" type="xp:litleIdType" />
-                    <xs:element name="response" type="xp:responseType" />
-                    <xs:element name="message" type="xs:string" />
-                    <xs:element name="responseTime" type="xs:dateTime" />
-                </xs:sequence>
-             </xs:extension>
-         </xs:complexContent>
+        <xs:sequence>
+            <xs:element name="litleTxnId" type="xp:litleIdType" />
+            <xs:element name="response" type="xp:responseType" />
+            <xs:element name="message" type="xs:string" />
+            <xs:element name="responseTime" type="xs:dateTime" />
+        </xs:sequence>
     </xs:complexType>
 
     <xs:element name="cancelSubscription" substitutionGroup="xp:recurringTransaction" >

diff --git a/xsd/litleTransaction_v8.22.xsd b/xsd/litleTransaction_v8.22.xsd
@@ -5,15 +5,9 @@
 
     <xs:element name="transaction" type="xp:transactionType" abstract="true"/>
 
-    <xs:complexType name="litleTransactionInterface" abstract="true"/>
-
     <xs:complexType name="transactionType">
-        <xs:complexContent>
-            <xs:extension base="xp:litleTransactionInterface">
-                <xs:attribute name="id" type="xp:string25Type"/>
-                <xs:attribute name="customerId" type="xp:customerIdType" use="optional"/>
-            </xs:extension>
-        </xs:complexContent>
+        <xs:attribute name="id" type="xp:string25Type"/>
+        <xs:attribute name="customerId" type="xp:customerIdType" use="optional"/>
     </xs:complexType>
 
     <xs:complexType name="transactionTypeWithReportGroup">