refactro accroding to inspire

pom.xml

@@ -191,6 +191,11 @@
 			<version>2.3</version>
 		</dependency>
 
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+		</dependency>
 	</dependencies>
 	<repositories>
 		<!-- For testing against latest Spring snapshots -->

src/main/java/com/spring/mvc/mini/json/RequestStatusJsonParser.java

@@ -18,7 +18,7 @@ import com.spring.mvc.mini.properties.Properties;
 @Component
 public class RequestStatusJsonParser {
 
-    static Logger LOG = LoggerFactory.getLogger(RequestStatusJsonParser.class);
+    private static final Logger LOG = LoggerFactory.getLogger(RequestStatusJsonParser.class);
 
     @Autowired
     private Properties properties;

src/main/java/com/spring/mvc/mini/mail/MailSender.java

@@ -21,7 +21,7 @@ import com.spring.mvc.mini.properties.Properties;
 @Component
 public class MailSender {
 
-	static Logger LOG = LoggerFactory.getLogger(MailSender.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MailSender.class);
 
     @Autowired
     private Properties properties;
@@ -41,7 +41,7 @@ public class MailSender {
             message.setRecipients(Message.RecipientType.TO, toAddress);
             Transport.send(message);
             
-            LOG.info("Send Mail Done: " + fromAddress + " to" + toAddress);
+            LOG.info("Send Mail Done: " + fromAddress + " to" + toAddress.toString());
 
     }
 

src/main/java/com/spring/mvc/mini/pojo/ObjectClass.java

@@ -12,21 +12,21 @@ public class ObjectClass implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @NotNull
-    String id;
+    private String id;
 
     @NotNull
-    int intclass;
+    private int intclass;
 
     @NotNull
-    String abbreviation;
+    private String abbreviation;
     @NotNull
-    String packageName;
+    private String packageName;
     @NotNull
-    String name;
+    private String name;
     @NotNull
-    String parents;
+    private String parents;
 
-    String comment;
+    private String comment;
 
     public String getId() {
         return id;
@@ -114,9 +114,6 @@ public class ObjectClass implements Serializable {
         if (this.parents.contains(searchcritical)) {
             return true;
         }
-        if (String.valueOf(this.intclass).contains(searchcritical)) {
-            return true;
-        }
-        return false;
+        return String.valueOf(this.intclass).contains(searchcritical);
     }
 }

src/main/java/com/spring/mvc/mini/pojo/ObjectClassesType.java

@@ -4,7 +4,7 @@ import java.util.ArrayList;
 
 public class ObjectClassesType {
 
-    ArrayList<ObjectClass> objectClasses;
+    private ArrayList<ObjectClass> objectClasses;
 
     public ArrayList<ObjectClass> getObjectClasses() {
         return objectClasses;

src/main/java/com/spring/mvc/mini/pojo/RequestStatus.java

@@ -4,14 +4,14 @@ import java.util.Date;
 
 public class RequestStatus {
 
-    int id;
-    Date submitDate;
-    Date commitDate;
-    Date holdDate;
-    ObjectClassesType objectClassesType;
-    UserInfo userinfo;
-    StatusType status;
-    String comments;
+    private int id;
+    private  Date submitDate;
+    private Date commitDate;
+    private Date holdDate;
+    private ObjectClassesType objectClassesType;
+    private UserInfo userinfo;
+    private StatusType status;
+    private String comments;
 
     public Date getSubmitDate() {
         return submitDate;

src/main/java/com/spring/mvc/mini/pojo/RequestStatusListType.java

@@ -4,7 +4,7 @@ import java.util.ArrayList;
 
 public class RequestStatusListType {
 
-	ArrayList<RequestStatus> requestStatuses;
+	private ArrayList<RequestStatus> requestStatuses;
 
 	public ArrayList<RequestStatus> getRequestStatuses() {
 		return requestStatuses;

src/main/java/com/spring/mvc/mini/pojo/StatusType.java

 package com.spring.mvc.mini.pojo;
 
 public enum StatusType {
-	ongoing, hold, commited, withdraw;
+	ongoing, hold, commited, withdraw
 }
\ No newline at end of file

src/main/java/com/spring/mvc/mini/pojo/UserInfo.java

@@ -6,11 +6,11 @@ import com.spring.mvc.mini.password.PasswordJasypter;
 
 public class UserInfo {
     @NotNull
-    String username;
+    private String username;
     @NotNull
-    String email;
+    private String email;
     @NotNull
-    String password;
+    private String password;
 
     public String getUsername() {
         return username;

src/main/java/com/spring/mvc/mini/schedule/ScheduleFileUpdator.java

@@ -25,19 +25,19 @@ import com.spring.mvc.mini.xml.ObjectClassXMLPaser;
 
 public class ScheduleFileUpdator {
 
-    static Logger LOG = LoggerFactory.getLogger(ScheduleFileUpdator.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ScheduleFileUpdator.class);
 
     @Autowired
-    RequestStatusJsonParser jsonParser;
+    private RequestStatusJsonParser jsonParser;
 
     @Autowired
-    SVNHandler svnHandler;
+    private SVNHandler svnHandler;
 
     @Autowired
-    ObjectClassXMLPaser objectClassXMLPaser;
+    private ObjectClassXMLPaser objectClassXMLPaser;
 
     @Autowired
-    MailSender mailSender;
+    private MailSender mailSender;
 
     public void commitObjectClassXml() {
         Calendar calendar = Calendar.getInstance();
@@ -47,7 +47,6 @@ public class ScheduleFileUpdator {
 
         ArrayList<RequestStatus> requestStatuses = jsonParser.readStatus();
 
-        int requestStatusIndex = 0;
         for (RequestStatus status : requestStatuses) {
 
             int daysBetweenSubmitAndCurrent = Days.daysBetween(new DateTime(status.getSubmitDate()), new DateTime(currentTime)).getDays();

src/main/java/com/spring/mvc/mini/svn/SVNHandler.java

@@ -26,14 +26,14 @@ import com.spring.mvc.mini.properties.Properties;
 @Component
 public class SVNHandler {
 
-    static Logger LOG = LoggerFactory.getLogger(SVNHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SVNHandler.class);
 
     @Autowired
     private Properties properties;
 
     public void svnCheckin() {
 
-        SVNRepository repository = null;
+        SVNRepository repository;
 
         SVNClientManager ourClientManager = SVNClientManager.newInstance();
 
@@ -91,7 +91,7 @@ public class SVNHandler {
             return;
         }
 
-        SVNRepository repository = null;
+        SVNRepository repository;
 
         try {
             //initiate the reporitory from the url

src/main/java/com/spring/mvc/mini/validation/ObjectClassDataValidator.java

@@ -14,7 +14,7 @@ public class ObjectClassDataValidator {
 	@Autowired
 	private ObjectClassXMLPaser ocxp; 
 	
-	public void checkData(ArrayList<ObjectClass> objclsListFormIn) throws ObjectClassDataValidationException,Exception{
+	public void checkData(ArrayList<ObjectClass> objclsListFormIn) throws Exception{
 		
 		ArrayList<ObjectClass> objclsListXmlIn = ocxp.objectClassMapping();
 		
@@ -52,7 +52,7 @@ public class ObjectClassDataValidator {
 		
 	}
 	
-	public void checkmocrid(String mocrid,int latestmocrid) throws ObjectClassDataValidationException,Exception{
+	public void checkmocrid(String mocrid,int latestmocrid) throws Exception{
 		if (Integer.parseInt(mocrid) <= latestmocrid ){
 			throw new ObjectClassDataValidationException("FAILED:MO CR ID:\""+mocrid+"\" is not valid anymore, please refresh and recommit again.");
 		}

src/main/java/com/spring/mvc/mini/web/ObjectClassFormController.java

@@ -35,19 +35,19 @@ import com.spring.mvc.mini.validation.ObjectClassDataValidator;
 @SessionAttributes({"ojbclslisttype", "userinfo", "mocrid"})
 public class ObjectClassFormController {
 
-    static Logger LOG = LoggerFactory.getLogger(ObjectClassFormController.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ObjectClassFormController.class);
 
     @Autowired
-    RequestStatusJsonParser requestStatusJsonParser;
+    private RequestStatusJsonParser requestStatusJsonParser;
 
     @Autowired
-    ObjectClassDataValidator objectClassDataValidator;
+    private ObjectClassDataValidator objectClassDataValidator;
 
     @Autowired
-    Properties properties;
+    private Properties properties;
 
     @Autowired
-    MailSender mailSender;
+    private MailSender mailSender;
 
     @ModelAttribute
     public void ajaxAttribute(WebRequest request, Model model) {
@@ -139,7 +139,7 @@ public class ObjectClassFormController {
         String message = "MO CR:" + mocrid + " committed. System will send mail to reviewers.";
 
         if (ajaxRequest) {
-            model.addAttribute("message", message.toString());
+            model.addAttribute("message", message);
             return null;
         } else {
             redirectAttrs.addFlashAttribute("message", message);

src/main/java/com/spring/mvc/mini/web/ObjectClassXmlController.java

@@ -26,7 +26,7 @@ public class ObjectClassXmlController {
 	static Logger LOG = LoggerFactory.getLogger(ObjectClassXmlController.class);
 	
 	@Autowired
-	ObjectClassXMLPaser objectClassXMLPaser;
+	private ObjectClassXMLPaser objectClassXMLPaser;
 	
 	@ModelAttribute
 	public void ajaxAttribute(WebRequest request, Model model) {

src/main/java/com/spring/mvc/mini/web/ObjectClassesController.java

@@ -25,10 +25,10 @@ import com.spring.mvc.mini.xml.ObjectClassXMLPaser;
 @SessionAttributes("productList")
 public class ObjectClassesController {
 
-    static Logger LOG = LoggerFactory.getLogger(ObjectClassesController.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ObjectClassesController.class);
 
     @Autowired
-    ObjectClassXMLPaser objectClassXMLPaser;
+    private ObjectClassXMLPaser objectClassXMLPaser;
 
     @ModelAttribute
     public void ajaxAttribute(WebRequest request, Model model) {
@@ -42,7 +42,7 @@ public class ObjectClassesController {
         ArrayList<ObjectClass> ojbclslist = getObjectClasses();
 
         Collections.reverse(ojbclslist);
-        PagedListHolder<ArrayList<ObjectClass>> productList = new PagedListHolder(ojbclslist);
+        PagedListHolder productList = new PagedListHolder(ojbclslist);
         productList.setPageSize(100);
 
         model.addAttribute("productList", productList);
@@ -64,9 +64,7 @@ public class ObjectClassesController {
     public String handleObjectClassPagination(Model model, @ModelAttribute("jumppage") String jumppage, @ModelAttribute("productList") PagedListHolder<ArrayList<ObjectClass>> productList) {
 
         LOG.info("@RequestMapping(params={\"jumppage\"}, method = RequestMethod.GET)");
-        if (jumppage == null) {
-
-        } else {
+        if (jumppage != null) {
 
             if ("next".equals(jumppage)) {
                 productList.nextPage();
@@ -86,9 +84,7 @@ public class ObjectClassesController {
 
         LOG.info("@RequestMapping(params={\"searchcritical\"}, method = RequestMethod.GET)");
         ArrayList<ObjectClass> searchOjbclslist = null;
-        if (searchcritical == null) {
-
-        } else {
+        if (searchcritical != null) {
 
             ArrayList<ObjectClass> ojbclslist = getObjectClasses();
 
@@ -126,7 +122,7 @@ public class ObjectClassesController {
         }
     }
 
-    public int isInteger(String s) {
+    private int isInteger(String s) {
         int i;
         try {
             i = Integer.parseInt(s);

src/main/java/com/spring/mvc/mini/web/RequestStatusController.java

@@ -28,13 +28,13 @@ import com.spring.mvc.mini.pojo.UserInfo;
 @RequestMapping("/requeststatus")
 public class RequestStatusController {
 
-	static Logger LOGGER = LoggerFactory.getLogger(RequestStatusController.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(RequestStatusController.class);
 	
 	@Autowired
-	RequestStatusJsonParser requestStatusJsonParser;
+	private RequestStatusJsonParser requestStatusJsonParser;
 	
 	@Autowired
-	MailSender ms;
+	private MailSender ms;
 	
 	@ModelAttribute
 	public void ajaxAttribute(WebRequest request, Model model) {

src/main/java/com/spring/mvc/mini/web/UserInfoFormController.java

@@ -25,7 +25,7 @@ import com.spring.mvc.mini.pojo.UserInfo;
 public class UserInfoFormController {
 	
 	@Autowired
-	MailSender ms;
+	private MailSender ms;
 	
 	@ModelAttribute
 	public void ajaxAttribute(WebRequest request, Model model) {
@@ -68,7 +68,7 @@ public class UserInfoFormController {
 		}
 	}
 
-	public void loginAndSendMail(UserInfo userinfo) throws Exception{
+	private void loginAndSendMail(UserInfo userinfo) throws Exception{
 		
 		String subject = "Login successfully to mvc mini";
 		String text="Welcome you,"+userinfo.getUsername()+"!\r\nYou can reserve the object classes now.";

src/main/java/com/spring/mvc/mini/xml/ObjectClassXMLPaser.java

@@ -30,7 +30,7 @@ import com.spring.mvc.mini.svn.SVNHandler;
 @Component
 public class ObjectClassXMLPaser {
 
-    static Logger LOGGER = LoggerFactory.getLogger(ObjectClassXMLPaser.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ObjectClassXMLPaser.class);
 
     @Autowired
     private Properties properties;
@@ -88,15 +88,12 @@ public class ObjectClassXMLPaser {
     }
 
     private void setElementToObject(ObjectClass objectClass, Element node) {
-        objectClass.setId(node.getAttribute("id").toString());
-        objectClass.setAbbreviation(node.getAttribute("abbrev")
-                .toString());
+        objectClass.setId(node.getAttribute("id"));
+        objectClass.setAbbreviation(node.getAttribute("abbrev"));
         objectClass.setIntclass(Integer.parseInt(node.getAttribute("intclass")));
-        objectClass.setName(node.getAttribute("name").toString());
-        objectClass.setParents(node.getAttribute("parents")
-                .toString());
-        objectClass.setPackageName(node.getAttribute("adaID")
-                .toString());
+        objectClass.setName(node.getAttribute("name"));
+        objectClass.setParents(node.getAttribute("parents"));
+        objectClass.setPackageName(node.getAttribute("adaID"));
     }
 
     public void AddObjectClass(ObjectClass objectClass) {

src/main/java/org/springframework/mvc/extensions/ajax/AjaxUtils.java

@@ -6,11 +6,7 @@ public class AjaxUtils {
 
 	public static boolean isAjaxRequest(WebRequest webRequest) {
 		String requestedWith = webRequest.getHeader("X-Requested-With");
-		return requestedWith != null ? "XMLHttpRequest".equals(requestedWith) : false;
-	}
-
-	public static boolean isAjaxUploadRequest(WebRequest webRequest) {
-		return webRequest.getParameter("ajaxUpload") != null;
+		return requestedWith != null && "XMLHttpRequest".equals(requestedWith);
 	}
 
 	private AjaxUtils() {}

src/test/java/com/spring/mvc/mini/json/RequestStatusJsonParserTest1.java

@@ -18,7 +18,7 @@ import java.util.Date;
 public class RequestStatusJsonParserTest1 {
 
     @Resource
-    RequestStatusJsonParser requestStatusJsonParser;
+    private RequestStatusJsonParser requestStatusJsonParser;
 
     @Test
     public void test_writeStatus(){