From dd4e0a7d68cef5ca5a8f53fe498d6b90141d934b Mon Sep 17 00:00:00 2001
From: Fred Qin <fenq@sfu.ca>
Date: Tue, 28 Feb 2017 22:12:59 -0800
Subject: [PATCH 1/3] complete array util

---
 .../395443277/{data_structure => }/.gitignore |   0
 .../src/com/coderising/array/ArrayUtil.java   | 254 ++++++++++++++++++
 .../com/coderising/array/ArrayUtilTest.java   |  98 +++++++
 .../coderising/litestruts/LoginAction.java    |  39 +++
 .../src/com/coderising/litestruts/Struts.java |  34 +++
 .../com/coderising/litestruts/StrutsTest.java |  43 +++
 .../src/com/coderising/litestruts/View.java   |  23 ++
 .../src/com/coderising/litestruts/struts.xml  |  11 +
 .../src/com/coding/basic/ArrayList.java       |   0
 .../src/com/coding/basic/ArrayListTest.java   |   0
 .../src/com/coding/basic/BinaryTreeNode.java  |   0
 .../com/coding/basic/BinaryTreeNodeTest.java  |   0
 .../src/com/coding/basic/Iterator.java        |   0
 .../src/com/coding/basic/LinkedList.java      |   0
 .../src/com/coding/basic/LinkedListTest.java  |   0
 .../src/com/coding/basic/List.java            |   0
 .../src/com/coding/basic/Queue.java           |   0
 .../src/com/coding/basic/QueueTest.java       |   0
 .../src/com/coding/basic/Stack.java           |   0
 .../src/com/coding/basic/StackTest.java       |   0
 20 files changed, 502 insertions(+)
 rename group11/395443277/{data_structure => }/.gitignore (100%)
 create mode 100644 group11/395443277/src/com/coderising/array/ArrayUtil.java
 create mode 100644 group11/395443277/src/com/coderising/array/ArrayUtilTest.java
 create mode 100644 group11/395443277/src/com/coderising/litestruts/LoginAction.java
 create mode 100644 group11/395443277/src/com/coderising/litestruts/Struts.java
 create mode 100644 group11/395443277/src/com/coderising/litestruts/StrutsTest.java
 create mode 100644 group11/395443277/src/com/coderising/litestruts/View.java
 create mode 100644 group11/395443277/src/com/coderising/litestruts/struts.xml
 rename group11/395443277/{data_structure => }/src/com/coding/basic/ArrayList.java (100%)
 rename group11/395443277/{data_structure => }/src/com/coding/basic/ArrayListTest.java (100%)
 rename group11/395443277/{data_structure => }/src/com/coding/basic/BinaryTreeNode.java (100%)
 rename group11/395443277/{data_structure => }/src/com/coding/basic/BinaryTreeNodeTest.java (100%)
 rename group11/395443277/{data_structure => }/src/com/coding/basic/Iterator.java (100%)
 rename group11/395443277/{data_structure => }/src/com/coding/basic/LinkedList.java (100%)
 rename group11/395443277/{data_structure => }/src/com/coding/basic/LinkedListTest.java (100%)
 rename group11/395443277/{data_structure => }/src/com/coding/basic/List.java (100%)
 rename group11/395443277/{data_structure => }/src/com/coding/basic/Queue.java (100%)
 rename group11/395443277/{data_structure => }/src/com/coding/basic/QueueTest.java (100%)
 rename group11/395443277/{data_structure => }/src/com/coding/basic/Stack.java (100%)
 rename group11/395443277/{data_structure => }/src/com/coding/basic/StackTest.java (100%)

