提交 8a380577 编写于 作者: J Jerry Zhang

Merge pull request #6 from...

Merge pull request #6 from DevFactory/release/declarations-should-use-Java-collection-interfaces-such-as-List-rather-than-specific-implementation-classes-such-as-LinkedList-fix-1

squid:S1319 - Declarations should use Java collection interfaces such…
...@@ -11,7 +11,7 @@ import org.springframework.stereotype.Component; ...@@ -11,7 +11,7 @@ import org.springframework.stereotype.Component;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.List;
@Component @Component
public class RequestStatusJsonParser { public class RequestStatusJsonParser {
...@@ -23,16 +23,16 @@ public class RequestStatusJsonParser { ...@@ -23,16 +23,16 @@ public class RequestStatusJsonParser {
public int getMaxIntClass() { public int getMaxIntClass() {
ArrayList<RequestStatus> list = this.readStatus(); List<RequestStatus> list = this.readStatus();
ArrayList<ObjectClass> objectClasses = list.get(list.size() - 1).getObjectClassesType().getObjectClasses(); List<ObjectClass> objectClasses = list.get(list.size() - 1).getObjectClassesType().getObjectClasses();
return objectClasses.get(objectClasses.size() - 1).getIntclass(); return objectClasses.get(objectClasses.size() - 1).getIntclass();
} }
public int getLatestmocrid() { public int getLatestmocrid() {
ArrayList<RequestStatus> mrsList = this.readStatus(); List<RequestStatus> mrsList = this.readStatus();
return mrsList.get(mrsList.size() - 1).getmocrid(); return mrsList.get(mrsList.size() - 1).getmocrid();
} }
...@@ -48,7 +48,7 @@ public class RequestStatusJsonParser { ...@@ -48,7 +48,7 @@ public class RequestStatusJsonParser {
} }
public ArrayList<RequestStatus> readStatus() { public List<RequestStatus> readStatus() {
RequestStatusListType type = null; RequestStatusListType type = null;
......
package com.spring.mvc.mini.pojo; package com.spring.mvc.mini.pojo;
import java.util.ArrayList; import java.util.List;
public class ObjectClassesType { public class ObjectClassesType {
private ArrayList<ObjectClass> objectClasses; private List<ObjectClass> objectClasses;
public ArrayList<ObjectClass> getObjectClasses() { public List<ObjectClass> getObjectClasses() {
return objectClasses; return objectClasses;
} }
public void setObjectClasses(ArrayList<ObjectClass> objectClasses) { public void setObjectClasses(List<ObjectClass> objectClasses) {
this.objectClasses = objectClasses; this.objectClasses = objectClasses;
} }
......
package com.spring.mvc.mini.pojo; package com.spring.mvc.mini.pojo;
import java.util.ArrayList; import java.util.List;
public class RequestStatusListType { public class RequestStatusListType {
private ArrayList<RequestStatus> requestStatuses; private List<RequestStatus> requestStatuses;
public ArrayList<RequestStatus> getRequestStatuses() { public List<RequestStatus> getRequestStatuses() {
return requestStatuses; return requestStatuses;
} }
public void setRequestStatuses(ArrayList<RequestStatus> requestStatuses) { public void setRequestStatuses(List<RequestStatus> requestStatuses) {
this.requestStatuses = requestStatuses; this.requestStatuses = requestStatuses;
} }
......
package com.spring.mvc.mini.schedule; package com.spring.mvc.mini.schedule;
import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.List;
import javax.mail.Address; import javax.mail.Address;
import javax.mail.internet.InternetAddress; import javax.mail.internet.InternetAddress;
...@@ -45,7 +45,7 @@ public class ScheduleFileUpdator { ...@@ -45,7 +45,7 @@ public class ScheduleFileUpdator {
LOG.info("Scheduler start at:" + currentTime); LOG.info("Scheduler start at:" + currentTime);
ArrayList<RequestStatus> requestStatuses = jsonParser.readStatus(); List<RequestStatus> requestStatuses = jsonParser.readStatus();
for (RequestStatus status : requestStatuses) { for (RequestStatus status : requestStatuses) {
...@@ -88,7 +88,7 @@ public class ScheduleFileUpdator { ...@@ -88,7 +88,7 @@ public class ScheduleFileUpdator {
return s.toString(); return s.toString();
} }
private void setCommitDateAndStatus(Date currentTime, ArrayList<RequestStatus> requestStatuses, RequestStatus status) { private void setCommitDateAndStatus(Date currentTime, List<RequestStatus> requestStatuses, RequestStatus status) {
int requestStatusIndex; int requestStatusIndex;
requestStatusIndex = requestStatuses.indexOf(status); requestStatusIndex = requestStatuses.indexOf(status);
requestStatuses.get(requestStatusIndex).setCommitDate(currentTime); requestStatuses.get(requestStatusIndex).setCommitDate(currentTime);
......
package com.spring.mvc.mini.validation; package com.spring.mvc.mini.validation;
import java.util.ArrayList; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
...@@ -14,9 +14,9 @@ public class ObjectClassDataValidator { ...@@ -14,9 +14,9 @@ public class ObjectClassDataValidator {
@Autowired @Autowired
private ObjectClassXMLPaser objectClassXMLPaser; private ObjectClassXMLPaser objectClassXMLPaser;
public void checkData(ArrayList<ObjectClass> objclsListFormIn) throws Exception{ public void checkData(List<ObjectClass> objclsListFormIn) throws Exception{
ArrayList<ObjectClass> objclsListXmlIn = objectClassXMLPaser.objectClassMapping(); List<ObjectClass> objclsListXmlIn = objectClassXMLPaser.objectClassMapping();
for (ObjectClass objclsItemFormIn:objclsListFormIn){ for (ObjectClass objclsItemFormIn:objclsListFormIn){
......
...@@ -4,6 +4,7 @@ import java.text.SimpleDateFormat; ...@@ -4,6 +4,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.List;
import javax.mail.Address; import javax.mail.Address;
import javax.mail.internet.InternetAddress; import javax.mail.internet.InternetAddress;
...@@ -72,7 +73,7 @@ public class ObjectClassFormController { ...@@ -72,7 +73,7 @@ public class ObjectClassFormController {
public void handleObjectClassForm(Model model, @ModelAttribute("userinfo") UserInfo userinfo, @ModelAttribute("mocrid") String mocrid) { public void handleObjectClassForm(Model model, @ModelAttribute("userinfo") UserInfo userinfo, @ModelAttribute("mocrid") String mocrid) {
ObjectClassesType objectClassesType = new ObjectClassesType(); ObjectClassesType objectClassesType = new ObjectClassesType();
ArrayList<ObjectClass> objectClasses = new ArrayList<ObjectClass>(); List<ObjectClass> objectClasses = new ArrayList<ObjectClass>();
objectClasses.add(createObjectClassInstance(0, userinfo, mocrid)); objectClasses.add(createObjectClassInstance(0, userinfo, mocrid));
objectClassesType.setObjectClasses(objectClasses); objectClassesType.setObjectClasses(objectClasses);
...@@ -85,7 +86,7 @@ public class ObjectClassFormController { ...@@ -85,7 +86,7 @@ public class ObjectClassFormController {
@RequestMapping(params = {"objclscount"}, method = RequestMethod.POST) @RequestMapping(params = {"objclscount"}, method = RequestMethod.POST)
public void handleObjectClassFormWithParam(@Valid ObjectClassesType objectClassesType, @ModelAttribute("userinfo") UserInfo userinfo, @ModelAttribute("mocrid") String mocrid, @RequestParam String ObjectClassCount, Model model) { public void handleObjectClassFormWithParam(@Valid ObjectClassesType objectClassesType, @ModelAttribute("userinfo") UserInfo userinfo, @ModelAttribute("mocrid") String mocrid, @RequestParam String ObjectClassCount, Model model) {
ArrayList<ObjectClass> objectClasses = objectClassesType.getObjectClasses(); List<ObjectClass> objectClasses = objectClassesType.getObjectClasses();
objectClasses.add(createObjectClassInstance(Integer.parseInt(ObjectClassCount), userinfo, mocrid)); objectClasses.add(createObjectClassInstance(Integer.parseInt(ObjectClassCount), userinfo, mocrid));
objectClassesType.setObjectClasses(objectClasses); objectClassesType.setObjectClasses(objectClasses);
model.addAttribute("ObjectClassesType", objectClassesType); model.addAttribute("ObjectClassesType", objectClassesType);
...@@ -103,7 +104,7 @@ public class ObjectClassFormController { ...@@ -103,7 +104,7 @@ public class ObjectClassFormController {
return null; return null;
} }
ArrayList<ObjectClass> objectClasses = objectClassesType.getObjectClasses(); List<ObjectClass> objectClasses = objectClassesType.getObjectClasses();
try { try {
objectClassDataValidator.checkData(objectClasses); objectClassDataValidator.checkData(objectClasses);
...@@ -125,7 +126,7 @@ public class ObjectClassFormController { ...@@ -125,7 +126,7 @@ public class ObjectClassFormController {
s.setStatus(StatusType.ongoing); s.setStatus(StatusType.ongoing);
s.setUserinfo(userinfo); s.setUserinfo(userinfo);
ArrayList<RequestStatus> l = requestStatusJsonParser.readStatus(); List<RequestStatus> l = requestStatusJsonParser.readStatus();
l.add(s); l.add(s);
RequestStatusListType type = new RequestStatusListType(); RequestStatusListType type = new RequestStatusListType();
...@@ -168,7 +169,7 @@ public class ObjectClassFormController { ...@@ -168,7 +169,7 @@ public class ObjectClassFormController {
return textsb.toString(); return textsb.toString();
} }
private String constructMailSubject(@ModelAttribute("mocrid") String mocrid, ArrayList<ObjectClass> objectClasses) { private String constructMailSubject(@ModelAttribute("mocrid") String mocrid, List<ObjectClass> objectClasses) {
StringBuffer subjectsb = new StringBuffer(); StringBuffer subjectsb = new StringBuffer();
subjectsb.append("Forthcoming approval of MO CR "); subjectsb.append("Forthcoming approval of MO CR ");
subjectsb.append(mocrid); subjectsb.append(mocrid);
...@@ -179,7 +180,7 @@ public class ObjectClassFormController { ...@@ -179,7 +180,7 @@ public class ObjectClassFormController {
return subjectsb.toString(); return subjectsb.toString();
} }
private void constructDebugMessage(ArrayList<ObjectClass> objectClasses) { private void constructDebugMessage(List<ObjectClass> objectClasses) {
StringBuffer debugmessage = new StringBuffer(); StringBuffer debugmessage = new StringBuffer();
for (ObjectClass objcls : objectClasses) { for (ObjectClass objcls : objectClasses) {
debugmessage.append(objcls); debugmessage.append(objcls);
......
...@@ -2,6 +2,7 @@ package com.spring.mvc.mini.web; ...@@ -2,6 +2,7 @@ package com.spring.mvc.mini.web;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -40,7 +41,7 @@ public class ObjectClassesController { ...@@ -40,7 +41,7 @@ public class ObjectClassesController {
@RequestMapping(method = RequestMethod.GET) @RequestMapping(method = RequestMethod.GET)
public String enrichobjectClassesType(Model model, @ModelAttribute("page") String page) { public String enrichobjectClassesType(Model model, @ModelAttribute("page") String page) {
ArrayList<ObjectClass> ojbclslist = getObjectClasses(); List<ObjectClass> ojbclslist = getObjectClasses();
Collections.reverse(ojbclslist); Collections.reverse(ojbclslist);
PagedListHolder productList = new PagedListHolder(ojbclslist); PagedListHolder productList = new PagedListHolder(ojbclslist);
...@@ -50,8 +51,8 @@ public class ObjectClassesController { ...@@ -50,8 +51,8 @@ public class ObjectClassesController {
return null; return null;
} }
private ArrayList<ObjectClass> getObjectClasses() { private List<ObjectClass> getObjectClasses() {
ArrayList<ObjectClass> ojbclslist = null; List<ObjectClass> ojbclslist = null;
try { try {
ojbclslist = objectClassXMLPaser.objectClassMapping(); ojbclslist = objectClassXMLPaser.objectClassMapping();
...@@ -84,10 +85,10 @@ public class ObjectClassesController { ...@@ -84,10 +85,10 @@ public class ObjectClassesController {
public String searchObjectClass(Model model, @ModelAttribute("searchcritical") String searchcritical) { public String searchObjectClass(Model model, @ModelAttribute("searchcritical") String searchcritical) {
LOG.info("@RequestMapping(params={\"searchcritical\"}, method = RequestMethod.GET)"); LOG.info("@RequestMapping(params={\"searchcritical\"}, method = RequestMethod.GET)");
ArrayList<ObjectClass> searchOjbclslist = null; List<ObjectClass> searchOjbclslist = null;
if (searchcritical != null) { if (searchcritical != null) {
ArrayList<ObjectClass> ojbclslist = getObjectClasses(); List<ObjectClass> ojbclslist = getObjectClasses();
searchOjbclslist = new ArrayList<ObjectClass>(); searchOjbclslist = new ArrayList<ObjectClass>();
for (ObjectClass ojbcls : ojbclslist) { for (ObjectClass ojbcls : ojbclslist) {
......
package com.spring.mvc.mini.web; package com.spring.mvc.mini.web;
import java.util.ArrayList; import java.util.List;
import javax.mail.Address; import javax.mail.Address;
import javax.mail.internet.InternetAddress; import javax.mail.internet.InternetAddress;
...@@ -51,7 +51,7 @@ public class RequestStatusController { ...@@ -51,7 +51,7 @@ public class RequestStatusController {
@RequestMapping(params={"mocrid"},method=RequestMethod.GET) @RequestMapping(params={"mocrid"},method=RequestMethod.GET)
public void enrichObjectClassFormWithParam(@RequestParam String mocrid, Model model) { public void enrichObjectClassFormWithParam(@RequestParam String mocrid, Model model) {
ArrayList<RequestStatus> mrsList = requestStatusJsonParser.readStatus(); List<RequestStatus> mrsList = requestStatusJsonParser.readStatus();
for(RequestStatus mrs:mrsList){ for(RequestStatus mrs:mrsList){
...@@ -69,7 +69,7 @@ public class RequestStatusController { ...@@ -69,7 +69,7 @@ public class RequestStatusController {
Model model, RedirectAttributes redirectAttrs) { Model model, RedirectAttributes redirectAttrs) {
if(requestStatus.getObjectClassesType() == null){ if(requestStatus.getObjectClassesType() == null){
ArrayList<RequestStatus> mrsList = requestStatusJsonParser.readStatus(); List<RequestStatus> mrsList = requestStatusJsonParser.readStatus();
if (isMocridEquals(requestStatus, model, mrsList)){ if (isMocridEquals(requestStatus, model, mrsList)){
model.addAttribute(MESSAGE, "SUCCESS:MO CR ID:"+requestStatus.getmocrid()+" is presenting."); model.addAttribute(MESSAGE, "SUCCESS:MO CR ID:"+requestStatus.getmocrid()+" is presenting.");
...@@ -80,7 +80,7 @@ public class RequestStatusController { ...@@ -80,7 +80,7 @@ public class RequestStatusController {
} }
} }
ArrayList<RequestStatus> requestStatuses = requestStatusJsonParser.readStatus(); List<RequestStatus> requestStatuses = requestStatusJsonParser.readStatus();
int index = 0; int index = 0;
for (RequestStatus item:requestStatuses){ for (RequestStatus item:requestStatuses){
...@@ -117,7 +117,7 @@ public class RequestStatusController { ...@@ -117,7 +117,7 @@ public class RequestStatusController {
} }
} }
private String constructMailText(@ModelAttribute(REQUEST_STATUS) RequestStatus requestStatus, ArrayList<RequestStatus> requestStatuses, int index) { private String constructMailText(@ModelAttribute(REQUEST_STATUS) RequestStatus requestStatus, List<RequestStatus> requestStatuses, int index) {
StringBuffer textsb = new StringBuffer(); StringBuffer textsb = new StringBuffer();
textsb.append("New Comments: \r\n"); textsb.append("New Comments: \r\n");
textsb.append(requestStatus.getComments()); textsb.append(requestStatus.getComments());
...@@ -143,7 +143,7 @@ public class RequestStatusController { ...@@ -143,7 +143,7 @@ public class RequestStatusController {
return subjectsb.toString(); return subjectsb.toString();
} }
private boolean isMocridEquals(@ModelAttribute(REQUEST_STATUS) RequestStatus requestStatus, Model model, ArrayList<RequestStatus> mrsList) { private boolean isMocridEquals(@ModelAttribute(REQUEST_STATUS) RequestStatus requestStatus, Model model, List<RequestStatus> mrsList) {
boolean boo = false; boolean boo = false;
for(RequestStatus mrs:mrsList){ for(RequestStatus mrs:mrsList){
......
...@@ -20,6 +20,7 @@ import java.nio.file.Files; ...@@ -20,6 +20,7 @@ import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
@Component @Component
public class ObjectClassXMLPaser { public class ObjectClassXMLPaser {
...@@ -32,7 +33,7 @@ public class ObjectClassXMLPaser { ...@@ -32,7 +33,7 @@ public class ObjectClassXMLPaser {
@Autowired @Autowired
private SVNHandler svnHandler; private SVNHandler svnHandler;
public ArrayList<ObjectClass> objectClassMapping() throws Exception { public List<ObjectClass> objectClassMapping() throws Exception {
LOGGER.info("Start to checkout"); LOGGER.info("Start to checkout");
svnHandler.svnCheckout(); svnHandler.svnCheckout();
...@@ -44,7 +45,7 @@ public class ObjectClassXMLPaser { ...@@ -44,7 +45,7 @@ public class ObjectClassXMLPaser {
Document document = builder.parse(objectClassesFile); Document document = builder.parse(objectClassesFile);
ArrayList<ObjectClass> objectClasses = new ArrayList<>(); List<ObjectClass> objectClasses = new ArrayList<>();
NodeList nodeList = document.getDocumentElement().getChildNodes(); NodeList nodeList = document.getDocumentElement().getChildNodes();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册