Made changes to codes for SIM and AIM transactions. Included are only the changes for the solution ID.

As per the mail thread,
+ x_solution_id has been included in the AIM and SIM requests
+ x_solution_id used is of class Solution (since it is the old model class)

* No other field (solution name and/or vendor name) needs to be added to the requests

- Removed the comments about debugging
- Removed the code to add x_solution_name to the requests (see point above)

Author: gnongsie

src/main/java/net/authorize/aim/Transaction.java

@@ -27,8 +27,7 @@
 import net.authorize.data.creditcard.CreditCard;
 import net.authorize.data.echeck.ECheck;
 import net.authorize.data.echeck.ECheckType;
-/* ADDED */
-    import net.authorize.data.reporting.Solution;
+import net.authorize.data.reporting.Solution;
 import net.authorize.util.BasicXmlDocument;
 import net.authorize.util.DeepCopy;
 import net.authorize.util.HttpClient;
@@ -60,8 +59,7 @@ public class Transaction extends net.authorize.Transaction implements Serializab
 	private Order order;
 	private ShippingAddress shippingAddress;
 	private ShippingCharges shippingCharges;
-        /* ADDED */
-            private Solution solution;
+        private Solution solution;
 	protected TransactionType transactionType;
 	private boolean cardPresent = false;
 	protected String MD5Value = null;
@@ -750,7 +748,6 @@ public void setSolutionField(Solution solution) {
 
 		if(solution != null) {
 			this.requestMap.put(AuthNetField.X_SOLUTION_ID.getFieldName(), solution.getId()!=null?solution.getId():EMPTY_STRING);
-			this.requestMap.put(AuthNetField.X_SOLUTION_NAME.getFieldName(), solution.getName()!=null?solution.getName():EMPTY_STRING);
 		}
 	}
 

src/test/java/net/authorize/aim/cardpresent/CardPresentXMLTest.java

@@ -12,8 +12,7 @@
 import net.authorize.data.creditcard.CreditCard;
 import net.authorize.data.xml.reporting.CardCodeResponseType;
 import net.authorize.util.BasicXmlDocument;
