make sample work in Liberty. Rename SampleServlet to reduce confusion

Author: davenice

mockito-testing-containers-sample/src/main/java/sample/CurrencyConverter.java

@@ -17,26 +17,33 @@
 
 public class CurrencyConverter {
 
+	public static final String USD2GBP_CONTAINER = "USD-GBP";
+	public static final String RATES_CHANNEL = "RATES";
+	public static final String ACCOUNT_CHANNEL = "ACCOUNTS";
+	
 	private CICSContext task;
 
 	public CurrencyConverter(CICSContext task) {
 		this.task = task;
 	}
 
 	public String convertCurrency(String accountName) throws CICSConditionException, InvalidConversionRateException {
+		if (accountName == null || accountName.length() == 0) {
+			throw new IllegalArgumentException("Account name must be provided");
+		}
 		double balance = getAccountBalance(accountName);
 		double rate = getUSDGBPConversionRate();
 		double convertedBalance = balance * rate;
 		return String.format("%.2f", convertedBalance);
 	}
 
 	private double getAccountBalance(String accountName) throws CICSConditionException {
-		byte[] bytes = task.getChannel("ACCOUNTS").getBITContainer(accountName).get();
+		byte[] bytes = task.getChannel(ACCOUNT_CHANNEL).getBITContainer(accountName).get();
 		return ByteBuffer.wrap(bytes).getDouble();
 	}
-	
+
 	private double getUSDGBPConversionRate() throws CICSConditionException, InvalidConversionRateException {
-		byte[] bytes = task.getChannel("RATES").getBITContainer("USD-GBP").get();
+		byte[] bytes = task.getChannel(RATES_CHANNEL).getBITContainer(USD2GBP_CONTAINER).get();
 
 		double rate = ByteBuffer.wrap(bytes).getDouble();			
 

mockito-testing-containers-sample/src/main/java/sample/CurrencyFilter.java

@@ -0,0 +1,67 @@
+package sample;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.annotation.WebFilter;
+
+import com.ibm.cics.jcicsx.BITContainer;
+import com.ibm.cics.jcicsx.CICSConditionException;
+import com.ibm.cics.jcicsx.CICSContext;
+import com.ibm.cics.jcicsx.Channel;
+
+/*
+ * This servlet filter runs before the main servlet and sets up some sample data - an account balance and a conversion rate.
+ */
+@WebFilter("/*")
+public class CurrencyFilter implements Filter {
+
+	@Override
+	public void init(FilterConfig filterConfig) throws ServletException {}
+
+	@Override
+	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+		String accountName = request.getParameter("acctname");
+		if (accountName == null || accountName.length() == 0) {
+			accountName = CurrencyServlet.getDefaultAccountName();
+		}
+		
+		CICSContext task = CICSContext.getCICSContext();
+		try {
+			seedAccountContainer(task, accountName);
+			seedConversionContainer(task);
+		} catch (CICSConditionException e) {
+			throw new ServletException("Exception settings up CICS environment", e);
+		}
+
+		chain.doFilter(request, response);
+		
+		
+	}
+	
+	private void seedAccountContainer(CICSContext task, String accountName) throws CICSConditionException {
+		Channel accountChannel = task.getChannel(CurrencyConverter.ACCOUNT_CHANNEL);
+		BITContainer accountContainer = accountChannel.getBITContainer(accountName);
+		byte[] bytes = new byte[8];
+		ByteBuffer.wrap(bytes).putDouble(53000);
+		accountContainer.put(bytes);
+	}
+	
+	private void seedConversionContainer(CICSContext task) throws CICSConditionException {
+		Channel conversionChannel = task.getChannel(CurrencyConverter.RATES_CHANNEL);
+		BITContainer conversionContainer = conversionChannel.getBITContainer(CurrencyConverter.USD2GBP_CONTAINER);
+		byte[] bytes = new byte[8];
+		ByteBuffer.wrap(bytes).putDouble(0.79);
+		conversionContainer.put(bytes);
+	}
+
+	@Override
+	public void destroy() {}
+
+}

…/src/main/java/sample/SampleServlet.java …rc/main/java/sample/CurrencyServlet.javamockito-testing-containers-sample/src/main/java/sample/SampleServlet.java renamed to mockito-testing-containers-sample/src/main/java/sample/CurrencyServlet.java mockito-testing-containers-sample/src/main/java/sample/SampleServlet.java renamed to mockito-testing-containers-sample/src/main/java/sample/CurrencyServlet.java

@@ -11,6 +11,8 @@
 /*                                                                        */
 
 import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
@@ -24,11 +26,16 @@
 /**
  * A sample servlet to demonstrate how to use JCICSX to get data from BIT containers
  */
-@WebServlet("/SampleServlet")
-public class SampleServlet extends HttpServlet {
+@WebServlet("/CurrencyServlet")
+public class CurrencyServlet extends HttpServlet {
+	
+	Logger log = Logger.getLogger(CurrencyServlet.class.getName());
 
     private static final long serialVersionUID = 1L;
 
+    public static String getDefaultAccountName() {
+    	return "cicsuser";
+    }
 
     /**
      * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
@@ -37,24 +44,29 @@ public class SampleServlet extends HttpServlet {
     protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 		response.setContentType("text/html");
 
-		response.getWriter().print("Hello world!");
 
-		String accountName = request.getParameter("accountname");
+		String accountName = request.getParameter("acctname");
+		if (accountName == null) {
+			accountName = getDefaultAccountName();
+		}
+		response.getWriter().print("Converting balance for user "+accountName+"<br/>");
 
 		// Gets the current CICS Context for the environment we're running in
 		CICSContext task = CICSContext.getCICSContext();
 
 		try {
 			CurrencyConverter converter = new CurrencyConverter(task);
 			String convertedCurrency = converter.convertCurrency(accountName);
-			response.getWriter().println(convertedCurrency);
+			response.getWriter().append("$").println(convertedCurrency);
 		} catch (CICSConditionException e) {
+			log.log(Level.SEVERE, "Exception occurred converting currency", e);
 			response.getWriter().println("An exception has occured" + 
 					"\nRESP: " + e.getResp2() + 
 					"\nRESP2: " + e.getResp2() + 
 					"\nMessage: " + e.getMessage());
 		} catch (InvalidConversionRateException e) {
 			response.getWriter().println("An exception occured while trying to get the conversion rate");
+			log.log(Level.SEVERE, "Exception occurred getting currency conversion rate", e);
 		}
     }
 

mockito-testing-containers-sample/src/main/webapp/index.html

@@ -19,7 +19,7 @@ <h1 id = "message"></h1>
 			</td>
 		</tr>
 	</table>
-	<!-- Call SampleServlet to get the message  -->
+	<!-- Call CurrencyServlet to get the message  -->
 	<script type="text/javascript" src="index.js"></script>
 </body>
 </html>

mockito-testing-containers-sample/src/main/webapp/index.js

@@ -1,8 +1,8 @@
 // index.js
 
 // request message on server
-//Calls SampleServlet to get the message
-xhrGet("SampleServlet", function(responseText){
+//Calls CurrencyServlet to get the message
+xhrGet("CurrencyServlet", function(responseText){
 	// add to document
 	var mytitle = document.getElementById('message');
 	mytitle.innerHTML = responseText;