diff --git a/group11/395443277/data_structure/.gitignore b/group11/395443277/.gitignore
similarity index 100%
rename from group11/395443277/data_structure/.gitignore
rename to group11/395443277/.gitignore
diff --git a/group11/395443277/src/com/coderising/array/ArrayUtil.java b/group11/395443277/src/com/coderising/array/ArrayUtil.java
new file mode 100644
index 0000000000..d73df85b05
--- /dev/null
+++ b/group11/395443277/src/com/coderising/array/ArrayUtil.java
@@ -0,0 +1,254 @@
+package com.coderising.array;
+
+public class ArrayUtil {
+	
+	/**
+	 * 给定一个整形数组a , 对该数组的值进行置换
+		例如： a = [7, 9 , 30, 3]  ,   置换后为 [3, 30, 9,7]
+		如果     a = [7, 9, 30, 3, 4] , 置换后为 [4,3, 30 , 9,7]
+	 * @param origin
+	 * @return
+	 */
+	public void reverseArray(int[] origin){
+		int first = 0;
+		int last = origin.length - 1;
+		
+		while (first < last) {
+			int temp;
+			temp = origin[first];
+			origin[first] = origin[last];
+			origin[last] = temp;
+			
+			first++;
+			last--;
+		}
+	}
+	
+	/**
+	 * 现在有如下的一个数组：   int oldArr[]={1,3,4,5,0,0,6,6,0,5,4,7,6,7,0,5}   
+	 * 要求将以上数组中值为0的项去掉，将不为0的值存入一个新的数组，生成的新数组为：   
+	 * {1,3,4,5,6,6,5,4,7,6,7,5}  
+	 * @param oldArray
+	 * @return
+	 */
+	
+	public int[] removeZero(int[] oldArray){
+		// count how many zeros 
+		int zeroCount = 0;
+		int len= oldArray.length;
+		
+		if (len==0) {
+			return new int[]{};
+		}
+		
+		for (int i=0; i<len; i++) {
+			if (oldArray[i]==0) {
+				zeroCount++;
+			}
+		}
+		
+		if (zeroCount == 0) {
+			return oldArray;
+		}
+		
+		// create a new array
+		int newLen = len - zeroCount;
+		int[] newArr = new int[newLen];
+		
+		// copy to the new array and return
+		int k = 0;
+		for (int j=0; j<len; j++) {
+			if (oldArray[j]!=0) {
+				newArr[k] = oldArray[j];
+				k++;
+			}
+		}
+		
+		return newArr;
+	}
+	
+	/**
+	 * 给定两个已经排序好的整形数组， a1和a2 ,  创建一个新的数组a3, 使得a3 包含a1和a2 的所有元素， 并且仍然是有序的
+	 * 例如 a1 = [3, 5, 7,8]   a2 = [4, 5, 6,7]    则 a3 为[3,4,5,6,7,8]    , 注意： 已经消除了重复
+	 * @param array1
+	 * @param array2
+	 * @return
+	 */
+	
+	public int[] merge(int[] array1, int[] array2){
+		int len1 = array1.length;
+		int len2 = array2.length;
+		
+		int newSize = len1+len2;
+		int[] newArray = new int[newSize];
+		
+		int i = 0; // i for array1
+		int j = 0; // j for array2
+		int k = 0; // k for newArray
+		while(i <=len1-1 && j<=len2-1) {
+			if (array1[i] < array2[j]) {
+				newArray[k++] = array1[i];
+				i++;
+			} else if (array1[i] == array2[j]){
+				newArray[k++] = array1[i];
+				newArray[k++] = 0;
+				i++;
+				j++;
+			} else {
+				newArray[k++] = array2[j];
+				j++;
+			}
+		}
+		
+		while(i<len1) {
+			newArray[k++] = array1[i++];
+		}
+
+		while(j<len2) {
+			newArray[k++] = array2[j++];
+		}
+		
+		// remove 0 after merge
+		return this.removeZero(newArray);
+	}
+	/**
+	 * 把一个已经存满数据的数组 oldArray的容量进行扩展， 扩展后的新数据大小为oldArray.length + size
+	 * 注意，老数组的元素在新数组中需要保持
+	 * 例如 oldArray = [2,3,6] , size = 3,则返回的新数组为
+	 * [2,3,6,0,0,0]
+	 * @param oldArray
+	 * @param size
+	 * @return
+	 */
+	public int[] grow(int [] oldArray,  int size){
+		int len = oldArray.length;
+		
+		if (len ==0) {
+			return new int[]{};
+		}
+		
+		int newSize = len + size;
+		int[] newArray = new int[newSize];
+		
+		for(int i=0; i<len; i++) {
+			newArray[i] = oldArray[i];
+		}
+		
+		return newArray;
+	}
+	
+	/**
+	 * 斐波那契数列为：1，1，2，3，5，8，13，21......  ，给定一个最大值， 返回小于该值的数列
+	 * 例如， max = 15 , 则返回的数组应该为 [1，1，2，3，5，8，13]
+	 * max = 1, 则返回空数组 []
+	 * @param max
+	 * @return
+	 */
+	public int[] fibonacci(int max){
+		if (max ==1) {
+			return new int[]{};
+		}
+		
+		int[] arr = new int[max];
+		arr[0] = 1;
+		arr[1] = 1;
+		
+		int k = 2;
+		do {
+			arr[k] = arr[k-1] + arr[k-2];
+		} while(arr[k++]<=max);
+		
+		// remove the last element since the condition exit 
+		// when it is already passed the limit
+		arr[k-1] = 0;
+		
+		return this.removeZero(arr);
+	}
+	
+	/**
+	 * 返回小于给定最大值max的所有素数数组
+	 * 例如max = 23, 返回的数组为[2,3,5,7,11,13,17,19]
+	 * @param max
+	 * @return
+	 */
+	public int[] getPrimes(int max){
+		int[] primes = new int[max];
+		for(int i=0; i<primes.length; i++) {
+			primes[i] = i;
+		}
+		// we know 0 and 1 are not prime
+		primes[0] = 0;
+		primes[1] = 0;
+		
+		for (int i=2; i<primes.length; i++) {
+			// if value is prime, all it's multiplier is prime and set to 0
+			if(primes[i] !=0) {
+				for(int j=2; j<primes.length; j++) {
+					if(i*j < max) {
+						primes[i*j] = 0;
+					}
+				}
+			}
+		}
+		
+		return this.removeZero(primes);
+	}
+	
+	/**
+	 * 所谓“完数”， 是指这个数恰好等于它的因子之和，例如6=1+2+3
+	 * 给定一个最大值max， 返回一个数组， 数组中是小于max 的所有完数
+	 * @param max
+	 * @return
+	 */
+	public int[] getPerfectNumbers(int max){
+		if (max==1) {
+			return new int[]{};
+		}
+		
+		int[] newArr = new int[max];
+		int k =0;
+		int sum=0;
+		for (int i=1; i<=max;i++) {
+			for(int j=1; j<i;j++) {
+				if(i%j ==0) {
+					sum+=j;
+				}
+			}
+			
+			if(sum==i) {
+				newArr[k++] = i;
+			}
+			
+			sum=0;
+		}
+		
+		return this.removeZero(newArr);
+	}
+	
+	/**
+	 * 用seperator 把数组 array给连接起来
+	 * 例如array= [3,8,9], seperator = "-"
+	 * 则返回值为"3-8-9"
+	 * @param array
+	 * @param s
+	 * @return
+	 */
+	public String join(int[] array, String seperator){
+		if (array==null) {
+			return null;
+		}
+		
+		final int noOfItems = array.length;
+		final StringBuilder buf = new StringBuilder(noOfItems * 16);
+		for (int i =0; i<noOfItems; i++) {
+			buf.append(Integer.toString(array[i]));
+			if (i!=noOfItems-1 && seperator!=null) {
+				buf.append(seperator);
+			}
+		}
+		
+		return buf.toString();
+	}
+	
+
+}
diff --git a/group11/395443277/src/com/coderising/array/ArrayUtilTest.java b/group11/395443277/src/com/coderising/array/ArrayUtilTest.java
new file mode 100644
index 0000000000..8dee13e718
--- /dev/null
+++ b/group11/395443277/src/com/coderising/array/ArrayUtilTest.java
@@ -0,0 +1,98 @@
+package com.coderising.array;
+
+import static org.junit.Assert.*;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class ArrayUtilTest {
+
+	@Test
+	public void testReverseArray() {
+		ArrayUtil util = new ArrayUtil();
+		
+		int[] test1 = {7, 9 , 30, 3};
+		util.reverseArray(test1);
+		Assert.assertArrayEquals(new int[]{3, 30, 9,7}, test1);
+		
+		int[] test2 = {7, 9, 30, 3, 4};
+		util.reverseArray(test2);
+		Assert.assertArrayEquals(new int[]{4,3, 30 , 9,7}, test2);
+		
+		int[] test3 = {};
+		util.reverseArray(test3);
+		Assert.assertArrayEquals(new int[]{}, test3);
+	}
+
+	@Test
+	public void testRemoveZero() {
+		ArrayUtil util = new ArrayUtil();
+		
+		int oldArray[]={1,3,4,5,0,0,6,6,0,5,4,7,6,7,0,5};
+		Assert.assertArrayEquals(new int[]{1,3,4,5,6,6,5,4,7,6,7,5}, util.removeZero(oldArray));
+		
+		int oldArray1[]={1,3,4,5,6,6,5,4,7,6,7,5};
+		Assert.assertArrayEquals(new int[]{1,3,4,5,6,6,5,4,7,6,7,5}, util.removeZero(oldArray1));
+		
+		int oldArray2[]={};
+		Assert.assertArrayEquals(new int[]{}, util.removeZero(oldArray2));
+	}
+
+	@Test
+	public void testMerge() {
+		ArrayUtil util = new ArrayUtil();
+		
+		int[] a1 = {3, 5, 7,8};
+		int[] a2 = {4, 5, 6,7, 9}; 
+		int[] a3 =  util.merge(a1, a2);
+		
+		Assert.assertArrayEquals(new int[] {3,4,5,6,7,8,9},a3);
+		
+	}
+
+	@Test
+	public void testGrow() {
+		ArrayUtil util = new ArrayUtil();
+		
+		int[] a = new int[]{2,3,6};
+		Assert.assertArrayEquals(new int[] {2,3,6,0,0,0}, util.grow(a, 3));
+	}
+
+	@Test
+	public void testFibonacci() {
+		ArrayUtil util = new ArrayUtil();
+		int[] res = util.fibonacci(32);
+		Assert.assertArrayEquals(new int[] {1, 1, 2, 3, 5, 8, 13, 21}, res);
+	}
+
+	@Test
+	public void testGetPrimes() {
+		ArrayUtil util = new ArrayUtil();
+		int[] res = util.getPrimes(23);
+		Assert.assertArrayEquals(new int[] {2,3,5,7,11,13,17,19}, res);
+		
+		int[] res2 = util.getPrimes(6);
+		Assert.assertArrayEquals(new int[] {2, 3, 5}, res2);
+	}
+
+	@Test
+	public void testGetPerfectNumbers() {
+		ArrayUtil util = new ArrayUtil();
+		int[] res = util.getPerfectNumbers(6);
+		Assert.assertArrayEquals(new int[] {6}, res);
+	}
+
+	@Test
+	public void testJoin() {
+		ArrayUtil util = new ArrayUtil();
+		String ans1 = util.join(new int[]{3,8,9}, "-");
+		Assert.assertEquals("3-8-9", ans1);
+		
+		String ans2 = util.join(null,"-");
+		Assert.assertEquals(null, ans2);
+		
+		String ans3 = util.join(new int[]{3,8,9},null);
+		Assert.assertEquals("389", ans3);
+	}
+
+}
diff --git a/group11/395443277/src/com/coderising/litestruts/LoginAction.java b/group11/395443277/src/com/coderising/litestruts/LoginAction.java
new file mode 100644
index 0000000000..dcdbe226ed
--- /dev/null
+++ b/group11/395443277/src/com/coderising/litestruts/LoginAction.java
@@ -0,0 +1,39 @@
+package com.coderising.litestruts;
+
+/**
+ * 这是一个用来展示登录的业务类， 其中的用户名和密码都是硬编码的。
+ * @author liuxin
+ *
+ */
+public class LoginAction{
+    private String name ;
+    private String password;
+    private String message;
+
+    public String getName() {
+        return name;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public String execute(){
+            if("test".equals(name) && "1234".equals(password)){
+                this.message = "login successful";
+                return "success";
+            }
+            this.message = "login failed,please check your user/pwd";
+            return "fail";
+    }
+
+    public void setName(String name){
+        this.name = name;
+    }
+    public void setPassword(String password){
+        this.password = password;
+    }
+    public String getMessage(){
+        return this.message;
+    }
+}
diff --git a/group11/395443277/src/com/coderising/litestruts/Struts.java b/group11/395443277/src/com/coderising/litestruts/Struts.java
new file mode 100644
index 0000000000..85e2e22de3
--- /dev/null
+++ b/group11/395443277/src/com/coderising/litestruts/Struts.java
@@ -0,0 +1,34 @@
+package com.coderising.litestruts;
+
+import java.util.Map;
+
+
+
+public class Struts {
+
+    public static View runAction(String actionName, Map<String,String> parameters) {
+
+        /*
+         
+		0. 读取配置文件struts.xml
+ 		
+ 		1. 根据actionName找到相对应的class ， 例如LoginAction,   通过反射实例化（创建对象）
+		据parameters中的数据，调用对象的setter方法， 例如parameters中的数据是 
+		("name"="test" ,  "password"="1234") ,     	
+		那就应该调用 setName和setPassword方法
+		
+		2. 通过反射调用对象的exectue 方法， 并获得返回值，例如"success"
+		
+		3. 通过反射找到对象的所有getter方法（例如 getMessage）,  
+		通过反射来调用， 把值和属性形成一个HashMap , 例如 {"message":  "登录成功"} ,  
+		放到View对象的parameters
+		
+		4. 根据struts.xml中的 <result> 配置,以及execute的返回值，  确定哪一个jsp，  
+		放到View对象的jsp字段中。
+        
+        */
+    	
+    	return null;
+    }    
+
+}
diff --git a/group11/395443277/src/com/coderising/litestruts/StrutsTest.java b/group11/395443277/src/com/coderising/litestruts/StrutsTest.java
new file mode 100644
index 0000000000..b8c81faf3c
--- /dev/null
+++ b/group11/395443277/src/com/coderising/litestruts/StrutsTest.java
@@ -0,0 +1,43 @@
+package com.coderising.litestruts;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+
+
+
+
+public class StrutsTest {
+
+	@Test
+	public void testLoginActionSuccess() {
+		
+		String actionName = "login";
+        
+		Map<String,String> params = new HashMap<String,String>();
+        params.put("name","test");
+        params.put("password","1234");
+        
+        
+        View view  = Struts.runAction(actionName,params);        
+        
+        Assert.assertEquals("/jsp/homepage.jsp", view.getJsp());
+        Assert.assertEquals("login successful", view.getParameters().get("message"));
+	}
+
+	@Test
+	public void testLoginActionFailed() {
+		String actionName = "login";
+		Map<String,String> params = new HashMap<String,String>();
+        params.put("name","test");
+        params.put("password","123456"); //密码和预设的不一致
+        
+        View view  = Struts.runAction(actionName,params);        
+        
+        Assert.assertEquals("/jsp/showLogin.jsp", view.getJsp());
+        Assert.assertEquals("login failed,please check your user/pwd", view.getParameters().get("message"));
+	}
+}
diff --git a/group11/395443277/src/com/coderising/litestruts/View.java b/group11/395443277/src/com/coderising/litestruts/View.java
new file mode 100644
index 0000000000..07df2a5dab
--- /dev/null
+++ b/group11/395443277/src/com/coderising/litestruts/View.java
@@ -0,0 +1,23 @@
+package com.coderising.litestruts;
+
+import java.util.Map;
+
+public class View {
+	private String jsp;
+	private Map parameters;
+	
+	public String getJsp() {
+		return jsp;
+	}
+	public View setJsp(String jsp) {
+		this.jsp = jsp;
+		return this;
+	}
+	public Map getParameters() {
+		return parameters;
+	}
+	public View setParameters(Map parameters) {
+		this.parameters = parameters;
+		return this;
+	}
+}
diff --git a/group11/395443277/src/com/coderising/litestruts/struts.xml b/group11/395443277/src/com/coderising/litestruts/struts.xml
new file mode 100644
index 0000000000..4c9967dbaf
--- /dev/null
+++ b/group11/395443277/src/com/coderising/litestruts/struts.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<struts>
+	<action name="login" class="com.coderising.action.LoginAction">
+		<result name="success">/jsp/homepage.jsp</result>
+		<result name="fail">/jsp/showLogin.jsp</result>
+	</action>
+	<action name="logout" class="com.coderising.action.LogoutAction">
+		<result = success ">/jsp/welcome.jsp</result>
+		<result = error ">/jsp/error.jsp</result>
+	</action>
+</struts>
\ No newline at end of file
diff --git a/group11/395443277/data_structure/src/com/coding/basic/ArrayList.java b/group11/395443277/src/com/coding/basic/ArrayList.java
similarity index 100%
rename from group11/395443277/data_structure/src/com/coding/basic/ArrayList.java
rename to group11/395443277/src/com/coding/basic/ArrayList.java
diff --git a/group11/395443277/data_structure/src/com/coding/basic/ArrayListTest.java b/group11/395443277/src/com/coding/basic/ArrayListTest.java
similarity index 100%
rename from group11/395443277/data_structure/src/com/coding/basic/ArrayListTest.java
rename to group11/395443277/src/com/coding/basic/ArrayListTest.java
diff --git a/group11/395443277/data_structure/src/com/coding/basic/BinaryTreeNode.java b/group11/395443277/src/com/coding/basic/BinaryTreeNode.java
similarity index 100%
rename from group11/395443277/data_structure/src/com/coding/basic/BinaryTreeNode.java
rename to group11/395443277/src/com/coding/basic/BinaryTreeNode.java
diff --git a/group11/395443277/data_structure/src/com/coding/basic/BinaryTreeNodeTest.java b/group11/395443277/src/com/coding/basic/BinaryTreeNodeTest.java
similarity index 100%
rename from group11/395443277/data_structure/src/com/coding/basic/BinaryTreeNodeTest.java
rename to group11/395443277/src/com/coding/basic/BinaryTreeNodeTest.java
diff --git a/group11/395443277/data_structure/src/com/coding/basic/Iterator.java b/group11/395443277/src/com/coding/basic/Iterator.java
similarity index 100%
rename from group11/395443277/data_structure/src/com/coding/basic/Iterator.java
rename to group11/395443277/src/com/coding/basic/Iterator.java
diff --git a/group11/395443277/data_structure/src/com/coding/basic/LinkedList.java b/group11/395443277/src/com/coding/basic/LinkedList.java
similarity index 100%
rename from group11/395443277/data_structure/src/com/coding/basic/LinkedList.java
rename to group11/395443277/src/com/coding/basic/LinkedList.java
diff --git a/group11/395443277/data_structure/src/com/coding/basic/LinkedListTest.java b/group11/395443277/src/com/coding/basic/LinkedListTest.java
similarity index 100%
rename from group11/395443277/data_structure/src/com/coding/basic/LinkedListTest.java
rename to group11/395443277/src/com/coding/basic/LinkedListTest.java
diff --git a/group11/395443277/data_structure/src/com/coding/basic/List.java b/group11/395443277/src/com/coding/basic/List.java
similarity index 100%
rename from group11/395443277/data_structure/src/com/coding/basic/List.java
rename to group11/395443277/src/com/coding/basic/List.java
diff --git a/group11/395443277/data_structure/src/com/coding/basic/Queue.java b/group11/395443277/src/com/coding/basic/Queue.java
similarity index 100%
rename from group11/395443277/data_structure/src/com/coding/basic/Queue.java
rename to group11/395443277/src/com/coding/basic/Queue.java
diff --git a/group11/395443277/data_structure/src/com/coding/basic/QueueTest.java b/group11/395443277/src/com/coding/basic/QueueTest.java
similarity index 100%
rename from group11/395443277/data_structure/src/com/coding/basic/QueueTest.java
rename to group11/395443277/src/com/coding/basic/QueueTest.java
diff --git a/group11/395443277/data_structure/src/com/coding/basic/Stack.java b/group11/395443277/src/com/coding/basic/Stack.java
similarity index 100%
rename from group11/395443277/data_structure/src/com/coding/basic/Stack.java
rename to group11/395443277/src/com/coding/basic/Stack.java
diff --git a/group11/395443277/data_structure/src/com/coding/basic/StackTest.java b/group11/395443277/src/com/coding/basic/StackTest.java
similarity index 100%
rename from group11/395443277/data_structure/src/com/coding/basic/StackTest.java
rename to group11/395443277/src/com/coding/basic/StackTest.java

From 16f10f4759d54eb07b8e09353ba1c91b51768b81 Mon Sep 17 00:00:00 2001
From: Fred Qin <fenq@sfu.ca>
Date: Wed, 1 Mar 2017 15:58:18 -0800
Subject: [PATCH 2/3] structs.xml is updated

---
 .../src/com/coderising/array/ArrayUtilTest.java  |  2 --
 .../src/com/coderising/litestruts/struts.xml     | 16 ++++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/group11/395443277/src/com/coderising/array/ArrayUtilTest.java b/group11/395443277/src/com/coderising/array/ArrayUtilTest.java
index 8dee13e718..704ea09591 100644
--- a/group11/395443277/src/com/coderising/array/ArrayUtilTest.java
+++ b/group11/395443277/src/com/coderising/array/ArrayUtilTest.java
@@ -1,7 +1,5 @@
 package com.coderising.array;
 
-import static org.junit.Assert.*;
-
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/group11/395443277/src/com/coderising/litestruts/struts.xml b/group11/395443277/src/com/coderising/litestruts/struts.xml
index 4c9967dbaf..dd598a3664 100644
--- a/group11/395443277/src/com/coderising/litestruts/struts.xml
+++ b/group11/395443277/src/com/coderising/litestruts/struts.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <struts>
-	<action name="login" class="com.coderising.action.LoginAction">
-		<result name="success">/jsp/homepage.jsp</result>
-		<result name="fail">/jsp/showLogin.jsp</result>
-	</action>
-	<action name="logout" class="com.coderising.action.LogoutAction">
-		<result = success ">/jsp/welcome.jsp</result>
-		<result = error ">/jsp/error.jsp</result>
-	</action>
+    <action name="login" class="com.coderising.action.LoginAction">
+        <result name="success">/jsp/homepage.jsp</result>
+        <result name="fail">/jsp/showLogin.jsp</result>
+    </action>
+    <action name="logout" class="com.coderising.action.LogoutAction">
+    	<result name="success">/jsp/welcome.jsp</result>
+    	<result name="error">/jsp/error.jsp</result>
+    </action>
 </struts>
\ No newline at end of file

From c801015ad111c031c2356837dcab9901c3c127c7 Mon Sep 17 00:00:00 2001
From: Fred Qin <fenq@sfu.ca>
Date: Thu, 2 Mar 2017 20:39:49 -0800
Subject: [PATCH 3/3] complete Struts.java

the class in struts.xml should be com.coderising.litestruts.LoginAction
---
 .../src/com/coderising/litestruts/Struts.java | 122 ++++++++++++++----
 .../src/com/coderising/litestruts/struts.xml  |   4 +-
 2 files changed, 100 insertions(+), 26 deletions(-)

diff --git a/group11/395443277/src/com/coderising/litestruts/Struts.java b/group11/395443277/src/com/coderising/litestruts/Struts.java
index 85e2e22de3..c5d3d602fc 100644
--- a/group11/395443277/src/com/coderising/litestruts/Struts.java
+++ b/group11/395443277/src/com/coderising/litestruts/Struts.java
@@ -1,34 +1,108 @@
 package com.coderising.litestruts;
 
+import java.io.InputStream;
+import java.lang.reflect.Method;
+import java.util.HashMap;
 import java.util.Map;
 
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
 
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.NodeList;
 
 public class Struts {
 
-    public static View runAction(String actionName, Map<String,String> parameters) {
-
-        /*
-         
-		0. 读取配置文件struts.xml
- 		
- 		1. 根据actionName找到相对应的class ， 例如LoginAction,   通过反射实例化（创建对象）
-		据parameters中的数据，调用对象的setter方法， 例如parameters中的数据是 
-		("name"="test" ,  "password"="1234") ,     	
-		那就应该调用 setName和setPassword方法
-		
-		2. 通过反射调用对象的exectue 方法， 并获得返回值，例如"success"
-		
-		3. 通过反射找到对象的所有getter方法（例如 getMessage）,  
-		通过反射来调用， 把值和属性形成一个HashMap , 例如 {"message":  "登录成功"} ,  
-		放到View对象的parameters
-		
-		4. 根据struts.xml中的 <result> 配置,以及execute的返回值，  确定哪一个jsp，  
-		放到View对象的jsp字段中。
-        
-        */
-    	
-    	return null;
-    }    
+	public static View runAction(String actionName, Map<String, String> parameters) {
+
+		/*
+		 * 
+		 * 0. 读取配置文件struts.xml
+		 * 
+		 * 1. 根据actionName找到相对应的class ， 例如LoginAction, 通过反射实例化（创建对象）
+		 * 据parameters中的数据，调用对象的setter方法， 例如parameters中的数据是 ("name"="test" ,
+		 * "password"="1234") , 那就应该调用 setName和setPassword方法
+		 * 
+		 * 2. 通过反射调用对象的exectue 方法， 并获得返回值，例如"success"
+		 * 
+		 * 3. 通过反射找到对象的所有getter方法（例如 getMessage）, 通过反射来调用， 把值和属性形成一个HashMap , 例如
+		 * {"message": "登录成功"} , 放到View对象的parameters
+		 * 
+		 * 4. 根据struts.xml中的 <result> 配置,以及execute的返回值， 确定哪一个jsp，
+		 * 放到View对象的jsp字段中。
+		 * 
+		 */
+
+		// create a new DocumentBuilderFactory
+		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+
+		try {
+			// use the factory to create a documentbuilder
+			DocumentBuilder builder = factory.newDocumentBuilder();
+			InputStream istream = Struts.class.getResourceAsStream("struts.xml");
+			Document doc = builder.parse(istream);
+
+			// find jsp page based on the result from execute result
+			Element element = doc.getDocumentElement();
+			NodeList actionNodeList = element.getElementsByTagName("action");
+
+			for (int i = 0; i < actionNodeList.getLength(); i++) {
+				NamedNodeMap actionNodeAttr = actionNodeList.item(i).getAttributes();
+
+				if (actionNodeAttr.getNamedItem("name").getTextContent().equals(actionName)) {
+					String className = actionNodeAttr.getNamedItem("class").getTextContent();
+
+					Class<?> cls = Class.forName(className);
+					Object obj = cls.newInstance();
+
+					// set name and password
+					Method setName = cls.getDeclaredMethod("setName", String.class);
+					Method setPassword = cls.getDeclaredMethod("setPassword", String.class);
+					setName.invoke(obj, parameters.get("name"));
+					setPassword.invoke(obj, parameters.get("password"));
+
+					// execute
+					Method execute = cls.getDeclaredMethod("execute");
+					String executeResult = (String) execute.invoke(obj);
+
+					// get message and jsp
+					Method getMessage = cls.getDeclaredMethod("getMessage");
+					String msg = (String) getMessage.invoke(obj);
+					Map<String,String> params = new HashMap<String,String>();
+			        params.put("message",msg);
+
+					// check result nodes
+					NodeList resultNodes = actionNodeList.item(i).getChildNodes();
+					
+					String jsp = "";
+					for (int j=0; j<resultNodes.getLength(); j++) {
+						NamedNodeMap resultNodeAttr = resultNodes.item(j).getAttributes();
+						if (resultNodeAttr != null) {
+							if (resultNodeAttr.getNamedItem("name").getTextContent().equals(executeResult)) {
+								jsp = resultNodes.item(j).getTextContent();
+								break;
+							}
+						}
+					}
+					
+					// enter information into view
+					Class<?> viewCls = Class.forName("com.coderising.litestruts.View");
+					View viewObj = (View) viewCls.newInstance();
+					Method setParameters = viewCls.getDeclaredMethod("setParameters", Map.class);
+					setParameters.invoke(viewObj, params);
+					Method setJsp = viewCls.getDeclaredMethod("setJsp", String.class);
+					setJsp.invoke(viewObj, jsp);
+					
+					return viewObj;
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		return null;
+	}
 
 }
diff --git a/group11/395443277/src/com/coderising/litestruts/struts.xml b/group11/395443277/src/com/coderising/litestruts/struts.xml
index dd598a3664..7f8d558286 100644
--- a/group11/395443277/src/com/coderising/litestruts/struts.xml
+++ b/group11/395443277/src/com/coderising/litestruts/struts.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <struts>
-    <action name="login" class="com.coderising.action.LoginAction">
+    <action name="login" class="com.coderising.litestruts.LoginAction">
         <result name="success">/jsp/homepage.jsp</result>
         <result name="fail">/jsp/showLogin.jsp</result>
     </action>
-    <action name="logout" class="com.coderising.action.LogoutAction">
+    <action name="logout" class="com.coderising.litestruts.LoginAction">
     	<result name="success">/jsp/welcome.jsp</result>
     	<result name="error">/jsp/error.jsp</result>
     </action>