OODT-888 string concat to string builders
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/48aad4bc Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/48aad4bc Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/48aad4bc Branch: refs/heads/master Commit: 48aad4bc724adc662682ab93bef8aa4e6982d922 Parents: 1f7b8df Author: Tom Barber <[email protected]> Authored: Sun Oct 25 11:46:23 2015 +0000 Committer: Tom Barber <[email protected]> Committed: Sun Oct 25 11:46:23 2015 +0000 ---------------------------------------------------------------------- .../catalog/cli/action/PagedQueryCliAction.java | 6 +- .../cas/catalog/cli/action/QueryCliAction.java | 6 +- .../cli/action/ReducedPagedQueryCliAction.java | 6 +- .../cli/action/ReducedQueryCliAction.java | 6 +- .../cas/catalog/query/parser/TokenMgrError.java | 2 +- .../apache/oodt/cas/cli/util/CmdLineUtils.java | 9 ++- .../apache/oodt/commons/exec/EnvUtilities.java | 2 +- .../commons/filter/TimeEventWeightedHash.java | 2 +- .../apache/oodt/cas/crawl/ProductCrawler.java | 3 +- .../FilemgrUniquenessCheckComparator.java | 2 +- .../catalog/solr/DefaultProductSerializer.java | 6 +- .../cli/action/AbstractQueryCliAction.java | 2 +- .../oodt/cas/filemgr/tools/QueryTool.java | 2 +- .../oodt/cas/filemgr/util/QueryUtils.java | 2 +- .../filemgr/structs/type/TestTypeHandler.java | 14 ++-- .../oodt/grid/RestfulProductQueryServlet.java | 2 +- .../preconditions/ExistanceCheckComparator.java | 2 +- .../LastModifiedCheckComparator.java | 11 ++- .../ProductNameCheckComparator.java | 12 ++-- .../SubProductExistenceCheckComparator.java | 8 +-- .../oodt/opendapps/util/ProfileChecker.java | 6 +- .../oodt/opendapps/util/ProfileSerializer.java | 4 +- .../oodt/cas/pge/staging/TestFileStager.java | 2 +- .../pushpull/filerestrictions/VirtualFile.java | 7 +- .../parsers/ClassNoaaEmailParser.java | 2 +- .../processor/WorkflowProcessorHelper.java | 72 ++++++++------------ .../oodt/cas/workflow/examples/MailTask.java | 2 +- .../org/apache/oodt/xmlps/structs/CDERow.java | 2 +- 28 files changed, 86 insertions(+), 116 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/48aad4bc/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/PagedQueryCliAction.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/PagedQueryCliAction.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/PagedQueryCliAction.java index fe30a63..efbe7f5 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/PagedQueryCliAction.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/PagedQueryCliAction.java @@ -67,10 +67,8 @@ public class PagedQueryCliAction extends CatalogServiceCliAction { + tMet.getCatalogIds() + " ; Metadata: ("); StringBuilder sb = new StringBuilder(""); for (Object metKey : tMet.getMetadata().getHashtable().keySet()) { - sb.append(metKey - + "=" - + tMet.getMetadata().getAllMetadata((String) metKey) - .toString().replaceAll("[\\[\\]]", "'") + ", "); + sb.append(metKey).append("=").append(tMet.getMetadata().getAllMetadata((String) metKey) + .toString().replaceAll("[\\[\\]]", "'")).append(", "); } printer.println(sb.substring(0, sb.length() - 2) + ")"); } http://git-wip-us.apache.org/repos/asf/oodt/blob/48aad4bc/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/QueryCliAction.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/QueryCliAction.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/QueryCliAction.java index 0152990..1954297 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/QueryCliAction.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/QueryCliAction.java @@ -62,10 +62,8 @@ public class QueryCliAction extends CatalogServiceCliAction { + tMet.getCatalogIds() + " ; Metadata: ("); StringBuilder sb = new StringBuilder(""); for (Object metKey : tMet.getMetadata().getHashtable().keySet()) { - sb.append(metKey - + "=" - + tMet.getMetadata().getAllMetadata((String) metKey) - .toString().replaceAll("[\\[\\]]", "'") + ", "); + sb.append(metKey).append("=").append(tMet.getMetadata().getAllMetadata((String) metKey) + .toString().replaceAll("[\\[\\]]", "'")).append(", "); } printer.println(sb.substring(0, sb.length() - 2) + ")"); } http://git-wip-us.apache.org/repos/asf/oodt/blob/48aad4bc/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/ReducedPagedQueryCliAction.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/ReducedPagedQueryCliAction.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/ReducedPagedQueryCliAction.java index 0620a55..49274ef 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/ReducedPagedQueryCliAction.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/ReducedPagedQueryCliAction.java @@ -72,10 +72,8 @@ public class ReducedPagedQueryCliAction extends CatalogServiceCliAction { for (String termName : this.termNames) { List<String> values = tMet.getMetadata().getAllMetadata( (String) termName); - sb.append(termName - + " = '" - + (values == null ? "null" : StringUtils.join( - values.iterator(), ",")) + "', "); + sb.append(termName).append(" = '").append(values == null ? "null" : StringUtils.join( + values.iterator(), ",")).append("', "); } printer.println(sb.substring(0, sb.length() - 2)); } http://git-wip-us.apache.org/repos/asf/oodt/blob/48aad4bc/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/ReducedQueryCliAction.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/ReducedQueryCliAction.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/ReducedQueryCliAction.java index 0e374c2..e61d5b9 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/ReducedQueryCliAction.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/ReducedQueryCliAction.java @@ -66,10 +66,8 @@ public class ReducedQueryCliAction extends CatalogServiceCliAction { for (String termName : this.termNames) { List<String> values = tMet.getMetadata().getAllMetadata( (String) termName); - sb.append(termName - + " = '" - + (values == null ? "null" : StringUtils.join( - values.iterator(), ",")) + "', "); + sb.append(termName).append(" = '").append(values == null ? "null" : StringUtils.join( + values.iterator(), ",")).append("', "); } printer.println(sb.substring(0, sb.length() - 2)); } http://git-wip-us.apache.org/repos/asf/oodt/blob/48aad4bc/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/TokenMgrError.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/TokenMgrError.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/TokenMgrError.java index 8ea8f26..0dc612a 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/TokenMgrError.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/TokenMgrError.java @@ -82,7 +82,7 @@ public class TokenMgrError extends Error default: if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) { String s = "0000" + Integer.toString(ch, 16); - retval.append("\\u" + s.substring(s.length() - 4, s.length())); + retval.append("\\u").append(s.substring(s.length() - 4, s.length())); } else { retval.append(ch); } http://git-wip-us.apache.org/repos/asf/oodt/blob/48aad4bc/cli/src/main/java/org/apache/oodt/cas/cli/util/CmdLineUtils.java ---------------------------------------------------------------------- diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/util/CmdLineUtils.java b/cli/src/main/java/org/apache/oodt/cas/cli/util/CmdLineUtils.java index c23f8bb..473acba 100755 --- a/cli/src/main/java/org/apache/oodt/cas/cli/util/CmdLineUtils.java +++ b/cli/src/main/java/org/apache/oodt/cas/cli/util/CmdLineUtils.java @@ -1053,14 +1053,13 @@ public class CmdLineUtils { StringBuffer curLine = null; for (int i = 0; i < splitStrings.length; i++) { curLine = new StringBuffer(""); - curLine.append(splitStrings[i] + " "); + curLine.append(splitStrings[i]).append(" "); for (; i + 1 < splitStrings.length && curLine.length() + splitStrings[i + 1].length() <= (endIndex - startIndex); i++) - curLine.append(splitStrings[i + 1] + " "); + curLine.append(splitStrings[i + 1]).append(" "); - outputString.append(StringUtils.repeat(" ", startIndex) - + curLine.toString() + "\n"); + outputString.append(StringUtils.repeat(" ", startIndex)).append(curLine.toString()).append("\n"); } return outputString.toString(); } @@ -1110,7 +1109,7 @@ public class CmdLineUtils { } else if (type.equals(String.class)) { StringBuilder combinedString = new StringBuilder(""); for (String value : values) - combinedString.append(value + " "); + combinedString.append(value).append(" "); return Lists.newArrayList(combinedString.toString().trim()); } else { List<Object> objects = new LinkedList<Object>(); http://git-wip-us.apache.org/repos/asf/oodt/blob/48aad4bc/commons/src/main/java/org/apache/oodt/commons/exec/EnvUtilities.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/exec/EnvUtilities.java b/commons/src/main/java/org/apache/oodt/commons/exec/EnvUtilities.java index e224480..1cf857a 100644 --- a/commons/src/main/java/org/apache/oodt/commons/exec/EnvUtilities.java +++ b/commons/src/main/java/org/apache/oodt/commons/exec/EnvUtilities.java @@ -156,7 +156,7 @@ public final class EnvUtilities { while ((line = reader.readLine()) != null) { // fix the line line = line.replaceAll("\\\\", "\\\\\\\\"); - buf.append(line + "\n"); + buf.append(line).append("\n"); } if (reader != null) { http://git-wip-us.apache.org/repos/asf/oodt/blob/48aad4bc/commons/src/main/java/org/apache/oodt/commons/filter/TimeEventWeightedHash.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/filter/TimeEventWeightedHash.java b/commons/src/main/java/org/apache/oodt/commons/filter/TimeEventWeightedHash.java index 528e395..86142dd 100644 --- a/commons/src/main/java/org/apache/oodt/commons/filter/TimeEventWeightedHash.java +++ b/commons/src/main/java/org/apache/oodt/commons/filter/TimeEventWeightedHash.java @@ -380,7 +380,7 @@ public class TimeEventWeightedHash { StringBuffer output = new StringBuffer(""); for (TimeEventNode node : list) { output.append(spacer); - output.append(node.te + " -- " + (curPathWeight + node.te.getDuration()) + "\n"); + output.append(node.te).append(" -- ").append(curPathWeight + node.te.getDuration()).append("\n"); output.append(printNodes(node.getChildren().getList(), " " + spacer, curPathWeight + node.te.getDuration())); } return output; http://git-wip-us.apache.org/repos/asf/oodt/blob/48aad4bc/crawler/src/main/java/org/apache/oodt/cas/crawl/ProductCrawler.java ---------------------------------------------------------------------- diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/ProductCrawler.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/ProductCrawler.java index 2a7966a..e9f4878 100644 --- a/crawler/src/main/java/org/apache/oodt/cas/crawl/ProductCrawler.java +++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/ProductCrawler.java @@ -236,8 +236,7 @@ public abstract class ProductCrawler extends ProductCrawlerBean { try { action.validate(); } catch (Exception e) { - actionErrors.append(" " + action.getId() + ": " + e.getMessage() - + "\n"); + actionErrors.append(" ").append(action.getId()).append(": ").append(e.getMessage()).append("\n"); } } if (actionErrors.length() > 0) { http://git-wip-us.apache.org/repos/asf/oodt/blob/48aad4bc/crawler/src/main/java/org/apache/oodt/cas/crawl/comparator/FilemgrUniquenessCheckComparator.java ---------------------------------------------------------------------- diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/comparator/FilemgrUniquenessCheckComparator.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/comparator/FilemgrUniquenessCheckComparator.java index c172305..5db51e5 100644 --- a/crawler/src/main/java/org/apache/oodt/cas/crawl/comparator/FilemgrUniquenessCheckComparator.java +++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/comparator/FilemgrUniquenessCheckComparator.java @@ -51,7 +51,7 @@ public class FilemgrUniquenessCheckComparator extends try { boolean returnVal = new XmlRpcFileManagerClient(new URL( this.filemgrUrl)).hasProduct(product.getName()); - return new Boolean(returnVal).compareTo(compareItem); + return Boolean.valueOf(returnVal).compareTo(compareItem); } catch (Exception e) { throw new PreconditionComparatorException( "Failed to check for product " + product + " : " http://git-wip-us.apache.org/repos/asf/oodt/blob/48aad4bc/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/DefaultProductSerializer.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/DefaultProductSerializer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/DefaultProductSerializer.java index 5de3afe..82d13ec 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/DefaultProductSerializer.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/DefaultProductSerializer.java @@ -332,7 +332,7 @@ public class DefaultProductSerializer implements ProductSerializer { */ protected String encodeUpdateField(String key, String value, boolean replace) { StringBuilder sb = new StringBuilder(); - sb.append("<field name=\""+key+"\""); + sb.append("<field name=\"").append(key).append("\""); if (replace) { @@ -344,13 +344,13 @@ public class DefaultProductSerializer implements ProductSerializer { } else { // (2) replace existing values with new values - sb.append(" update=\"set\">" + value + "</field>"); + sb.append(" update=\"set\">").append(value).append("</field>"); } } else { // (1) add new values to existing values - sb.append(" update=\"add\">"+value+"</field>"); + sb.append(" update=\"add\">").append(value).append("</field>"); } http://git-wip-us.apache.org/repos/asf/oodt/blob/48aad4bc/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/AbstractQueryCliAction.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/AbstractQueryCliAction.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/AbstractQueryCliAction.java index 5073617..9310bc9 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/AbstractQueryCliAction.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/AbstractQueryCliAction.java @@ -75,7 +75,7 @@ public abstract class AbstractQueryCliAction extends FileManagerCliAction { List<QueryResult> results = getClient().complexQuery(complexQuery); StringBuilder returnString = new StringBuilder(""); for (QueryResult qr : results) { - returnString.append(qr.toString() + delimiter); + returnString.append(qr.toString()).append(delimiter); } if (returnString.length() > 0) { printer.println(returnString.substring(0, returnString.length() http://git-wip-us.apache.org/repos/asf/oodt/blob/48aad4bc/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/QueryTool.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/QueryTool.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/QueryTool.java index ba9ece4..871c850 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/QueryTool.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/QueryTool.java @@ -252,7 +252,7 @@ public final class QueryTool { List<QueryResult> results = new XmlRpcFileManagerClient(new URL(filemgrUrl)).complexQuery(complexQuery); StringBuilder returnString = new StringBuilder(""); for (QueryResult qr : results) - returnString.append(qr.toString() + delimiter); + returnString.append(qr.toString()).append(delimiter); return returnString.substring(0, returnString.length() - delimiter.length()); } http://git-wip-us.apache.org/repos/asf/oodt/blob/48aad4bc/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/QueryUtils.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/QueryUtils.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/QueryUtils.java index 0c8c1b1..8972ea0 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/QueryUtils.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/QueryUtils.java @@ -43,7 +43,7 @@ public class QueryUtils { List<QueryResult> queryResults, String delimiter) { StringBuilder returnString = new StringBuilder(""); for (QueryResult qr : queryResults) - returnString.append(qr.toString() + delimiter); + returnString.append(qr.toString()).append(delimiter); return returnString.substring(0, returnString.length() - delimiter.length()); } http://git-wip-us.apache.org/repos/asf/oodt/blob/48aad4bc/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/type/TestTypeHandler.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/type/TestTypeHandler.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/type/TestTypeHandler.java index 9182dde..07075e9 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/type/TestTypeHandler.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/type/TestTypeHandler.java @@ -568,10 +568,9 @@ public class TestTypeHandler extends TestCase { } } - fromClause.append("INNER JOIN (" + subSelectQuery - + ") " + subSelectTblName + " ON " - + subSelectTblName - + ".product_id = p.product_id "); + fromClause.append("INNER JOIN (").append(subSelectQuery).append(") ") + .append(subSelectTblName).append(" ON ").append(subSelectTblName) + .append(".product_id = p.product_id "); } } @@ -809,10 +808,9 @@ public class TestTypeHandler extends TestCase { } } - fromClause.append("INNER JOIN (" + subSelectQuery - + ") " + subSelectTblName + " ON " - + subSelectTblName - + ".product_id = p.product_id "); + fromClause.append("INNER JOIN (").append(subSelectQuery).append(") ") + .append(subSelectTblName).append(" ON ").append(subSelectTblName) + .append(".product_id = p.product_id "); } } http://git-wip-us.apache.org/repos/asf/oodt/blob/48aad4bc/grid/src/main/java/org/apache/oodt/grid/RestfulProductQueryServlet.java ---------------------------------------------------------------------- diff --git a/grid/src/main/java/org/apache/oodt/grid/RestfulProductQueryServlet.java b/grid/src/main/java/org/apache/oodt/grid/RestfulProductQueryServlet.java index 7d24d36..6f9cf66 100644 --- a/grid/src/main/java/org/apache/oodt/grid/RestfulProductQueryServlet.java +++ b/grid/src/main/java/org/apache/oodt/grid/RestfulProductQueryServlet.java @@ -67,7 +67,7 @@ public class RestfulProductQueryServlet extends ProductQueryServlet { String[] paramValues = req.getParameterValues(paramName); for (int i = 0; i < paramValues.length; i++) { if (q.length()>0) q.append(" AND "); - q.append(paramName+" EQ "+paramValues[i]); + q.append(paramName).append(" EQ ").append(paramValues[i]); } } http://git-wip-us.apache.org/repos/asf/oodt/blob/48aad4bc/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/ExistanceCheckComparator.java ---------------------------------------------------------------------- diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/ExistanceCheckComparator.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/ExistanceCheckComparator.java index 7b5ecb2..318ebcf 100644 --- a/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/ExistanceCheckComparator.java +++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/ExistanceCheckComparator.java @@ -40,7 +40,7 @@ public class ExistanceCheckComparator extends PreConditionComparator<Boolean> { @Override protected int performCheck(File product, Boolean compareItem) throws PreconditionComparatorException { - return new Boolean(product.exists()).compareTo(compareItem); + return Boolean.valueOf(product.exists()).compareTo(compareItem); } } http://git-wip-us.apache.org/repos/asf/oodt/blob/48aad4bc/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/LastModifiedCheckComparator.java ---------------------------------------------------------------------- diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/LastModifiedCheckComparator.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/LastModifiedCheckComparator.java index 566c71f..31c741a 100644 --- a/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/LastModifiedCheckComparator.java +++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/LastModifiedCheckComparator.java @@ -19,15 +19,14 @@ package org.apache.oodt.cas.metadata.preconditions; //JDK imports +import org.apache.oodt.cas.metadata.exceptions.PreconditionComparatorException; + import java.io.File; import java.util.Date; import java.util.logging.Level; import java.util.logging.Logger; //OODT imports -import org.apache.oodt.cas.metadata.exceptions.PreconditionComparatorException; -import org.apache.oodt.cas.metadata.preconditions.ExistanceCheckComparator; -import org.apache.oodt.cas.metadata.preconditions.PreConditionComparator; /** * Precondition class that checks on the last modification time of a product, @@ -58,13 +57,13 @@ public class LastModifiedCheckComparator extends PreConditionComparator<Boolean> // reject this product if (deltaInSecs>maxAgeInSeconds) { LOG.log(Level.FINEST, "Product: "+product.getAbsolutePath()+" fails 'Last Modified' check: "+new Date(lastModTime)); - return new Boolean(false).compareTo(compareItem); + return Boolean.FALSE.compareTo(compareItem); // accept this product } else { LOG.log(Level.FINEST, "Product: "+product.getAbsolutePath()+" passes 'Last Modified' check: "+new Date(lastModTime)); - return new Boolean(true).compareTo(compareItem); - + return Boolean.TRUE.compareTo(compareItem); + } } http://git-wip-us.apache.org/repos/asf/oodt/blob/48aad4bc/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/ProductNameCheckComparator.java ---------------------------------------------------------------------- diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/ProductNameCheckComparator.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/ProductNameCheckComparator.java index cddb4c3..f768629 100644 --- a/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/ProductNameCheckComparator.java +++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/ProductNameCheckComparator.java @@ -19,6 +19,9 @@ package org.apache.oodt.cas.metadata.preconditions; //JDK imports +import org.apache.oodt.cas.metadata.exceptions.PreconditionComparatorException; +import org.springframework.util.StringUtils; + import java.io.File; import java.util.logging.Level; import java.util.logging.Logger; @@ -26,12 +29,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; //OODT imports -import org.apache.oodt.cas.metadata.exceptions.PreconditionComparatorException; -import org.apache.oodt.cas.metadata.preconditions.ExistanceCheckComparator; -import org.apache.oodt.cas.metadata.preconditions.PreConditionComparator; - //Spring imports -import org.springframework.util.StringUtils; /** * Precondition class that checks the product name (i.e. the directory name) @@ -66,11 +64,11 @@ public class ProductNameCheckComparator extends PreConditionComparator<Boolean> Matcher matcher = pattern.matcher(product.getName()); if (matcher.matches()) { LOG.log(Level.FINEST, "Product: "+product.getName()+" passes 'regex' check: "+pattern.toString()); - return new Boolean(true).compareTo(compareItem); + return Boolean.TRUE.compareTo(compareItem); } else { LOG.log(Level.FINEST, "Product: "+product.getName()+" failed 'regex' check: "+pattern.toString()); - return new Boolean(false).compareTo(compareItem); + return Boolean.FALSE.compareTo(compareItem); } } http://git-wip-us.apache.org/repos/asf/oodt/blob/48aad4bc/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/SubProductExistenceCheckComparator.java ---------------------------------------------------------------------- diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/SubProductExistenceCheckComparator.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/SubProductExistenceCheckComparator.java index 00ffd1c..aa0c8ac 100644 --- a/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/SubProductExistenceCheckComparator.java +++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/SubProductExistenceCheckComparator.java @@ -18,12 +18,12 @@ package org.apache.oodt.cas.metadata.preconditions; //JDK imports +import org.apache.oodt.cas.metadata.exceptions.PreconditionComparatorException; + import java.io.File; import java.util.logging.Level; import java.util.logging.Logger; -import org.apache.oodt.cas.metadata.exceptions.PreconditionComparatorException; - /** * A {@link PreConditionComparator} that checks for the existence of an arbitrary file (a "sub-product") * within the product directory. @@ -58,9 +58,9 @@ public class SubProductExistenceCheckComparator extends if (product.isDirectory() && filePath!=null) { File file = new File(product.getAbsolutePath()+"/"+filePath); LOG.log(Level.INFO, "Checking existence of file="+file.getAbsolutePath()); - return new Boolean(file.exists()).compareTo(compareItem); + return Boolean.valueOf(file.exists()).compareTo(compareItem); } else { - return new Boolean(product.exists()).compareTo(compareItem); + return Boolean.valueOf(product.exists()).compareTo(compareItem); } } http://git-wip-us.apache.org/repos/asf/oodt/blob/48aad4bc/opendapps/src/main/java/org/apache/oodt/opendapps/util/ProfileChecker.java ---------------------------------------------------------------------- diff --git a/opendapps/src/main/java/org/apache/oodt/opendapps/util/ProfileChecker.java b/opendapps/src/main/java/org/apache/oodt/opendapps/util/ProfileChecker.java index 34d2b4d..a84daba 100644 --- a/opendapps/src/main/java/org/apache/oodt/opendapps/util/ProfileChecker.java +++ b/opendapps/src/main/java/org/apache/oodt/opendapps/util/ProfileChecker.java @@ -56,7 +56,7 @@ public class ProfileChecker { // profile passes by default boolean ok = true; - sb.append("\nChecking profile="+profile.getProfileAttributes().getID()); + sb.append("\nChecking profile=").append(profile.getProfileAttributes().getID()); ok = ok && checkResourceAttribute("Identifier", profile.getResourceAttributes().getIdentifier(), true, sb); @@ -100,7 +100,7 @@ public class ProfileChecker { * @return */ private static boolean checkResourceAttribute(String name, String value, boolean mandatory, StringBuilder sb) { - sb.append("\n\tResource Attribute '" + name + "' = "); + sb.append("\n\tResource Attribute '").append(name).append("' = "); if (!StringUtils.hasText(value) || value.equalsIgnoreCase("null")) { if (mandatory) return false; // bad value } else { @@ -120,7 +120,7 @@ public class ProfileChecker { */ private static boolean checkProfileElement(Profile profile, String name, boolean mandatory, StringBuilder sb) { - sb.append("\n\tProfile Element '" + name + "' = "); + sb.append("\n\tProfile Element '").append(name).append("' = "); // profile element is valid by default boolean ok = true; http://git-wip-us.apache.org/repos/asf/oodt/blob/48aad4bc/opendapps/src/main/java/org/apache/oodt/opendapps/util/ProfileSerializer.java ---------------------------------------------------------------------- diff --git a/opendapps/src/main/java/org/apache/oodt/opendapps/util/ProfileSerializer.java b/opendapps/src/main/java/org/apache/oodt/opendapps/util/ProfileSerializer.java index 55c47da..56de711 100644 --- a/opendapps/src/main/java/org/apache/oodt/opendapps/util/ProfileSerializer.java +++ b/opendapps/src/main/java/org/apache/oodt/opendapps/util/ProfileSerializer.java @@ -54,8 +54,8 @@ public class ProfileSerializer { final StringWriter writer = new StringWriter(); writer.append("<?xml version='1.0' encoding='UTF-8'?>"); - writer.append("<!DOCTYPE profiles PUBLIC '" + Profile.PROFILES_DTD_FPI - + "' '" + Profile.PROFILES_DTD_URL + "'>"); + writer.append("<!DOCTYPE profiles PUBLIC '" + Profile.PROFILES_DTD_FPI + "' '").append(Profile.PROFILES_DTD_URL) + .append("'>"); writer.append("<profiles>"); final Transformer transformer = createTransformer(); http://git-wip-us.apache.org/repos/asf/oodt/blob/48aad4bc/pge/src/test/java/org/apache/oodt/cas/pge/staging/TestFileStager.java ---------------------------------------------------------------------- diff --git a/pge/src/test/java/org/apache/oodt/cas/pge/staging/TestFileStager.java b/pge/src/test/java/org/apache/oodt/cas/pge/staging/TestFileStager.java index 13a7c18..0bcf1e5 100644 --- a/pge/src/test/java/org/apache/oodt/cas/pge/staging/TestFileStager.java +++ b/pge/src/test/java/org/apache/oodt/cas/pge/staging/TestFileStager.java @@ -138,7 +138,7 @@ public class TestFileStager extends TestCase { buffer.append("eqProduct("); buffer.append(Product.class.getName()); buffer.append(" with product id ["); - buffer.append(productId + "])"); + buffer.append(productId).append("])"); } @Override http://git-wip-us.apache.org/repos/asf/oodt/blob/48aad4bc/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/VirtualFile.java ---------------------------------------------------------------------- diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/VirtualFile.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/VirtualFile.java index 9a1ba4d..f3aefce 100644 --- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/VirtualFile.java +++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/VirtualFile.java @@ -283,10 +283,9 @@ public class VirtualFile { StringBuffer output = new StringBuffer(""); for (VirtualFile vf : list) { output.append(spacer); - output.append(vf.getRegExp() - + (vf.isDir && !vf.regExp.equals("/") ? "/" : "") + "\t : " - + vf.allowNewDirs + "/" + vf.noDirs + "\t\t : " - + vf.allowNewFiles + "/" + vf.noFiles + "\n"); + output.append(vf.getRegExp()).append(vf.isDir && !vf.regExp.equals("/") ? "/" : "").append("\t : ") + .append(vf.allowNewDirs).append("/").append(vf.noDirs).append("\t\t : ").append(vf.allowNewFiles) + .append("/").append(vf.noFiles).append("\n"); output.append(printVirtualFiles(vf.getChildren(), " " + spacer)); } return output; http://git-wip-us.apache.org/repos/asf/oodt/blob/48aad4bc/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/ClassNoaaEmailParser.java ---------------------------------------------------------------------- diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/ClassNoaaEmailParser.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/ClassNoaaEmailParser.java index 348cd24..c7992c3 100644 --- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/ClassNoaaEmailParser.java +++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/ClassNoaaEmailParser.java @@ -52,7 +52,7 @@ public class ClassNoaaEmailParser implements Parser { Scanner s = new Scanner(emailFile); StringBuffer sb = new StringBuffer(""); while (s.hasNextLine()) - sb.append(s.nextLine() + "\n"); + sb.append(s.nextLine()).append("\n"); if (!validEmail(sb.toString())) throw new ParserException( http://git-wip-us.apache.org/repos/asf/oodt/blob/48aad4bc/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorHelper.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorHelper.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorHelper.java index 5c35793..faa2e71 100755 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorHelper.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorHelper.java @@ -80,65 +80,51 @@ public class WorkflowProcessorHelper { // = // " + processor.getStaticMetadata().asHashtable() + "]"); if (skeleton.getPreConditions() != null) - stringModel.append(indent + "{PreCond:" + indent + " " - + toString(skeleton.getPreConditions(), indent + " ") + "}"); + stringModel.append(indent).append("{PreCond:").append(indent).append(" ") + .append(toString(skeleton.getPreConditions(), indent + " ")).append("}"); if (skeleton.getPostConditions() != null) - stringModel.append(indent + "{PostCond:" + indent + " " - + toString(skeleton.getPostConditions(), indent + " ") + "}"); + stringModel.append(indent).append("{PostCond:").append(indent).append(" ") + .append(toString(skeleton.getPostConditions(), indent + " ")).append("}"); if (skeleton.getSubProcessors() != null) for (WorkflowProcessor subProcessor : skeleton.getSubProcessors()) - stringModel.append(indent + toString(subProcessor, indent + " ")); + stringModel.append(indent).append(toString(subProcessor, indent + " ")); return stringModel.toString(); } public String describe(WorkflowProcessor skeleton) { StringBuilder stringModel = new StringBuilder(""); - stringModel.append("Processor [id = '" - + skeleton.getWorkflowInstance().getParentChildWorkflow().getId() - + "', name = '" - + skeleton.getWorkflowInstance().getParentChildWorkflow().getName() - + "']\n"); - stringModel.append(" - instance = '" - + skeleton.getWorkflowInstance().getId() + "'\n"); - stringModel.append(" - execution = '" - + skeleton.getWorkflowInstance().getParentChildWorkflow().getGraph() - .getExecutionType() + "'\n"); - stringModel.append(" - timesBlocked = '" - + skeleton.getWorkflowInstance().getTimesBlocked() + "'\n"); + stringModel.append("Processor [id = '").append(skeleton.getWorkflowInstance().getParentChildWorkflow().getId()) + .append("', name = '").append(skeleton.getWorkflowInstance().getParentChildWorkflow().getName()) + .append("']\n"); + stringModel.append(" - instance = '").append(skeleton.getWorkflowInstance().getId()).append("'\n"); + stringModel.append(" - execution = '").append(skeleton.getWorkflowInstance().getParentChildWorkflow().getGraph() + .getExecutionType()).append("'\n"); + stringModel.append(" - timesBlocked = '").append(skeleton.getWorkflowInstance().getTimesBlocked()).append("'\n"); stringModel.append(" - dates: \n"); - stringModel.append(" CreationDate = '" - + skeleton.getWorkflowInstance().getStartDate() + "'\n"); - stringModel.append(" CompletionDate = '" - + skeleton.getWorkflowInstance().getEndDate() + "'\n"); + stringModel.append(" CreationDate = '").append(skeleton.getWorkflowInstance().getStartDate()).append("'\n"); + stringModel.append(" CompletionDate = '").append(skeleton.getWorkflowInstance().getEndDate()).append("'\n"); stringModel.append(" - state: \n"); - stringModel.append(" name = '" - + skeleton.getWorkflowInstance().getState().getName() + "'\n"); - stringModel.append(" startTime = '" - + skeleton.getWorkflowInstance().getState().getStartTime() + "'\n"); - stringModel.append(" message = '" - + skeleton.getWorkflowInstance().getState().getMessage() + "'\n"); - stringModel.append(" - priority = '" - + skeleton.getWorkflowInstance().getPriority() + "'\n"); - stringModel - .append(" - execusedSubProcessors = '" - + StringUtils.join(skeleton.getExcusedSubProcessorIds().iterator(), - ",") + "'\n"); + stringModel.append(" name = '").append(skeleton.getWorkflowInstance().getState().getName()).append("'\n"); + stringModel.append(" startTime = '").append(skeleton.getWorkflowInstance().getState().getStartTime()) + .append("'\n"); + stringModel.append(" message = '").append(skeleton.getWorkflowInstance().getState().getMessage()) + .append("'\n"); + stringModel.append(" - priority = '").append(skeleton.getWorkflowInstance().getPriority()).append("'\n"); + stringModel.append(" - execusedSubProcessors = '") + .append(StringUtils.join(skeleton.getExcusedSubProcessorIds().iterator(), + ",")).append("'\n"); stringModel.append(" - static metadata = \n"); for (String key : skeleton.getWorkflowInstance().getSharedContext() .getAllKeys()) - stringModel.append(" + " - + key - + " -> '" - + StringUtils.join(skeleton.getWorkflowInstance().getSharedContext() - .getAllMetadata(key), ",") + "'\n"); + stringModel.append(" + ").append(key).append(" -> '") + .append(StringUtils.join(skeleton.getWorkflowInstance().getSharedContext() + .getAllMetadata(key), ",")).append("'\n"); stringModel.append(" - dynamic metadata = \n"); for (String key : skeleton.getWorkflowInstance().getSharedContext() .getAllKeys()) - stringModel.append(" + " - + key - + " -> '" - + StringUtils.join(skeleton.getWorkflowInstance().getSharedContext() - .getAllMetadata(key), ",") + "'\n"); + stringModel.append(" + ").append(key).append(" -> '") + .append(StringUtils.join(skeleton.getWorkflowInstance().getSharedContext() + .getAllMetadata(key), ",")).append("'\n"); return stringModel.toString(); } http://git-wip-us.apache.org/repos/asf/oodt/blob/48aad4bc/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/MailTask.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/MailTask.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/MailTask.java index 7967d84..51b7a44 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/MailTask.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/MailTask.java @@ -95,7 +95,7 @@ public class MailTask implements WorkflowTaskInstance { } val.deleteCharAt(val.length() - 1); - buf.append("[" + keyStr + "=>" + val + "]\n"); + buf.append("[").append(keyStr).append("=>").append(val).append("]\n"); } return buf.toString(); http://git-wip-us.apache.org/repos/asf/oodt/blob/48aad4bc/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDERow.java ---------------------------------------------------------------------- diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDERow.java b/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDERow.java index 6ae60ed..67704cb 100644 --- a/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDERow.java +++ b/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDERow.java @@ -45,7 +45,7 @@ public class CDERow { if (vals != null && vals.size() > 0) { for (Iterator<CDEValue> i = vals.iterator(); i.hasNext();) { CDEValue v = i.next(); - rStr.append(v.getVal() + COL_SEPARATOR); + rStr.append(v.getVal()).append(COL_SEPARATOR); } rStr.deleteCharAt(rStr.length() - 1);
