get newest code

.gitignore

@@ -280,6 +280,23 @@ target
 liuxin/.DS_Store
 liuxin/src/.DS_Store
 
+students/1005475328/*
+students/1329920463/*
+students/1452302762/*
+students/14703250/*
+students/2842295913/*
+students/383117348/*
+students/404481481/*
+students/406400373/*
+students/549739951/*
+students/582161208/*
+students/592146505/*
+students/740707954/*
+students/844620174/*
+students/87049319/*
+students/183549495/*
+
+
 
 
 

liuxin/data-structure/answer/src/main/java/com/coding/basic/tree/BinarySearchTreeTest.java

@@ -104,5 +104,7 @@ public void testIsValid() {
 	public void testGetNodesBetween(){
 		List<Integer> numbers = this.tree.getNodesBetween(3,  8);
 		Assert.assertEquals("[3, 4, 5, 6, 8]",numbers.toString());
+		numbers = this.tree.getNodesBetween(1,  8);
+		Assert.assertEquals("[1, 2, 3, 4, 5, 6, 8]",numbers.toString());
 	}
 }

liuxin/ood/ood-assignment/pom.xml

@@ -21,7 +21,12 @@
     	<artifactId>junit</artifactId>
     	<version>4.12</version>
     </dependency>
-
+      <dependency>
+          <groupId>org.jetbrains</groupId>
+          <artifactId>annotations-java5</artifactId>
+          <version>RELEASE</version>
+      </dependency>
+
   </dependencies>
   <repositories>
         <repository>

liuxin/ood/ood-assignment/src/main/java/com/coderising/ood/ocp/DateUtil.java

@@ -0,0 +1,10 @@
+package com.coderising.ood.ocp;
+
+public class DateUtil {
+
+	public static String getCurrentDateAsString() {
+
+		return null;
+	}
+
+}

liuxin/ood/ood-assignment/src/main/java/com/coderising/ood/ocp/Logger.java

@@ -0,0 +1,38 @@
+package com.coderising.ood.ocp;
+
+public class Logger {
+
+	public final int RAW_LOG = 1;
+	public final int RAW_LOG_WITH_DATE = 2;
+	public final int EMAIL_LOG = 1;
+	public final int SMS_LOG = 2;
+	public final int PRINT_LOG = 3;
+
+	int type = 0;
+	int method = 0;
+
+	public Logger(int logType, int logMethod){
+		this.type = logType;
+		this.method = logMethod;		
+	}
+	public void log(String msg){
+
+		String logMsg = msg;
+
+		if(this.type == RAW_LOG){
+			logMsg = msg;
+		} else if(this.type == RAW_LOG_WITH_DATE){
+			String txtDate = DateUtil.getCurrentDateAsString();
+			logMsg = txtDate + ": " + msg;
+		}
+
+		if(this.method == EMAIL_LOG){
+			MailUtil.send(logMsg);
+		} else if(this.method == SMS_LOG){
+			SMSUtil.send(logMsg);
+		} else if(this.method == PRINT_LOG){
+			System.out.println(logMsg);
+		}
+	}
+}
+

liuxin/ood/ood-assignment/src/main/java/com/coderising/ood/ocp/MailUtil.java

@@ -0,0 +1,10 @@
+package com.coderising.ood.ocp;
+
+public class MailUtil {
+
+	public static void send(String logMsg) {
+		// TODO Auto-generated method stub
+
+	}
+
+}

liuxin/ood/ood-assignment/src/main/java/com/coderising/ood/ocp/SMSUtil.java

@@ -0,0 +1,10 @@
+package com.coderising.ood.ocp;
+
+public class SMSUtil {
+
+	public static void send(String logMsg) {
+		// TODO Auto-generated method stub
+
+	}
+
+}

liuxin/ood/ood-assignment/src/main/java/com/coderising/ood/srp/DO/ProductDetail.java

@@ -0,0 +1,26 @@
+package com.coderising.ood.srp.DO;
+
+/**
+ * 产品信息数据类。
+ * @since 06.18.2017
+ */
+public class ProductDetail {
+    private String id;
+    private String description;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+}

liuxin/ood/ood-assignment/src/main/java/com/coderising/ood/srp/DO/UserInfo.java

@@ -0,0 +1,29 @@
+package com.coderising.ood.srp.DO;
+
+/**
+ * 用户数据类。
+ * @since 06.18.2017
+ */
+public class UserInfo {
+    private String name;
+    private String email;
+    private String productDesc;
+
+    public UserInfo(String name, String email, String productDesc){
+        this.name = name;
+        this.email = email;
+        this.productDesc = productDesc;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public String getProductDesc() {
+        return productDesc;
+    }
+}