diff --git a/src/main/java/hudson/plugins/nsiq/NSiqBuilder.java b/src/main/java/hudson/plugins/nsiq/NSiqBuilder.java index f425aa6..0a6f863 100644 --- a/src/main/java/hudson/plugins/nsiq/NSiqBuilder.java +++ b/src/main/java/hudson/plugins/nsiq/NSiqBuilder.java @@ -24,7 +24,6 @@ import net.sf.json.JSONObject; -import org.apache.commons.lang.StringUtils; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.StaplerRequest; @@ -75,7 +74,7 @@ private String[] getSourceDirs() { for (String dir : splitted) { String trim = dir.trim(); - if (StringUtils.isNotEmpty(trim)) { + if ((trim != null && trim.length() > 0)) { result.add(trim); } } @@ -95,7 +94,7 @@ public BuildStepDescriptor getDescriptor() { * 프로젝트 빌드가 완료된 후, {@link Builder}가 실제 수행하는 메소드이다. */ public boolean perform(AbstractBuild build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException { - if (StringUtils.isEmpty(DESCRIPTOR.getNsiqPath())) { + if ((DESCRIPTOR.getNsiqPath() == null || DESCRIPTOR.getNsiqPath().length() == 0)) { listener.getLogger().println("[" + Constant.DISPLAY_NAME + "] " + "N'SIQ Collector path is not configured..."); return true; } @@ -115,7 +114,7 @@ public boolean perform(AbstractBuild build, Launcher launcher, BuildListen args.add("-c", NSiqUtil.getComplexityFile(moduleRoot).getRemote()); // 파일 필터 직접 설정이 되어 있으면, 파일 필터를 실행시 지정한다. - if (fileFilter != null && StringUtils.isNotEmpty(fileFilter.trim())) { + if (fileFilter != null && (fileFilter.trim() != null && fileFilter.trim().length() > 0)) { FilePath filterFilePath = new FilePath(moduleRoot, fileFilter.trim()); if (filterFilePath.exists()) { diff --git a/src/main/java/hudson/plugins/nsiq/NSiqTarget.java b/src/main/java/hudson/plugins/nsiq/NSiqTarget.java index d17cf7a..af1256f 100644 --- a/src/main/java/hudson/plugins/nsiq/NSiqTarget.java +++ b/src/main/java/hudson/plugins/nsiq/NSiqTarget.java @@ -27,7 +27,7 @@ import javax.servlet.ServletException; -import org.apache.commons.lang.mutable.MutableInt; +import java.util.concurrent.atomic.AtomicInteger; import org.jfree.chart.JFreeChart; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; @@ -150,18 +150,18 @@ private void parseSummary(List nsiqResults) { int comp = 0; int totalLoc = 0; int codeLoc = 0; - Map locPerType = new HashMap(); + Map locPerType = new HashMap(); for (NSiqResult nsiq : nsiqResults) { totalLoc += nsiq.getTotalLoc(); codeLoc += nsiq.getCodeLoc(); - MutableInt eachLocPerType = locPerType.get(nsiq.geteType()); + AtomicInteger eachLocPerType = locPerType.get(nsiq.geteType()); if (eachLocPerType == null) { - eachLocPerType = new MutableInt(); + eachLocPerType = new AtomicInteger(); locPerType.put(nsiq.geteType(), eachLocPerType); } - eachLocPerType.add(nsiq.getCodeLoc()); + eachLocPerType.addAndGet(nsiq.getCodeLoc()); if (nsiq.getFunctions() == null) { continue; diff --git a/src/main/java/hudson/plugins/nsiq/NSiqUtil.java b/src/main/java/hudson/plugins/nsiq/NSiqUtil.java index 178ba81..86bdb3b 100644 --- a/src/main/java/hudson/plugins/nsiq/NSiqUtil.java +++ b/src/main/java/hudson/plugins/nsiq/NSiqUtil.java @@ -17,7 +17,7 @@ import java.util.Map; import java.util.Map.Entry; -import org.apache.commons.lang.mutable.MutableInt; +import java.util.concurrent.atomic.AtomicInteger; import org.jfree.chart.ChartFactory; import org.jfree.chart.JFreeChart; import org.jfree.chart.axis.CategoryAxis; @@ -185,10 +185,10 @@ public static JFreeChart createDistrubutionChart(CategoryDataset dataset, String return chart; } - public static Map convertLangDistMap(Map locPerType) { + public static Map convertLangDistMap(Map locPerType) { Map langDistMap = new HashMap(); - for (Entry entry : locPerType.entrySet()) { - langDistMap.put(entry.getKey(), entry.getValue().toInteger()); + for (Entry entry : locPerType.entrySet()) { + langDistMap.put(entry.getKey(), entry.getValue().get()); } return langDistMap; } diff --git a/src/main/java/hudson/plugins/nsiq/model/Complexity.java b/src/main/java/hudson/plugins/nsiq/model/Complexity.java index 382ea5c..94a7d12 100644 --- a/src/main/java/hudson/plugins/nsiq/model/Complexity.java +++ b/src/main/java/hudson/plugins/nsiq/model/Complexity.java @@ -2,8 +2,6 @@ import hudson.plugins.nsiq.NSiqAware; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; /** * @@ -111,7 +109,12 @@ public int getLowDist() { @Override public String toString() { - return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); + return "Complexity[" + + "function=" + function + + ",complexity=" + complexity + + ",totalLoc=" + totalLoc + + ",codeLoc=" + codeLoc + + "]"; } public int compareTo(Complexity complexity) { diff --git a/src/main/java/hudson/plugins/nsiq/model/Loc.java b/src/main/java/hudson/plugins/nsiq/model/Loc.java index d73b4bb..170072a 100644 --- a/src/main/java/hudson/plugins/nsiq/model/Loc.java +++ b/src/main/java/hudson/plugins/nsiq/model/Loc.java @@ -1,7 +1,5 @@ package hudson.plugins.nsiq.model; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; /** * @@ -57,6 +55,12 @@ public void setCodeLoc(int codeLoc) { @Override public String toString() { - return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); + return "Loc[" + + "target=" + target + + ",type=" + type + + ",file=" + file + + ",totalLoc=" + totalLoc + + ",codeLoc=" + codeLoc + + "]"; } } diff --git a/src/main/java/hudson/plugins/nsiq/model/NSiqResult.java b/src/main/java/hudson/plugins/nsiq/model/NSiqResult.java index 8c94d70..3216e50 100644 --- a/src/main/java/hudson/plugins/nsiq/model/NSiqResult.java +++ b/src/main/java/hudson/plugins/nsiq/model/NSiqResult.java @@ -4,8 +4,6 @@ import java.util.List; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; /** * @@ -100,7 +98,16 @@ public int getLowCount() { @Override public String toString() { - return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); + return "NSiqResult[" + + "eType=" + eType + + ",type=" + type + + ",dir=" + dir + + ",file=" + file + + ",complexity=" + complexity + + ",functions=" + functions + + ",totalLoc=" + totalLoc + + ",codeLoc=" + codeLoc + + "]"; } @Override diff --git a/src/main/java/hudson/plugins/nsiq/model/NSiqSummary.java b/src/main/java/hudson/plugins/nsiq/model/NSiqSummary.java index bde3356..faff268 100644 --- a/src/main/java/hudson/plugins/nsiq/model/NSiqSummary.java +++ b/src/main/java/hudson/plugins/nsiq/model/NSiqSummary.java @@ -4,8 +4,6 @@ import java.util.Map; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; /** * @@ -80,7 +78,15 @@ public String getAverageComplexity() { @Override public String toString() { - return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); + return "NSiqSummary[" + + "total=" + total + + ",high=" + high + + ",low=" + low + + ",complexity=" + complexity + + ",totalLoc=" + totalLoc + + ",codeLoc=" + codeLoc + + ",locPerType=" + locPerType + + "]"; } public void setLocPerType(Map locPerType) { diff --git a/src/main/java/hudson/plugins/nsiq/parser/NSiqResultParser.java b/src/main/java/hudson/plugins/nsiq/parser/NSiqResultParser.java index 8497f6b..e43254e 100644 --- a/src/main/java/hudson/plugins/nsiq/parser/NSiqResultParser.java +++ b/src/main/java/hudson/plugins/nsiq/parser/NSiqResultParser.java @@ -15,8 +15,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.mutable.MutableInt; +import java.util.concurrent.atomic.AtomicInteger; /** * @@ -40,7 +39,7 @@ public NSiqResultParser(List locList, List complexityList) { private String getDir(String filename, String target) { File file = new File(filename); String dir = file.getParent(); - return StringUtils.isEmpty(dir) ? "[" + target + "]" : dir; + return (dir == null || dir.length() == 0) ? "[" + target + "]" : dir; } /** @@ -81,19 +80,19 @@ public List parse() { int comp = 0; int totalLoc = 0; int codeLoc = 0; - Map locPerType = new HashMap(); + Map locPerType = new HashMap(); for (Loc loc : locList) { totalLoc += loc.getTotalLoc(); codeLoc += loc.getCodeLoc(); result.add(getNSiqResult(loc)); - MutableInt eachLocPerType = locPerType.get(loc.getType()); + AtomicInteger eachLocPerType = locPerType.get(loc.getType()); if (eachLocPerType == null) { - eachLocPerType = new MutableInt(); + eachLocPerType = new AtomicInteger(); locPerType.put(loc.getType(), eachLocPerType); } - eachLocPerType.add(loc.getCodeLoc()); + eachLocPerType.addAndGet(loc.getCodeLoc()); } for (Complexity complexity : complexityList) { diff --git a/src/test/java/hudson/plugins/nsiq/NSiqTargetTest.java b/src/test/java/hudson/plugins/nsiq/NSiqTargetTest.java index df91c2c..a8ec209 100644 --- a/src/test/java/hudson/plugins/nsiq/NSiqTargetTest.java +++ b/src/test/java/hudson/plugins/nsiq/NSiqTargetTest.java @@ -4,7 +4,6 @@ import java.io.IOException; -import org.apache.commons.lang.StringUtils; import org.junit.Test; import org.springframework.core.io.ClassPathResource; @@ -28,7 +27,7 @@ private String join(String[] array, String delimiter) { String result = sb.toString(); - if (StringUtils.isEmpty(result)) { + if ((result == null || result.length() == 0)) { return result; }