-// ADDED
-    import net.authorize.data.reporting.Solution;
+import net.authorize.data.reporting.Solution;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -22,8 +21,7 @@ public class CardPresentXMLTest extends UnitTestData {
 
 	private Customer customer;
 	private Order order;
-        // ADDED
-            private Solution solution;
+        private Solution solution;
 
 	@Before
 	public void setUp() {
@@ -44,7 +42,6 @@ public void setUp() {
                 // create solution
                 solution = Solution.createSolution();
                 solution.setId("AAA100302");
-                solution.setName("Test Solution #1");
 	}
 
 	@Test

src/test/java/net/authorize/aim/cardpresent/functional_test/SimpleAuthCaptureTest.java

@@ -16,8 +16,7 @@
 import net.authorize.data.Order;
 import net.authorize.data.creditcard.CardType;
 import net.authorize.data.creditcard.CreditCard;
-// ADDED
-    import net.authorize.data.reporting.Solution;
+import net.authorize.data.reporting.Solution;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -30,8 +29,7 @@ public class SimpleAuthCaptureTest extends UnitTestData {
 	private Customer customer;
 	private Order order;
 	private CreditCard creditCard = CreditCard.createCreditCard();
-        // ADDED
-            private Solution solution;
+        private Solution solution;
 
 	@Before
 	public void setUp() {
@@ -63,7 +61,6 @@ public void setUp() {
                 // create solution
                 solution = Solution.createSolution();
                 solution.setId("AAA100302");
-                solution.setName("Test Solution #1");
 	}
 
 	@Test

src/test/java/net/authorize/aim/functional_test/MultiOrderAuth_Capture_Void_CreditTest.java

@@ -17,8 +17,7 @@
 import net.authorize.data.ShippingAddress;
 import net.authorize.data.ShippingCharges;
 import net.authorize.data.creditcard.CreditCard;
-// ADDED
-    import net.authorize.data.reporting.Solution;
+import net.authorize.data.reporting.Solution;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -36,8 +35,7 @@ public class MultiOrderAuth_Capture_Void_CreditTest extends UnitTestData {
 	private ShippingCharges shippingCharges;
 	private EmailReceipt emailReceipt;
 	private static String splitTenderId = null;
-        // ADDED
-            private Solution solution;
+        private Solution solution;
 
 	@Before
 	public void setUp() throws Exception {
@@ -132,7 +130,6 @@ public void setUp() throws Exception {
                 // create solution
                 solution = Solution.createSolution();
                 solution.setId("AAA100302");
-                solution.setName("Test Solution #1");
 	}
 
 	/**

src/test/java/net/authorize/aim/functional_test/SimpleAuthCaptureTest.java

@@ -11,8 +11,7 @@
 import net.authorize.data.Order;
 import net.authorize.data.creditcard.CreditCard;
 import net.authorize.data.echeck.ECheck;
-// ADDED
-    import net.authorize.data.reporting.Solution;
+import net.authorize.data.reporting.Solution;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -21,8 +20,7 @@ public class SimpleAuthCaptureTest extends UnitTestData {
 
 	private Customer customer;
 	private Order order;
-        // ADDED
-            private Solution solution;
+        private Solution solution;
 
 	@Before
 	public void setUp() {
@@ -43,7 +41,6 @@ public void setUp() {
                 // create solution
                 solution = Solution.createSolution();
                 solution.setId("AAA100302");
-                solution.setName("Test Solution #1");
 	}
 
 	@Test

src/test/java/net/authorize/sim/TransactionTest.java

@@ -10,6 +10,7 @@
 import net.authorize.data.Order;
 import net.authorize.data.creditcard.CreditCard;
 import net.authorize.sim.button.TextButton;
+import net.authorize.data.reporting.Solution;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -18,6 +19,7 @@ public class TransactionTest extends UnitTestData {
 
 	private Customer customer;
 	private Order order;
+        private Solution solution;
 
 	@Before
 	public void setUp() {
@@ -34,6 +36,10 @@ public void setUp() {
 		order = Order.createOrder();
 		order.setDescription(orderDescription);
 		order.setInvoiceNumber(invoiceNumber);
+                
+                // create solution
+                solution = Solution.createSolution();
+                solution.setId("AAA100302");
 	}
 
 	@Test
@@ -51,6 +57,7 @@ public void createFormWithNoPaymentRequest() {
 		authCaptureTransaction.setCustomer(customer);
 		authCaptureTransaction.setOrder(order);
 		authCaptureTransaction.setCreditCard(creditCard);
+                authCaptureTransaction.setSolutionField(solution);
 
 		String form = authCaptureTransaction.createForm(null, null, TextButton.createButton("submit_button", "Submit"));
 
@@ -72,6 +79,7 @@ public void createFormWithNoPaymentRequestAndNonHiddenFields() {
 		authCaptureTransaction.setCustomer(customer);
 		authCaptureTransaction.setOrder(order);
 		authCaptureTransaction.setCreditCard(creditCard);
+                authCaptureTransaction.setSolutionField(solution);
 
 		authCaptureTransaction.addFormInput("x_card_num", null);
 		authCaptureTransaction.addFormInput("x_exp_date", null);
@@ -95,6 +103,7 @@ public void createFormWithPaymentRequest() {
 				TransactionType.AUTH_CAPTURE, 1, totalAmount);
 		authCaptureTransaction.setCustomer(customer);
 		authCaptureTransaction.setOrder(order);
+                authCaptureTransaction.setSolutionField(solution);
 		authCaptureTransaction.setShowPaymentForm(true);
 		authCaptureTransaction.addFieldToRename("x_cust_id", "VIP Customer Id");
 		authCaptureTransaction.addFieldToRename("x_last_name", "Sur Name");
@@ -113,6 +122,7 @@ public void createFormWithCustomFormInputs() {
 				TransactionType.AUTH_CAPTURE, 1, totalAmount);
 		authCaptureTransaction.setCustomer(customer);
 		authCaptureTransaction.setOrder(order);
+                authCaptureTransaction.setSolutionField(solution);
 
 		LinkedHashMap<String,String> input_options = new LinkedHashMap<String, String>();
 		input_options.put("type", "text");