http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgr.java ---------------------------------------------------------------------- diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgr.java b/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgr.java index 3cccc91..806305a 100644 --- a/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgr.java +++ b/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgr.java @@ -163,7 +163,7 @@ public class XmlRpcBatchMgr implements Batchmgr { protected void notifyMonitor(ResourceNode node, JobSpec jobSpec) { Job job = jobSpec.getJob(); - int reducedLoad = job.getLoadValue().intValue(); + int reducedLoad = job.getLoadValue(); try { mon.reduceLoad(node, reducedLoad); } catch (MonitorException e) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgrProxy.java ---------------------------------------------------------------------- diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgrProxy.java b/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgrProxy.java index 039019e..65f2405 100644 --- a/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgrProxy.java +++ b/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgrProxy.java @@ -72,8 +72,7 @@ public class XmlRpcBatchMgrProxy extends Thread implements Runnable { boolean alive = false; try { - alive = ((Boolean) client.execute("batchstub.isAlive", argList)) - .booleanValue(); + alive = (Boolean) client.execute("batchstub.isAlive", argList); } catch (XmlRpcException e) { alive = false; } catch (IOException e) { @@ -91,8 +90,7 @@ public class XmlRpcBatchMgrProxy extends Thread implements Runnable { boolean result = false; try { - result = ((Boolean) client.execute("batchstub.killJob", argList)) - .booleanValue(); + result = (Boolean) client.execute("batchstub.killJob", argList); } catch (XmlRpcException e) { e.printStackTrace(); result = false; @@ -117,8 +115,8 @@ public class XmlRpcBatchMgrProxy extends Thread implements Runnable { boolean result = false; try { parent.jobExecuting(jobSpec); - result = ((Boolean) client - .execute("batchstub.executeJob", argList)).booleanValue(); + result = (Boolean) client + .execute("batchstub.executeJob", argList); if (result) parent.jobSuccess(jobSpec); else http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/resource/src/main/java/org/apache/oodt/cas/resource/system/extern/XmlRpcBatchStub.java ---------------------------------------------------------------------- diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/system/extern/XmlRpcBatchStub.java b/resource/src/main/java/org/apache/oodt/cas/resource/system/extern/XmlRpcBatchStub.java index ac734ab..5e614ae 100644 --- a/resource/src/main/java/org/apache/oodt/cas/resource/system/extern/XmlRpcBatchStub.java +++ b/resource/src/main/java/org/apache/oodt/cas/resource/system/extern/XmlRpcBatchStub.java @@ -92,17 +92,17 @@ public class XmlRpcBatchStub { public boolean executeJob(Hashtable jobHash, double jobInput) throws JobException { - return genericExecuteJob(jobHash, new Double(jobInput)); + return genericExecuteJob(jobHash, jobInput); } public boolean executeJob(Hashtable jobHash, int jobInput) throws JobException { - return genericExecuteJob(jobHash, new Integer(jobInput)); + return genericExecuteJob(jobHash, jobInput); } public boolean executeJob(Hashtable jobHash, boolean jobInput) throws JobException { - return genericExecuteJob(jobHash, new Boolean(jobInput)); + return genericExecuteJob(jobHash, jobInput); } public boolean executeJob(Hashtable jobHash, Vector jobInput) http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlStructFactory.java ---------------------------------------------------------------------- diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlStructFactory.java b/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlStructFactory.java index 5f191c7..eb0a18b 100644 --- a/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlStructFactory.java +++ b/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlStructFactory.java @@ -70,8 +70,7 @@ public final class XmlStructFactory { .getAttribute("envReplace")) ? PathUtils .doDynamicReplacement(resourceNodeRoot.getAttribute("ip")) : resourceNodeRoot.getAttribute("ip")); - capacity = new Integer(resourceNodeRoot.getAttribute("capacity")) - .intValue(); + capacity = new Integer(resourceNodeRoot.getAttribute("capacity")); } catch (Exception e) { e.printStackTrace(); } @@ -108,8 +107,8 @@ public final class XmlStructFactory { jobNodeElem); String instClass = instClassElem.getAttribute("name"); String queue = XMLUtils.getElementText("queue", jobNodeElem); - Integer load = new Integer(Integer.parseInt(XMLUtils.getElementText( - "load", jobNodeElem))); + Integer load = Integer.parseInt(XMLUtils.getElementText( + "load", jobNodeElem)); Element inputClass = XMLUtils .getFirstElement("inputClass", jobNodeElem); http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/sso/src/main/java/org/apache/oodt/security/sso/opensso/IdentityDetails.java ---------------------------------------------------------------------- diff --git a/sso/src/main/java/org/apache/oodt/security/sso/opensso/IdentityDetails.java b/sso/src/main/java/org/apache/oodt/security/sso/opensso/IdentityDetails.java index 517b753..a0950e8 100755 --- a/sso/src/main/java/org/apache/oodt/security/sso/opensso/IdentityDetails.java +++ b/sso/src/main/java/org/apache/oodt/security/sso/opensso/IdentityDetails.java @@ -128,7 +128,7 @@ public class IdentityDetails { } public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("[name="); sb.append(this.name); sb.append(",type="); http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/sso/src/main/java/org/apache/oodt/security/sso/opensso/UserDetails.java ---------------------------------------------------------------------- diff --git a/sso/src/main/java/org/apache/oodt/security/sso/opensso/UserDetails.java b/sso/src/main/java/org/apache/oodt/security/sso/opensso/UserDetails.java index fe7988f..af24e02 100755 --- a/sso/src/main/java/org/apache/oodt/security/sso/opensso/UserDetails.java +++ b/sso/src/main/java/org/apache/oodt/security/sso/opensso/UserDetails.java @@ -92,7 +92,7 @@ public class UserDetails { } public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("[token="); sb.append(this.token); sb.append(",roles="); http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.java ---------------------------------------------------------------------- diff --git a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.java b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.java index f669bd6..e81ccac 100644 --- a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.java +++ b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.java @@ -124,7 +124,7 @@ public class WorkflowViewer extends Panel { private String summarizeWords(String orig, int wordThreshhold, int maxLengthTotal) { String[] words = orig.split(" "); - StringBuffer summarizedString = new StringBuffer(); + StringBuilder summarizedString = new StringBuilder(); for (int i = 0; i < words.length; i++) { String word = words[i]; http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/configurations/RdfConfiguration.java ---------------------------------------------------------------------- diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/configurations/RdfConfiguration.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/configurations/RdfConfiguration.java index d4cd36e..1db11dd 100644 --- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/configurations/RdfConfiguration.java +++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/configurations/RdfConfiguration.java @@ -183,7 +183,7 @@ public class RdfConfiguration { // Apply the rewrite rules. String tagName = rewriteMap.containsKey(key) ? rewriteMap.get(key) : key; - if (tagName.indexOf(" ") != -1) { + if (tagName.contains(" ")) { tagName = StringUtils.join(WordUtils.capitalizeFully(tagName).split( " ")); } http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/configurations/RssConfiguration.java ---------------------------------------------------------------------- diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/configurations/RssConfiguration.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/configurations/RssConfiguration.java index 1279041..8d89b32 100644 --- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/configurations/RssConfiguration.java +++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/configurations/RssConfiguration.java @@ -168,7 +168,7 @@ public class RssConfiguration for (RssTag tag : tagList) { String tagName = tag.getName(); - if (tagName.indexOf(" ") != -1) { + if (tagName.contains(" ")) { tagName = StringUtils.join(WordUtils.capitalizeFully(tagName).split( " ")); } http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java ---------------------------------------------------------------------- diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java index b44e124..58aba8d 100644 --- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java +++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java @@ -227,7 +227,7 @@ public class RDFDatasetServlet extends HttpServlet { //PRODUCT Experiment Type //and transform it into ProductExperimentType String outputKey = key; - if (outputKey.indexOf(" ") != -1) { + if (outputKey.contains(" ")) { outputKey = StringUtils.join(WordUtils.capitalizeFully(outputKey).split( " ")); } http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java ---------------------------------------------------------------------- diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java index 66ed12a..00f3293 100644 --- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java +++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java @@ -252,7 +252,7 @@ public class RDFProductServlet extends HttpServlet { for (Iterator<String> k = vals.iterator(); k.hasNext();) { String val = (String) k.next(); String outputKey = key; - if (outputKey.indexOf(" ") != -1) { + if (outputKey.contains(" ")) { outputKey = StringUtils.join(WordUtils.capitalizeFully(outputKey).split( " ")); } http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java ---------------------------------------------------------------------- diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java index 2696184..410b1c9 100644 --- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java +++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java @@ -143,7 +143,7 @@ public class RSSProductServlet extends HttpServlet { int top = 20; if (topN != null) { - top = Integer.valueOf(topN).intValue(); + top = Integer.valueOf(topN); } String requestUrl = req.getRequestURL().toString(); http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSUtils.java ---------------------------------------------------------------------- diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSUtils.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSUtils.java index 12278db..2221360 100644 --- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSUtils.java +++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSUtils.java @@ -58,7 +58,7 @@ public class RSSUtils { public static Element emitRSSTag(RSSTag tag, Metadata prodMet, Document doc, Element item) { String outputTag = tag.getName(); - if (outputTag.indexOf(" ") != -1) { + if (outputTag.contains(" ")) { outputTag = StringUtils.join(WordUtils.capitalizeFully(outputTag).split( " ")); } http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/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 7918060..5c35793 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 @@ -63,7 +63,7 @@ public class WorkflowProcessorHelper { } private String toString(WorkflowProcessor skeleton, String indent) { - StringBuffer stringModel = new StringBuffer( + StringBuilder stringModel = new StringBuilder( "[" + (skeleton.getWorkflowInstance().getParentChildWorkflow().getId() == null ? "" : "id = '" @@ -92,7 +92,7 @@ public class WorkflowProcessorHelper { } public String describe(WorkflowProcessor skeleton) { - StringBuffer stringModel = new StringBuffer(""); + StringBuilder stringModel = new StringBuilder(""); stringModel.append("Processor [id = '" + skeleton.getWorkflowInstance().getParentChildWorkflow().getId() + "', name = '" http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/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 e284830..7967d84 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 @@ -84,10 +84,10 @@ public class MailTask implements WorkflowTaskInstance { } private String getMsgStringFromMet(Metadata met) { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); for (Object key : met.getHashtable().keySet()) { String keyStr = (String) key; - StringBuffer val = new StringBuffer(); + StringBuilder val = new StringBuilder(); for (Object value : met.getAllMetadata(keyStr)) { String valStr = (String) value; val.append(valStr); http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepositoryFactory.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepositoryFactory.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepositoryFactory.java index 0d2aa6b..e428bc6 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepositoryFactory.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepositoryFactory.java @@ -92,8 +92,7 @@ public class DataSourceWorkflowInstanceRepositoryFactory implements quoteFields = Boolean .getBoolean("org.apache.oodt.cas.workflow.instanceRep.datasource.quoteFields"); pageSize = Integer.getInteger( - "org.apache.oodt.cas.workflow.instanceRep.pageSize", 20) - .intValue(); + "org.apache.oodt.cas.workflow.instanceRep.pageSize", 20); } http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepositoryFactory.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepositoryFactory.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepositoryFactory.java index 0ef4985..5b8bdc8 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepositoryFactory.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepositoryFactory.java @@ -62,8 +62,7 @@ public class LuceneWorkflowInstanceRepositoryFactory implements // do env variable replacement indexFilePath = PathUtils.replaceEnvVariables(indexFilePath); pageSize = Integer.getInteger( - "org.apache.oodt.cas.workflow.instanceRep.pageSize", 20) - .intValue(); + "org.apache.oodt.cas.workflow.instanceRep.pageSize", 20); } /* http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/MemoryWorkflowInstanceRepositoryFactory.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/MemoryWorkflowInstanceRepositoryFactory.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/MemoryWorkflowInstanceRepositoryFactory.java index e0c4cd4..afe6989 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/MemoryWorkflowInstanceRepositoryFactory.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/MemoryWorkflowInstanceRepositoryFactory.java @@ -38,8 +38,7 @@ public class MemoryWorkflowInstanceRepositoryFactory implements */ public MemoryWorkflowInstanceRepositoryFactory() { pageSize = Integer.getInteger( - "org.apache.oodt.cas.workflow.instanceRep.pageSize", 20) - .intValue(); + "org.apache.oodt.cas.workflow.instanceRep.pageSize", 20); } /* http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/HighestFIFOPrioritySorter.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/HighestFIFOPrioritySorter.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/HighestFIFOPrioritySorter.java index 7b7798c..7fa9be3 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/HighestFIFOPrioritySorter.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/HighestFIFOPrioritySorter.java @@ -91,9 +91,9 @@ public class HighestFIFOPrioritySorter implements PrioritySorter { processorStub.getWorkflowInstance().getPriority().getValue(), Math.min( this.boostCap, - Double.valueOf(processorStub.getWorkflowInstance().getPriority() - .getValue() - + (boostPercentage * this.boostAmount)))); + processorStub.getWorkflowInstance().getPriority() + .getValue() + + (boostPercentage * this.boostAmount))); } } http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/ParentChildWorkflow.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/ParentChildWorkflow.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/ParentChildWorkflow.java index 7e5f3f4..41b73ec 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/ParentChildWorkflow.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/ParentChildWorkflow.java @@ -46,7 +46,7 @@ public class ParentChildWorkflow extends Workflow { @Override public String toString() { - StringBuffer buf = new StringBuffer("[workflow id="); + StringBuilder buf = new StringBuilder("[workflow id="); buf.append(this.getId()); buf.append(",name="); buf.append(this.getName()); http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java index ce5c67d..fa21018 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java @@ -79,9 +79,8 @@ public class XmlRpcWorkflowManagerClient { public boolean refreshRepository() throws Exception { try { - return ((Boolean) client.execute( - "workflowmgr.refreshRepository", new Vector())) - .booleanValue(); + return (Boolean) client.execute( + "workflowmgr.refreshRepository", new Vector()); } catch (XmlRpcException e) { e.printStackTrace(); throw new Exception(e.getMessage()); @@ -205,7 +204,7 @@ public class XmlRpcWorkflowManagerClient { public WorkflowInstancePage paginateWorkflowInstances(int pageNum, String status) throws Exception { Vector argList = new Vector(); - argList.add(new Integer(pageNum)); + argList.add(pageNum); argList.add(status); Hashtable pageHash = null; @@ -225,7 +224,7 @@ public class XmlRpcWorkflowManagerClient { public WorkflowInstancePage paginateWorkflowInstances(int pageNum) throws Exception { Vector argList = new Vector(); - argList.add(new Integer(pageNum)); + argList.add(pageNum); Hashtable pageHash = null; try { @@ -296,9 +295,9 @@ public class XmlRpcWorkflowManagerClient { argList.add(startDateTimeIsoStr); try { - return ((Boolean) client.execute( - "workflowmgr.setWorkflowInstanceCurrentTaskStartDateTime", - argList)).booleanValue(); + return (Boolean) client.execute( + "workflowmgr.setWorkflowInstanceCurrentTaskStartDateTime", + argList); } catch (XmlRpcException e) { e.printStackTrace(); throw new Exception(e.getMessage()); @@ -314,9 +313,9 @@ public class XmlRpcWorkflowManagerClient { argList.add(workflowInstId); try { - return ((Double) client.execute( - "workflowmgr.getWorkflowCurrentTaskWallClockMinutes", - argList)).doubleValue(); + return (Double) client.execute( + "workflowmgr.getWorkflowCurrentTaskWallClockMinutes", + argList); } catch (XmlRpcException e) { e.printStackTrace(); throw new Exception(e.getMessage()); @@ -331,9 +330,8 @@ public class XmlRpcWorkflowManagerClient { argList.add(workflowInstId); try { - return ((Double) client.execute( - "workflowmgr.getWorkflowWallClockMinutes", argList)) - .doubleValue(); + return (Double) client.execute( + "workflowmgr.getWorkflowWallClockMinutes", argList); } catch (XmlRpcException e) { e.printStackTrace(); throw new Exception(e.getMessage()); @@ -348,9 +346,8 @@ public class XmlRpcWorkflowManagerClient { argList.add(workflowInstId); try { - return ((Boolean) client.execute( - "workflowmgr.stopWorkflowInstance", argList)) - .booleanValue(); + return (Boolean) client.execute( + "workflowmgr.stopWorkflowInstance", argList); } catch (XmlRpcException e) { e.printStackTrace(); throw new Exception(e.getMessage()); @@ -365,9 +362,8 @@ public class XmlRpcWorkflowManagerClient { argList.add(workflowInstId); try { - return ((Boolean) client.execute( - "workflowmgr.pauseWorkflowInstance", argList)) - .booleanValue(); + return (Boolean) client.execute( + "workflowmgr.pauseWorkflowInstance", argList); } catch (XmlRpcException e) { e.printStackTrace(); throw new Exception(e.getMessage()); @@ -382,9 +378,8 @@ public class XmlRpcWorkflowManagerClient { argList.add(workflowInstId); try { - return ((Boolean) client.execute( - "workflowmgr.resumeWorkflowInstance", argList)) - .booleanValue(); + return (Boolean) client.execute( + "workflowmgr.resumeWorkflowInstance", argList); } catch (XmlRpcException e) { e.printStackTrace(); throw new Exception(e.getMessage()); @@ -400,9 +395,9 @@ public class XmlRpcWorkflowManagerClient { argList.add(endDateTimeIsoStr); try { - return ((Boolean) client.execute( - "workflowmgr.setWorkflowInstanceCurrentTaskEndDateTime", - argList)).booleanValue(); + return (Boolean) client.execute( + "workflowmgr.setWorkflowInstanceCurrentTaskEndDateTime", + argList); } catch (XmlRpcException e) { e.printStackTrace(); throw new Exception(e.getMessage()); @@ -419,9 +414,8 @@ public class XmlRpcWorkflowManagerClient { argList.add(status); try { - return ((Boolean) client.execute( - "workflowmgr.updateWorkflowInstanceStatus", argList)) - .booleanValue(); + return (Boolean) client.execute( + "workflowmgr.updateWorkflowInstanceStatus", argList); } catch (XmlRpcException e) { e.printStackTrace(); throw new Exception(e.getMessage()); @@ -437,9 +431,8 @@ public class XmlRpcWorkflowManagerClient { argList.add(XmlRpcStructFactory.getXmlRpcWorkflowInstance(instance)); try { - return ((Boolean) client.execute( - "workflowmgr.updateWorkflowInstance", argList)) - .booleanValue(); + return (Boolean) client.execute( + "workflowmgr.updateWorkflowInstance", argList); } catch (XmlRpcException e) { e.printStackTrace(); throw new Exception(e.getMessage()); @@ -455,9 +448,8 @@ public class XmlRpcWorkflowManagerClient { argList.add(metadata.getHashtable()); try { - return ((Boolean) client.execute( - "workflowmgr.updateMetadataForWorkflow", argList)) - .booleanValue(); + return (Boolean) client.execute( + "workflowmgr.updateMetadataForWorkflow", argList); } catch (XmlRpcException e) { e.printStackTrace(); throw new Exception(e.getMessage()); @@ -474,9 +466,8 @@ public class XmlRpcWorkflowManagerClient { argList.add(metadata.getHashtable()); try { - return ((Boolean) client - .execute("workflowmgr.handleEvent", argList)) - .booleanValue(); + return (Boolean) client + .execute("workflowmgr.handleEvent", argList); } catch (XmlRpcException e) { e.printStackTrace(); throw new Exception(e.getMessage()); @@ -595,8 +586,8 @@ public class XmlRpcWorkflowManagerClient { int numInsts = -1; try { - numInsts = ((Integer)client.execute( - "workflowmgr.getNumWorkflowInstancesByStatus", argList)).intValue(); + numInsts = (Integer) client.execute( + "workflowmgr.getNumWorkflowInstancesByStatus", argList); } catch (XmlRpcException e) { e.printStackTrace(); throw new Exception(e.getMessage()); @@ -613,8 +604,8 @@ public class XmlRpcWorkflowManagerClient { int numInsts = -1; try { - numInsts = ((Integer)client.execute( - "workflowmgr.getNumWorkflowInstances", argList)).intValue(); + numInsts = (Integer) client.execute( + "workflowmgr.getNumWorkflowInstances", argList); } catch (XmlRpcException e) { e.printStackTrace(); throw new Exception(e.getMessage()); http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlRpcStructFactory.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlRpcStructFactory.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlRpcStructFactory.java index 17a7e74..31f2128 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlRpcStructFactory.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlRpcStructFactory.java @@ -320,7 +320,7 @@ public final class XmlRpcStructFactory { t.setTaskInstanceClassName((String) task.get("class")); t.setTaskId((String) task.get("id")); t.setTaskName((String) task.get("name")); - t.setOrder(Integer.valueOf((String) task.get("order")).intValue()); + t.setOrder(Integer.valueOf((String) task.get("order"))); t.setTaskConfig(getWorkflowTaskConfigurationFromXmlRpc((Hashtable) task .get("configuration"))); t.setConditions(getWorkflowConditionsFromXmlRpc((Vector) task @@ -490,7 +490,7 @@ public final class XmlRpcStructFactory { condition.setConditionInstanceClassName((String) cond.get("class")); condition.setConditionId((String) cond.get("id")); condition.setConditionName((String) cond.get("name")); - condition.setOrder(Integer.valueOf((String) cond.get("order")).intValue()); + condition.setOrder(Integer.valueOf((String) cond.get("order"))); condition .setTimeoutSeconds(Long.valueOf(cond.get("timeout") != null ? (String) cond .get("timeout") : "-1")); http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlStructFactory.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlStructFactory.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlStructFactory.java index 243c152..90939a7 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlStructFactory.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlStructFactory.java @@ -220,8 +220,7 @@ public final class XmlStructFactory { Element propElem = (Element) configProperties.item(i); String value = propElem.getAttribute("value"); - boolean doReplace = Boolean.valueOf(propElem.getAttribute("envReplace")) - .booleanValue(); + boolean doReplace = Boolean.valueOf(propElem.getAttribute("envReplace")); if (doReplace) { value = PathUtils.replaceEnvVariables(value); } http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestThreadPoolWorkflowEngine.java ---------------------------------------------------------------------- diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestThreadPoolWorkflowEngine.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestThreadPoolWorkflowEngine.java index 8b81cfc..2d1e0db 100644 --- a/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestThreadPoolWorkflowEngine.java +++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestThreadPoolWorkflowEngine.java @@ -59,9 +59,8 @@ public class TestThreadPoolWorkflowEngine extends TestCase { workflow.getTasks().add(task); inst.setParentChildWorkflow(workflow); inst.setCurrentTaskId("urn:oodt:testTask"); - assertEquals(Double.valueOf(0.0), Double - .valueOf(ThreadPoolWorkflowEngine - .getCurrentTaskWallClockMinutes(inst))); + assertEquals(0.0, ThreadPoolWorkflowEngine + .getCurrentTaskWallClockMinutes(inst)); // now set start date time, and assert that wall clock minutes > 0 inst.setCurrentTaskStartDateTimeIsoStr(DateConvert @@ -81,20 +80,17 @@ public class TestThreadPoolWorkflowEngine extends TestCase { inst.setCurrentTaskEndDateTimeIsoStr(endDateTimeIsoStr); double wallClockMins = ThreadPoolWorkflowEngine .getCurrentTaskWallClockMinutes(inst); - assertEquals(Double.valueOf(wallClockMins), Double - .valueOf(ThreadPoolWorkflowEngine - .getCurrentTaskWallClockMinutes(inst))); - assertEquals(Double.valueOf(wallClockMins), Double - .valueOf(ThreadPoolWorkflowEngine - .getCurrentTaskWallClockMinutes(inst))); + assertEquals(wallClockMins, ThreadPoolWorkflowEngine + .getCurrentTaskWallClockMinutes(inst)); + assertEquals(wallClockMins, ThreadPoolWorkflowEngine + .getCurrentTaskWallClockMinutes(inst)); // set the start date time after the end date time // make sure that the wall cock time is 0.0 inst.setCurrentTaskStartDateTimeIsoStr(DateConvert .isoFormat(new Date())); - assertEquals(Double.valueOf(0.0), Double - .valueOf(ThreadPoolWorkflowEngine - .getCurrentTaskWallClockMinutes(inst))); + assertEquals(0.0, ThreadPoolWorkflowEngine + .getCurrentTaskWallClockMinutes(inst)); } } http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/xmlps/src/main/java/org/apache/oodt/xmlps/profile/XMLPSProfileHandler.java ---------------------------------------------------------------------- diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/profile/XMLPSProfileHandler.java b/xmlps/src/main/java/org/apache/oodt/xmlps/profile/XMLPSProfileHandler.java index f7d6175..eeb3081 100644 --- a/xmlps/src/main/java/org/apache/oodt/xmlps/profile/XMLPSProfileHandler.java +++ b/xmlps/src/main/java/org/apache/oodt/xmlps/profile/XMLPSProfileHandler.java @@ -149,7 +149,7 @@ public class XMLPSProfileHandler extends XMLPSProductHandler implements this.mapping); List<Profile> profs = null; - StringBuffer sqlBuf = new StringBuffer("SELECT *"); + StringBuilder sqlBuf = new StringBuilder("SELECT *"); sqlBuf.append(" FROM "); sqlBuf.append(mapping.getDefaultTable()); sqlBuf.append(" "); http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/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 80a3cdf..6ae60ed 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 @@ -41,7 +41,7 @@ public class CDERow { } public String toString() { - StringBuffer rStr = new StringBuffer(); + StringBuilder rStr = new StringBuilder(); if (vals != null && vals.size() > 0) { for (Iterator<CDEValue> i = vals.iterator(); i.hasNext();) { CDEValue v = i.next(); http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/xmlquery/src/main/java/org/apache/oodt/xmlquery/CompressedStringCodec.java ---------------------------------------------------------------------- diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/CompressedStringCodec.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/CompressedStringCodec.java index 2fa309c..d945f2d 100755 --- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/CompressedStringCodec.java +++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/CompressedStringCodec.java @@ -63,7 +63,7 @@ class CompressedStringCodec implements Codec { ByteArrayInputStream byteArray = new ByteArrayInputStream(encodedValue.getBytes()); Base64DecodingInputStream base64 = new Base64DecodingInputStream(byteArray); GZIPInputStream gzip = new GZIPInputStream(base64); - StringBuffer b = new StringBuffer(); + StringBuilder b = new StringBuilder(); int numRead; byte[] buf = new byte[1024]; while ((numRead = gzip.read(buf)) != -1) http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java ---------------------------------------------------------------------- diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java index b9a8095..8013bee 100755 --- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java +++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java @@ -913,7 +913,7 @@ public class XMLQuery implements java.io.Serializable, Cloneable { XMLQuery q; if (argv[0].equals("-expr")) { - StringBuffer expr = new StringBuffer(); + StringBuilder expr = new StringBuilder(); for (int i = 1; i < argv.length; ++i) expr.append(argv[i]).append(' '); q = new XMLQuery(expr.toString().trim(), "expr1", "Command-line Expression Query", @@ -921,7 +921,7 @@ public class XMLQuery implements java.io.Serializable, Cloneable { /*resultModeId*/ null, /*propType*/ null, /*propLevels*/ null, XMLQuery.DEFAULT_MAX_RESULTS); } else if (argv[0].equals("-file")) { BufferedReader reader = new BufferedReader(new FileReader(argv[1])); - StringBuffer str = new StringBuffer(); + StringBuilder str = new StringBuilder(); String line; while ((line = reader.readLine()) != null) str.append(line).append('\n');
