You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2015/10/25 12:37:58 UTC
[1/4] oodt git commit: OODT-898 remove redundant private final
Repository: oodt
Updated Branches:
refs/heads/master d7bbba082 -> 559a65f61
OODT-898 remove redundant private final
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/bd08d403
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/bd08d403
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/bd08d403
Branch: refs/heads/master
Commit: bd08d403a7852a2812da9b2c458d179936fc26f5
Parents: d7bbba0
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Oct 25 11:28:50 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Oct 25 11:28:50 2015 +0000
----------------------------------------------------------------------
.../cas/catalog/query/parser/QueryParser.java | 42 +++++++++----------
.../query/parser/QueryParserTokenManager.java | 44 ++++++++++----------
.../org/apache/oodt/opendapps/Profiler.java | 2 +-
.../xmlquery/ChunkedProductInputStream.java | 2 +-
4 files changed, 45 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/bd08d403/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.java
index 44c19be..229d3f8 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.java
@@ -620,68 +620,68 @@ import java.util.Vector;
}
}
- final private boolean jj_2_1(int xla) {
+ private boolean jj_2_1(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
try { return !jj_3_1(); }
catch(LookaheadSuccess ls) { return true; }
finally { jj_save(0, xla); }
}
- final private boolean jj_2_2(int xla) {
+ private boolean jj_2_2(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
try { return !jj_3_2(); }
catch(LookaheadSuccess ls) { return true; }
finally { jj_save(1, xla); }
}
- final private boolean jj_2_3(int xla) {
+ private boolean jj_2_3(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
try { return !jj_3_3(); }
catch(LookaheadSuccess ls) { return true; }
finally { jj_save(2, xla); }
}
- final private boolean jj_2_4(int xla) {
+ private boolean jj_2_4(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
try { return !jj_3_4(); }
catch(LookaheadSuccess ls) { return true; }
finally { jj_save(3, xla); }
}
- final private boolean jj_2_5(int xla) {
+ private boolean jj_2_5(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
try { return !jj_3_5(); }
catch(LookaheadSuccess ls) { return true; }
finally { jj_save(4, xla); }
}
- final private boolean jj_2_6(int xla) {
+ private boolean jj_2_6(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
try { return !jj_3_6(); }
catch(LookaheadSuccess ls) { return true; }
finally { jj_save(5, xla); }
}
- final private boolean jj_2_7(int xla) {
+ private boolean jj_2_7(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
try { return !jj_3_7(); }
catch(LookaheadSuccess ls) { return true; }
finally { jj_save(6, xla); }
}
- final private boolean jj_2_8(int xla) {
+ private boolean jj_2_8(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
try { return !jj_3_8(); }
catch(LookaheadSuccess ls) { return true; }
finally { jj_save(7, xla); }
}
- final private boolean jj_3_8() {
+ private boolean jj_3_8() {
if (jj_scan_token(COMMA)) return true;
return false;
}
- final private boolean jj_3_3() {
+ private boolean jj_3_3() {
if (jj_scan_token(OPEN_BRACES)) return true;
Token xsp;
while (true) {
@@ -692,17 +692,17 @@ import java.util.Vector;
return false;
}
- final private boolean jj_3_2() {
+ private boolean jj_3_2() {
if (jj_scan_token(OPEN_PARENS)) return true;
return false;
}
- final private boolean jj_3_7() {
+ private boolean jj_3_7() {
if (jj_scan_token(COMMA)) return true;
return false;
}
- final private boolean jj_3_1() {
+ private boolean jj_3_1() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(5)) {
@@ -712,12 +712,12 @@ import java.util.Vector;
return false;
}
- final private boolean jj_3_5() {
+ private boolean jj_3_5() {
if (jj_scan_token(TERM)) return true;
return false;
}
- final private boolean jj_3_6() {
+ private boolean jj_3_6() {
Token xsp;
while (true) {
xsp = jj_scanpos;
@@ -727,7 +727,7 @@ import java.util.Vector;
return false;
}
- final private boolean jj_3_4() {
+ private boolean jj_3_4() {
if (jj_scan_token(OPEN_BRACES)) return true;
Token xsp;
while (true) {
@@ -826,7 +826,7 @@ import java.util.Vector;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
- final private Token jj_consume_token(int kind) throws ParseException {
+ private Token jj_consume_token(int kind) throws ParseException {
Token oldToken;
if ((oldToken = token).next != null) token = token.next;
else token = token.next = token_source.getNextToken();
@@ -852,7 +852,7 @@ import java.util.Vector;
static private final class LookaheadSuccess extends java.lang.Error { }
final private LookaheadSuccess jj_ls = new LookaheadSuccess();
- final private boolean jj_scan_token(int kind) {
+ private boolean jj_scan_token(int kind) {
if (jj_scanpos == jj_lastpos) {
jj_la--;
if (jj_scanpos.next == null) {
@@ -890,7 +890,7 @@ import java.util.Vector;
return t;
}
- final private int jj_ntk() {
+ private int jj_ntk() {
if ((jj_nt=token.next) == null)
return (jj_ntk = (token.next=token_source.getNextToken()).kind);
else
@@ -973,7 +973,7 @@ import java.util.Vector;
final public void disable_tracing() {
}
- final private void jj_rescan_token() {
+ private void jj_rescan_token() {
jj_rescan = true;
for (int i = 0; i < 8; i++) {
try {
@@ -999,7 +999,7 @@ import java.util.Vector;
jj_rescan = false;
}
- final private void jj_save(int index, int xla) {
+ private void jj_save(int index, int xla) {
JJCalls p = jj_2_rtns[index];
while (p.gen > jj_gen) {
if (p.next == null) { p = p.next = new JJCalls(); break; }
http://git-wip-us.apache.org/repos/asf/oodt/blob/bd08d403/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTokenManager.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTokenManager.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTokenManager.java
index 1babab2..30eeff7 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTokenManager.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTokenManager.java
@@ -5,7 +5,7 @@ public class QueryParserTokenManager implements QueryParserConstants
{
public java.io.PrintStream debugStream = System.out;
public void setDebugStream(java.io.PrintStream ds) { debugStream = ds; }
-private final int jjStopStringLiteralDfa_0(int pos, long active0)
+private int jjStopStringLiteralDfa_0(int pos, long active0)
{
switch (pos)
{
@@ -96,17 +96,17 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0)
return -1;
}
}
-private final int jjStartNfa_0(int pos, long active0)
+private int jjStartNfa_0(int pos, long active0)
{
return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0), pos + 1);
}
-private final int jjStopAtPos(int pos, int kind)
+private int jjStopAtPos(int pos, int kind)
{
jjmatchedKind = kind;
jjmatchedPos = pos;
return pos + 1;
}
-private final int jjStartNfaWithStates_0(int pos, int kind, int state)
+private int jjStartNfaWithStates_0(int pos, int kind, int state)
{
jjmatchedKind = kind;
jjmatchedPos = pos;
@@ -114,7 +114,7 @@ private final int jjStartNfaWithStates_0(int pos, int kind, int state)
catch(java.io.IOException e) { return pos + 1; }
return jjMoveNfa_0(state, pos + 1);
}
-private final int jjMoveStringLiteralDfa0_0()
+private int jjMoveStringLiteralDfa0_0()
{
switch(curChar)
{
@@ -155,7 +155,7 @@ private final int jjMoveStringLiteralDfa0_0()
return jjMoveNfa_0(3, 0);
}
}
-private final int jjMoveStringLiteralDfa1_0(long active0)
+private int jjMoveStringLiteralDfa1_0(long active0)
{
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
@@ -189,7 +189,7 @@ private final int jjMoveStringLiteralDfa1_0(long active0)
}
return jjStartNfa_0(0, active0);
}
-private final int jjMoveStringLiteralDfa2_0(long old0, long active0)
+private int jjMoveStringLiteralDfa2_0(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_0(0, old0);
@@ -213,7 +213,7 @@ private final int jjMoveStringLiteralDfa2_0(long old0, long active0)
}
return jjStartNfa_0(1, active0);
}
-private final int jjMoveStringLiteralDfa3_0(long old0, long active0)
+private int jjMoveStringLiteralDfa3_0(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_0(1, old0);
@@ -241,7 +241,7 @@ private final int jjMoveStringLiteralDfa3_0(long old0, long active0)
}
return jjStartNfa_0(2, active0);
}
-private final int jjMoveStringLiteralDfa4_0(long old0, long active0)
+private int jjMoveStringLiteralDfa4_0(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_0(2, old0);
@@ -263,7 +263,7 @@ private final int jjMoveStringLiteralDfa4_0(long old0, long active0)
}
return jjStartNfa_0(3, active0);
}
-private final int jjMoveStringLiteralDfa5_0(long old0, long active0)
+private int jjMoveStringLiteralDfa5_0(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_0(3, old0);
@@ -281,7 +281,7 @@ private final int jjMoveStringLiteralDfa5_0(long old0, long active0)
}
return jjStartNfa_0(4, active0);
}
-private final int jjMoveStringLiteralDfa6_0(long old0, long active0)
+private int jjMoveStringLiteralDfa6_0(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_0(4, old0);
@@ -299,7 +299,7 @@ private final int jjMoveStringLiteralDfa6_0(long old0, long active0)
}
return jjStartNfa_0(5, active0);
}
-private final int jjMoveStringLiteralDfa7_0(long old0, long active0)
+private int jjMoveStringLiteralDfa7_0(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_0(5, old0);
@@ -317,7 +317,7 @@ private final int jjMoveStringLiteralDfa7_0(long old0, long active0)
}
return jjStartNfa_0(6, active0);
}
-private final int jjMoveStringLiteralDfa8_0(long old0, long active0)
+private int jjMoveStringLiteralDfa8_0(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_0(6, old0);
@@ -335,7 +335,7 @@ private final int jjMoveStringLiteralDfa8_0(long old0, long active0)
}
return jjStartNfa_0(7, active0);
}
-private final int jjMoveStringLiteralDfa9_0(long old0, long active0)
+private int jjMoveStringLiteralDfa9_0(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_0(7, old0);
@@ -353,7 +353,7 @@ private final int jjMoveStringLiteralDfa9_0(long old0, long active0)
}
return jjStartNfa_0(8, active0);
}
-private final int jjMoveStringLiteralDfa10_0(long old0, long active0)
+private int jjMoveStringLiteralDfa10_0(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_0(8, old0);
@@ -373,7 +373,7 @@ private final int jjMoveStringLiteralDfa10_0(long old0, long active0)
}
return jjStartNfa_0(9, active0);
}
-private final void jjCheckNAdd(int state)
+private void jjCheckNAdd(int state)
{
if (jjrounds[state] != jjround)
{
@@ -381,29 +381,29 @@ private final void jjCheckNAdd(int state)
jjrounds[state] = jjround;
}
}
-private final void jjAddStates(int start, int end)
+private void jjAddStates(int start, int end)
{
do {
jjstateSet[jjnewStateCnt++] = jjnextStates[start];
} while (start++ != end);
}
-private final void jjCheckNAddTwoStates(int state1, int state2)
+private void jjCheckNAddTwoStates(int state1, int state2)
{
jjCheckNAdd(state1);
jjCheckNAdd(state2);
}
-private final void jjCheckNAddStates(int start, int end)
+private void jjCheckNAddStates(int start, int end)
{
do {
jjCheckNAdd(jjnextStates[start]);
} while (start++ != end);
}
-private final void jjCheckNAddStates(int start)
+private void jjCheckNAddStates(int start)
{
jjCheckNAdd(jjnextStates[start]);
jjCheckNAdd(jjnextStates[start + 1]);
}
-private final int jjMoveNfa_0(int startState, int curPos)
+private int jjMoveNfa_0(int startState, int curPos)
{
int[] nextStates;
int startsAt = 0;
@@ -637,7 +637,7 @@ public void ReInit(SimpleCharStream stream)
input_stream = stream;
ReInitRounds();
}
-private final void ReInitRounds()
+private void ReInitRounds()
{
int i;
jjround = 0x80000001;
http://git-wip-us.apache.org/repos/asf/oodt/blob/bd08d403/opendapps/src/main/java/org/apache/oodt/opendapps/Profiler.java
----------------------------------------------------------------------
diff --git a/opendapps/src/main/java/org/apache/oodt/opendapps/Profiler.java b/opendapps/src/main/java/org/apache/oodt/opendapps/Profiler.java
index ae85684..6ffc432 100644
--- a/opendapps/src/main/java/org/apache/oodt/opendapps/Profiler.java
+++ b/opendapps/src/main/java/org/apache/oodt/opendapps/Profiler.java
@@ -145,7 +145,7 @@ public class Profiler {
}
- private final static void usage() {
+ private static void usage() {
System.out
.println("Usage: java -classpath [path to opendapps-version-jar-with-dependencies.jar] org.apache.oodt.opendapps.Profiler <config file location> [<output_dir>]");
System.out
http://git-wip-us.apache.org/repos/asf/oodt/blob/bd08d403/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java
----------------------------------------------------------------------
diff --git a/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java b/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java
index b5dceee..bdf21d1 100644
--- a/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java
+++ b/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java
@@ -170,7 +170,7 @@ final class ChunkedProductInputStream extends InputStream {
*
* @throws IOException if the stream's closed.
*/
- private final void checkOpen() throws IOException {
+ private void checkOpen() throws IOException {
if (open) return;
throw new IOException("Stream closed");
}
[3/4] oodt git commit: OODT-890 remove unneeded boxing, unboxing,
swap indexof to contains, stringbuffer to builder
Posted by ma...@apache.org.
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');
[4/4] oodt git commit: OODT-890 remove unneeded boxing, unboxing,
swap indexof to contains, stringbuffer to builder
Posted by ma...@apache.org.
OODT-890 remove unneeded boxing, unboxing, swap indexof to contains, stringbuffer to builder
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/559a65f6
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/559a65f6
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/559a65f6
Branch: refs/heads/master
Commit: 559a65f615de08e12f4053805020065e4d639556
Parents: edb01cb
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Oct 25 11:33:17 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Oct 25 11:33:17 2015 +0000
----------------------------------------------------------------------
.../browser/controller/TableListener.java | 2 +-
.../filemgr/browser/view/panels/TablePane.java | 2 +-
.../catalog/cli/action/PagedQueryCliAction.java | 2 +-
.../cas/catalog/cli/action/QueryCliAction.java | 2 +-
.../cli/action/ReducedPagedQueryCliAction.java | 2 +-
.../cli/action/ReducedQueryCliAction.java | 2 +-
.../cas/catalog/query/parser/TokenMgrError.java | 2 +-
.../XmlRpcCommunicationChannelServer.java | 4 +-
.../apache/oodt/cas/cli/util/CmdLineUtils.java | 4 +-
.../oodt/cas/cli/util/TestCmdLineIterable.java | 2 +-
.../org/apache/oodt/commons/Configuration.java | 4 +-
.../org/apache/oodt/commons/ExecServer.java | 3 +-
.../org/apache/oodt/commons/MultiServer.java | 34 ++++-----
.../apache/oodt/commons/activity/Activity.java | 4 +-
.../oodt/commons/activity/DatagramLogger.java | 34 ++++-----
.../DatagramLoggingActivityFactory.java | 34 ++++-----
.../apache/oodt/commons/activity/History.java | 36 +++++-----
.../apache/oodt/commons/database/SqlScript.java | 2 +-
.../apache/oodt/commons/exec/EnvUtilities.java | 4 +-
.../apache/oodt/commons/exec/ExecHelper.java | 4 +-
.../commons/filter/TimeEventWeightedHash.java | 2 +-
.../oodt/commons/object/jndi/RMIContext.java | 2 +-
.../apache/oodt/commons/util/DateConvert.java | 2 +-
.../java/org/apache/oodt/commons/util/LDAP.java | 2 +-
.../java/org/apache/oodt/commons/util/XML.java | 2 +-
.../org/apache/oodt/commons/util/XMLRPC.java | 2 +-
.../org/apache/oodt/commons/xml/DOMUtil.java | 2 +-
.../apache/oodt/cas/crawl/ProductCrawler.java | 2 +-
.../oodt/cas/crawl/action/FileSettings.java | 2 +-
.../cas/crawl/daemon/CrawlDaemonController.java | 23 +++---
.../MimeExtractorConfigReader.java | 5 +-
.../cas/crawl/option/TestBooleanOptions.java | 4 +-
.../cas/curation/service/DirectoryResource.java | 2 +-
.../cas/curation/service/IngestionResource.java | 4 +-
.../cas/curation/service/MetadataResource.java | 4 +-
.../cas/curation/service/PolicyResource.java | 4 +-
.../curation/util/ExtractorConfigWriter.java | 2 +-
.../catalog/DataSourceCatalogFactory.java | 12 ++--
.../filemgr/catalog/LuceneCatalogFactory.java | 17 +++--
.../catalog/solr/DefaultProductSerializer.java | 5 +-
.../cli/action/AbstractQueryCliAction.java | 2 +-
.../datatransfer/RemoteDataTransferFactory.java | 4 +-
.../oodt/cas/filemgr/structs/Product.java | 3 +-
.../apache/oodt/cas/filemgr/structs/Query.java | 2 +-
.../oodt/cas/filemgr/tools/QueryTool.java | 2 +-
.../oodt/cas/filemgr/util/QueryUtils.java | 2 +-
.../oodt/cas/filemgr/util/XmlStructFactory.java | 7 +-
.../versioning/MetadataBasedFileVersioner.java | 2 +-
.../filemgr/structs/type/TestTypeHandler.java | 12 ++--
.../oodt/grid/RestfulProductQueryServlet.java | 2 +-
.../main/java/org/apache/oodt/grid/Utility.java | 2 +-
.../metadata/extractors/ExternConfigReader.java | 17 ++---
.../oodt/cas/metadata/util/PathUtils.java | 4 +-
.../apache/oodt/pcs/pedigree/PedigreeTree.java | 2 +-
.../apache/oodt/pcs/tools/PCSHealthMonitor.java | 3 +-
.../xmlquery/ChunkedProductInputStream.java | 2 +-
.../java/org/apache/oodt/profile/Profile.java | 2 +-
.../lightweight/LightweightProfileServer.java | 2 +-
.../org/apache/oodt/profile/ProfileTest.java | 2 +-
.../oodt/cas/protocol/http/util/HttpUtils.java | 2 +-
.../oodt/cas/protocol/imaps/ImapsProtocol.java | 4 +-
.../pushpull/filerestrictions/VirtualFile.java | 4 +-
.../retrievalsystem/FileRetrievalSystem.java | 2 +-
.../cas/resource/batchmgr/XmlRpcBatchMgr.java | 2 +-
.../resource/batchmgr/XmlRpcBatchMgrProxy.java | 10 ++-
.../resource/system/extern/XmlRpcBatchStub.java | 6 +-
.../cas/resource/util/XmlStructFactory.java | 7 +-
.../security/sso/opensso/IdentityDetails.java | 2 +-
.../oodt/security/sso/opensso/UserDetails.java | 2 +-
.../workflow/model/WorkflowViewer.java | 2 +-
.../jaxrs/configurations/RdfConfiguration.java | 2 +-
.../jaxrs/configurations/RssConfiguration.java | 2 +-
.../oodt/cas/product/rdf/RDFDatasetServlet.java | 2 +-
.../oodt/cas/product/rdf/RDFProductServlet.java | 2 +-
.../oodt/cas/product/rss/RSSProductServlet.java | 2 +-
.../apache/oodt/cas/product/rss/RSSUtils.java | 2 +-
.../processor/WorkflowProcessorHelper.java | 4 +-
.../oodt/cas/workflow/examples/MailTask.java | 4 +-
...SourceWorkflowInstanceRepositoryFactory.java | 3 +-
...LuceneWorkflowInstanceRepositoryFactory.java | 3 +-
...MemoryWorkflowInstanceRepositoryFactory.java | 3 +-
.../structs/HighestFIFOPrioritySorter.java | 6 +-
.../workflow/structs/ParentChildWorkflow.java | 2 +-
.../system/XmlRpcWorkflowManagerClient.java | 75 +++++++++-----------
.../cas/workflow/util/XmlRpcStructFactory.java | 4 +-
.../cas/workflow/util/XmlStructFactory.java | 3 +-
.../engine/TestThreadPoolWorkflowEngine.java | 20 +++---
.../oodt/xmlps/profile/XMLPSProfileHandler.java | 2 +-
.../org/apache/oodt/xmlps/structs/CDERow.java | 2 +-
.../oodt/xmlquery/CompressedStringCodec.java | 2 +-
.../java/org/apache/oodt/xmlquery/XMLQuery.java | 4 +-
91 files changed, 261 insertions(+), 288 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/controller/TableListener.java
----------------------------------------------------------------------
diff --git a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/controller/TableListener.java b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/controller/TableListener.java
index dec6add..3e86b7a 100644
--- a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/controller/TableListener.java
+++ b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/controller/TableListener.java
@@ -110,7 +110,7 @@ public class TableListener implements MouseListener, ActionListener {
}
} else if (arg0.getActionCommand().equals("Unhide Columns")) {
while (!table.hiddenCols.isEmpty()) {
- table.unhideColumn((table.hiddenCols.firstElement()).intValue());
+ table.unhideColumn(table.hiddenCols.firstElement());
}
} else if (arg0.getActionCommand().equals("Export Table")) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/TablePane.java
----------------------------------------------------------------------
diff --git a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/TablePane.java b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/TablePane.java
index 3c096da..3c06a60 100644
--- a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/TablePane.java
+++ b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/TablePane.java
@@ -135,7 +135,7 @@ public class TablePane extends JPanel{
for(int i=1;i<this.getComponentCount();i++){
((Row)this.getComponent(i)).hideCol(colNum);
}
- hiddenCols.add(Integer.valueOf(colNum));
+ hiddenCols.add(colNum);
}
public void unhideColumn(int colNum){
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/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 0fef91a..fe30a63 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
@@ -65,7 +65,7 @@ public class PagedQueryCliAction extends CatalogServiceCliAction {
for (TransactionalMetadata tMet : transactionMetadatas) {
printer.print("ID: " + tMet.getTransactionId() + " ; CatalogIDs: "
+ tMet.getCatalogIds() + " ; Metadata: (");
- StringBuffer sb = new StringBuffer("");
+ StringBuilder sb = new StringBuilder("");
for (Object metKey : tMet.getMetadata().getHashtable().keySet()) {
sb.append(metKey
+ "="
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/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 a896e13..0152990 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
@@ -60,7 +60,7 @@ public class QueryCliAction extends CatalogServiceCliAction {
for (TransactionalMetadata tMet : transactionMetadatas) {
printer.print("ID: " + tMet.getTransactionId() + " ; CatalogIDs: "
+ tMet.getCatalogIds() + " ; Metadata: (");
- StringBuffer sb = new StringBuffer("");
+ StringBuilder sb = new StringBuilder("");
for (Object metKey : tMet.getMetadata().getHashtable().keySet()) {
sb.append(metKey
+ "="
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/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 a6a0574..0620a55 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
@@ -68,7 +68,7 @@ public class ReducedPagedQueryCliAction extends CatalogServiceCliAction {
List<TransactionalMetadata> transactionMetadatas = getClient()
.getMetadata(page);
for (TransactionalMetadata tMet : transactionMetadatas) {
- StringBuffer sb = new StringBuffer("");
+ StringBuilder sb = new StringBuilder("");
for (String termName : this.termNames) {
List<String> values = tMet.getMetadata().getAllMetadata(
(String) termName);
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/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 8753db7..0e374c2 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
@@ -62,7 +62,7 @@ public class ReducedQueryCliAction extends CatalogServiceCliAction {
List<TransactionalMetadata> transactionMetadatas = getClient()
.getAllPages(queryPager);
for (TransactionalMetadata tMet : transactionMetadatas) {
- StringBuffer sb = new StringBuffer("");
+ StringBuilder sb = new StringBuilder("");
for (String termName : this.termNames) {
List<String> values = tMet.getMetadata().getAllMetadata(
(String) termName);
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/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 27df15c..8ea8f26 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
@@ -48,7 +48,7 @@ public class TokenMgrError extends Error
* equivalents in the given string
*/
protected static final String addEscapes(String str) {
- StringBuffer retval = new StringBuffer();
+ StringBuilder retval = new StringBuilder();
char ch;
for (int i = 0; i < str.length(); i++) {
switch (str.charAt(i))
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java
index 59187f3..d26458d 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java
@@ -233,11 +233,11 @@ public class XmlRpcCommunicationChannelServer extends
}
public String xmlrpc_isRestrictIngestPermissions() throws Exception {
- return this.serializer.serializeObject(new Boolean(this.isRestrictIngestPermissions()));
+ return this.serializer.serializeObject(this.isRestrictIngestPermissions());
}
public String xmlrpc_isRestrictQueryPermissions() throws Exception {
- return this.serializer.serializeObject(new Boolean(this.isRestrictQueryPermissions()));
+ return this.serializer.serializeObject(this.isRestrictQueryPermissions());
}
public String xmlrpc_query(String queryExpressionObject) throws Exception {
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/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 06e1454..c23f8bb 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
@@ -1048,7 +1048,7 @@ public class CmdLineUtils {
*/
public static String getFormattedString(String string, int startIndex,
int endIndex) {
- StringBuffer outputString = new StringBuffer("");
+ StringBuilder outputString = new StringBuilder("");
String[] splitStrings = StringUtils.split(string, " ");
StringBuffer curLine = null;
for (int i = 0; i < splitStrings.length; i++) {
@@ -1108,7 +1108,7 @@ public class CmdLineUtils {
doubles.add(new Double(value));
return doubles;
} else if (type.equals(String.class)) {
- StringBuffer combinedString = new StringBuffer("");
+ StringBuilder combinedString = new StringBuilder("");
for (String value : values)
combinedString.append(value + " ");
return Lists.newArrayList(combinedString.toString().trim());
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/cli/src/test/java/org/apache/oodt/cas/cli/util/TestCmdLineIterable.java
----------------------------------------------------------------------
diff --git a/cli/src/test/java/org/apache/oodt/cas/cli/util/TestCmdLineIterable.java b/cli/src/test/java/org/apache/oodt/cas/cli/util/TestCmdLineIterable.java
index 3ba75e3..e07590a 100644
--- a/cli/src/test/java/org/apache/oodt/cas/cli/util/TestCmdLineIterable.java
+++ b/cli/src/test/java/org/apache/oodt/cas/cli/util/TestCmdLineIterable.java
@@ -36,7 +36,7 @@ public class TestCmdLineIterable extends TestCase {
private static final String ARGS_STRING = "--operation download --url http://somewhere.com --user foo --pass bar --toDir /tmp";
public void testIteration() throws CmdLineParserException {
- StringBuffer argsString = new StringBuffer("");
+ StringBuilder argsString = new StringBuilder("");
CmdLineIterable<ParsedArg> args = createArgs();
for (ParsedArg arg : args) {
if (arg.getType().equals(ParsedArg.Type.OPTION)) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/commons/src/main/java/org/apache/oodt/commons/Configuration.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/Configuration.java b/commons/src/main/java/org/apache/oodt/commons/Configuration.java
index 69a6909..00028af 100644
--- a/commons/src/main/java/org/apache/oodt/commons/Configuration.java
+++ b/commons/src/main/java/org/apache/oodt/commons/Configuration.java
@@ -300,7 +300,7 @@ public class Configuration {
Node xmlNode = children.item(i);
if ("entityRef".equals(xmlNode.getNodeName())) {
NodeList dirNodes = xmlNode.getChildNodes();
- StringBuffer refDirs = new StringBuffer(System.getProperty(ENTITY_DIRS_PROP, ""));
+ StringBuilder refDirs = new StringBuilder(System.getProperty(ENTITY_DIRS_PROP, ""));
for (int j = 0; j < dirNodes.getLength(); ++j)
refDirs.append(',').append(XML.unwrappedText(dirNodes.item(j)));
if (refDirs.length() > 0)
@@ -331,7 +331,7 @@ public class Configuration {
String registryList = System.getProperty("org.apache.oodt.commons.rmiregistries", System.getProperty("rmiregistries"));
if (registryList == null) {
String host = System.getProperty("rmiregistry.host", "localhost");
- int port = Integer.getInteger("rmiregistry.port", Registry.REGISTRY_PORT).intValue();
+ int port = Integer.getInteger("rmiregistry.port", Registry.REGISTRY_PORT);
registryList = "rmi://" + host + ":" + port;
}
contextEnvironment.put("rmiregistries", registryList);
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/commons/src/main/java/org/apache/oodt/commons/ExecServer.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/ExecServer.java b/commons/src/main/java/org/apache/oodt/commons/ExecServer.java
index 4f4f5ee..6a61f3c 100644
--- a/commons/src/main/java/org/apache/oodt/commons/ExecServer.java
+++ b/commons/src/main/java/org/apache/oodt/commons/ExecServer.java
@@ -475,5 +475,6 @@ public class ExecServer {
public static final String DISABLE_BINDING = "org.apache.oodt.commons.ExecServer.disableBinding";
/** How long to wait before bind attempts, in ms. */
- private static final long REBIND_PERIOD = Long.getLong("org.apache.oodt.commons.ExecServer.rebindPeriod", 30*60*1000).longValue();
+ private static final long REBIND_PERIOD =
+ Long.getLong("org.apache.oodt.commons.ExecServer.rebindPeriod", 30 * 60 * 1000);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/commons/src/main/java/org/apache/oodt/commons/MultiServer.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/MultiServer.java b/commons/src/main/java/org/apache/oodt/commons/MultiServer.java
index db89f91..baa6054 100644
--- a/commons/src/main/java/org/apache/oodt/commons/MultiServer.java
+++ b/commons/src/main/java/org/apache/oodt/commons/MultiServer.java
@@ -1,19 +1,19 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.oodt.commons;
@@ -157,7 +157,7 @@ public class MultiServer {
String registryList = System.getProperty("org.apache.oodt.commons.rmiregistries", System.getProperty("rmiregistries"));
if (registryList == null) {
String host = System.getProperty("rmiregistry.host", "localhost");
- int port = Integer.getInteger("rmiregistry.port", Registry.REGISTRY_PORT).intValue();
+ int port = Integer.getInteger("rmiregistry.port", Registry.REGISTRY_PORT);
registryList = "rmi://" + host + ":" + port;
}
t.put("rmiregistries", registryList);
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/commons/src/main/java/org/apache/oodt/commons/activity/Activity.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/activity/Activity.java b/commons/src/main/java/org/apache/oodt/commons/activity/Activity.java
index 5941573..1f35901 100644
--- a/commons/src/main/java/org/apache/oodt/commons/activity/Activity.java
+++ b/commons/src/main/java/org/apache/oodt/commons/activity/Activity.java
@@ -100,12 +100,12 @@ public abstract class Activity {
Date date = new Date(); // Get the current time
byte[] bytes = new byte[32]; // Make space for 32 random bytes
RANDOM.nextBytes(bytes); // Fill in 32 random bytes
- StringBuffer input = new StringBuffer(); // Make space to put the 1st 3 components...
+ StringBuilder input = new StringBuilder(); // Make space to put the 1st 3 components...
input.append(addr).append(nextNum).append(date); // ...together and put 'em together
MessageDigest messageDigest = MessageDigest.getInstance("MD5");// Prepare to take a hash
messageDigest.update(input.toString().getBytes()); // Add the 1st 3 components
byte[] sig = messageDigest.digest(bytes); // And add the random bytes
- StringBuffer output = new StringBuffer(); // Make space to store the hash as a string
+ StringBuilder output = new StringBuilder(); // Make space to store the hash as a string
for (int i = 0; i < sig.length; ++i) // For each byte in the hash
output.append(Integer.toHexString(((int)sig[i])&0xff));// Store it as a hex value
return output.toString(); // And return the string
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/commons/src/main/java/org/apache/oodt/commons/activity/DatagramLogger.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/activity/DatagramLogger.java b/commons/src/main/java/org/apache/oodt/commons/activity/DatagramLogger.java
index 4cdc3dd..64bf60b 100644
--- a/commons/src/main/java/org/apache/oodt/commons/activity/DatagramLogger.java
+++ b/commons/src/main/java/org/apache/oodt/commons/activity/DatagramLogger.java
@@ -1,19 +1,19 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.oodt.commons.activity;
@@ -44,7 +44,7 @@ class DatagramLogger {
System.err.println("Set the activity.storage property to set the Storage class to use.");
System.exit(1);
}
- int port = Integer.getInteger("activity.port", 4556).intValue();
+ int port = Integer.getInteger("activity.port", 4556);
String className = System.getProperty("activity.storage");
if (className == null) {
System.err.println("No Storage class defined via the `activity.storage' property; exiting...");
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/commons/src/main/java/org/apache/oodt/commons/activity/DatagramLoggingActivityFactory.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/activity/DatagramLoggingActivityFactory.java b/commons/src/main/java/org/apache/oodt/commons/activity/DatagramLoggingActivityFactory.java
index fabdae7..7903797 100644
--- a/commons/src/main/java/org/apache/oodt/commons/activity/DatagramLoggingActivityFactory.java
+++ b/commons/src/main/java/org/apache/oodt/commons/activity/DatagramLoggingActivityFactory.java
@@ -1,19 +1,19 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.oodt.commons.activity;
@@ -52,7 +52,7 @@ public class DatagramLoggingActivityFactory implements ActivityFactory {
String hostname = System.getProperty("org.apache.oodt.commons.activity.DatagramLoggingActivityFactory.host",
System.getProperty("activity.host", ""));
port = Integer.getInteger("org.apache.oodt.commons.activity.DatagramLoggingActivityFactory.port",
- Integer.getInteger("activity.port", 4556)).intValue();
+ Integer.getInteger("activity.port", 4556));
if (hostname.length() == 0)
throw new IllegalStateException("System property `org.apache.oodt.commons.activity.DatagramLoggingActivityFactory.host'"
+ " (or simply `activity.host') not defined or is empty");
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/commons/src/main/java/org/apache/oodt/commons/activity/History.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/activity/History.java b/commons/src/main/java/org/apache/oodt/commons/activity/History.java
index ae9a507..7267338 100644
--- a/commons/src/main/java/org/apache/oodt/commons/activity/History.java
+++ b/commons/src/main/java/org/apache/oodt/commons/activity/History.java
@@ -1,19 +1,19 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.oodt.commons.activity;
@@ -150,8 +150,8 @@ final class History {
private static final Timer TIMER = new Timer(/*isDaemon*/true);
/** How many milliseconds to wait before giving up on an idle history. */
- static long idleTime = Long.getLong("org.apache.oodt.commons.activity.History.idle", 5*60*1000).longValue();
+ static long idleTime = Long.getLong("org.apache.oodt.commons.activity.History.idle", 5 * 60 * 1000);
/** How many milliseconds to wait to give a history extra time to receive incidents before saving it to storage. */
- static long closeTime = Long.getLong("org.apache.oodt.commons.activity.History.close", 5*60*1000).longValue();
+ static long closeTime = Long.getLong("org.apache.oodt.commons.activity.History.close", 5 * 60 * 1000);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/commons/src/main/java/org/apache/oodt/commons/database/SqlScript.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/database/SqlScript.java b/commons/src/main/java/org/apache/oodt/commons/database/SqlScript.java
index 1127293..e54888a 100644
--- a/commons/src/main/java/org/apache/oodt/commons/database/SqlScript.java
+++ b/commons/src/main/java/org/apache/oodt/commons/database/SqlScript.java
@@ -114,7 +114,7 @@ public class SqlScript {
try {
String line = null;
- StringBuffer query = new StringBuffer();
+ StringBuilder query = new StringBuilder();
boolean queryEnds = false;
while ((line = reader.readLine()) != null) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/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 ae06eac..e224480 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
@@ -136,7 +136,7 @@ public final class EnvUtilities {
* If any error occurs.
*/
public static String slurp(InputStream in) throws IOException {
- StringBuffer out = new StringBuffer();
+ StringBuilder out = new StringBuilder();
byte[] b = new byte[4096];
for (int n; (n = in.read(b)) != -1;) {
out.append(new String(b, 0, n));
@@ -151,7 +151,7 @@ public final class EnvUtilities {
// so \\\\ with \\\\\\\\
BufferedReader reader = new BufferedReader(new InputStreamReader(is));
String line = null;
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
while ((line = reader.readLine()) != null) {
// fix the line
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/commons/src/main/java/org/apache/oodt/commons/exec/ExecHelper.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/exec/ExecHelper.java b/commons/src/main/java/org/apache/oodt/commons/exec/ExecHelper.java
index e5e89b4..b6730a5 100644
--- a/commons/src/main/java/org/apache/oodt/commons/exec/ExecHelper.java
+++ b/commons/src/main/java/org/apache/oodt/commons/exec/ExecHelper.java
@@ -329,8 +329,8 @@ public final class ExecHelper {
*/
private ExecHelper(Process process, String charset) throws IOException {
try {
- StringBuffer output = new StringBuffer();
- StringBuffer error = new StringBuffer();
+ StringBuilder output = new StringBuilder();
+ StringBuilder error = new StringBuilder();
Reader stdout;
Reader stderr;
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/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 38aa8fd..528e395 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
@@ -368,7 +368,7 @@ public class TimeEventWeightedHash {
}
public String toString() {
- StringBuffer sb = new StringBuffer("");
+ StringBuilder sb = new StringBuilder("");
LinkedList<TimeEventNode> printNodes = new LinkedList<TimeEventNode>();
printNodes.add(this.root);
sb.append(printNodes(printNodes, "-", 0));
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/commons/src/main/java/org/apache/oodt/commons/object/jndi/RMIContext.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/object/jndi/RMIContext.java b/commons/src/main/java/org/apache/oodt/commons/object/jndi/RMIContext.java
index b3427e4..b8063be 100644
--- a/commons/src/main/java/org/apache/oodt/commons/object/jndi/RMIContext.java
+++ b/commons/src/main/java/org/apache/oodt/commons/object/jndi/RMIContext.java
@@ -333,7 +333,7 @@ public class RMIContext implements Context {
if (registry != null) return registry;
try {
String host = environment.containsKey("host")? (String) environment.get("host") : "localhost";
- int port = environment.containsKey("port")? ((Integer) environment.get("port")).intValue()
+ int port = environment.containsKey("port")? (Integer) environment.get("port")
: Registry.REGISTRY_PORT;
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/commons/src/main/java/org/apache/oodt/commons/util/DateConvert.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/util/DateConvert.java b/commons/src/main/java/org/apache/oodt/commons/util/DateConvert.java
index 4e4ea57..2a8d1d8 100644
--- a/commons/src/main/java/org/apache/oodt/commons/util/DateConvert.java
+++ b/commons/src/main/java/org/apache/oodt/commons/util/DateConvert.java
@@ -132,7 +132,7 @@ public class DateConvert {
// Determine the sign of the offset.
String sign = "+";
- if (String.valueOf(tzOffsetMS).indexOf("-") != -1) {
+ if (String.valueOf(tzOffsetMS).contains("-")) {
sign = "-";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/commons/src/main/java/org/apache/oodt/commons/util/LDAP.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/util/LDAP.java b/commons/src/main/java/org/apache/oodt/commons/util/LDAP.java
index 81a0c70..0dc52d4 100644
--- a/commons/src/main/java/org/apache/oodt/commons/util/LDAP.java
+++ b/commons/src/main/java/org/apache/oodt/commons/util/LDAP.java
@@ -32,7 +32,7 @@ public class LDAP {
* @return An escaped, LDAP-safe string.
*/
public static String toLDAPString(String str) {
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
for (int i = 0; i < str.length(); ++i) {
char ch = str.charAt(i);
switch (ch) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/commons/src/main/java/org/apache/oodt/commons/util/XML.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/util/XML.java b/commons/src/main/java/org/apache/oodt/commons/util/XML.java
index 3f82380..bd0a71b 100644
--- a/commons/src/main/java/org/apache/oodt/commons/util/XML.java
+++ b/commons/src/main/java/org/apache/oodt/commons/util/XML.java
@@ -439,7 +439,7 @@ public class XML {
public static String unwrappedText(Node node) {
if (node == null) return null;
StringBuffer buffer = new StringBuffer();
- StringBuffer wrapped = new StringBuffer(text1(node, buffer));
+ StringBuilder wrapped = new StringBuilder(text1(node, buffer));
boolean newline = false;
for (int i = 0; i < wrapped.length(); ++i) {
if (newline == false) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/commons/src/main/java/org/apache/oodt/commons/util/XMLRPC.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/util/XMLRPC.java b/commons/src/main/java/org/apache/oodt/commons/util/XMLRPC.java
index 14d7549..b2ed7f8 100644
--- a/commons/src/main/java/org/apache/oodt/commons/util/XMLRPC.java
+++ b/commons/src/main/java/org/apache/oodt/commons/util/XMLRPC.java
@@ -83,7 +83,7 @@ public class XMLRPC {
if (value instanceof Integer || value instanceof Short) {
XML.add(valueElement, "int", value.toString());
} else if (value instanceof Boolean) {
- XML.add(valueElement, "boolean", ((Boolean) value).booleanValue()? "1" : "0");
+ XML.add(valueElement, "boolean", (Boolean) value ? "1" : "0");
} else if (value instanceof String) {
Element stringElement = doc.createElement("string");
valueElement.appendChild(stringElement);
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/commons/src/main/java/org/apache/oodt/commons/xml/DOMUtil.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/xml/DOMUtil.java b/commons/src/main/java/org/apache/oodt/commons/xml/DOMUtil.java
index c780323..0343d27 100644
--- a/commons/src/main/java/org/apache/oodt/commons/xml/DOMUtil.java
+++ b/commons/src/main/java/org/apache/oodt/commons/xml/DOMUtil.java
@@ -92,7 +92,7 @@ public class DOMUtil {
* @return String text inbetween the simple element tag.
*/
public static String getSimpleElementText(Element node) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
NodeList children = node.getChildNodes();
for (int i = 0; i < children.getLength(); i++) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/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 2f96746..2a7966a 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
@@ -231,7 +231,7 @@ public abstract class ProductCrawler extends ProductCrawlerBean {
}
@VisibleForTesting void validateActions() {
- StringBuffer actionErrors = new StringBuffer("");
+ StringBuilder actionErrors = new StringBuilder("");
for (CrawlerAction action : actionRepo.getActions()) {
try {
action.validate();
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/crawler/src/main/java/org/apache/oodt/cas/crawl/action/FileSettings.java
----------------------------------------------------------------------
diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/FileSettings.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/FileSettings.java
index 66665b7..fc86178 100755
--- a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/FileSettings.java
+++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/FileSettings.java
@@ -59,7 +59,7 @@ public class FileSettings {
}
public String getPreparedFileString(File file) {
- StringBuffer fileString = new StringBuffer();
+ StringBuilder fileString = new StringBuilder();
if (file.getParent() != null) {
fileString.append(file.getParent());
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/crawler/src/main/java/org/apache/oodt/cas/crawl/daemon/CrawlDaemonController.java
----------------------------------------------------------------------
diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/daemon/CrawlDaemonController.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/daemon/CrawlDaemonController.java
index 1628fa5..c23264d 100644
--- a/crawler/src/main/java/org/apache/oodt/cas/crawl/daemon/CrawlDaemonController.java
+++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/daemon/CrawlDaemonController.java
@@ -59,8 +59,8 @@ public class CrawlDaemonController {
double avgCrawlTime = -1.0d;
try {
- avgCrawlTime = ((Double) client.execute(
- "crawldaemon.getAverageCrawlTime", argList)).doubleValue();
+ avgCrawlTime = (Double) client.execute(
+ "crawldaemon.getAverageCrawlTime", argList);
} catch (XmlRpcException e) {
throw new CrawlException(e.getMessage());
} catch (IOException e) {
@@ -76,8 +76,8 @@ public class CrawlDaemonController {
int milisCrawling = -1;
try {
- milisCrawling = ((Integer) client.execute(
- "crawldaemon.getMilisCrawling", argList)).intValue();
+ milisCrawling = (Integer) client.execute(
+ "crawldaemon.getMilisCrawling", argList);
} catch (XmlRpcException e) {
throw new CrawlException(e.getMessage());
} catch (IOException e) {
@@ -93,8 +93,8 @@ public class CrawlDaemonController {
int waitInterval = -1;
try {
- waitInterval = ((Integer) client.execute(
- "crawldaemon.getWaitInterval", argList)).intValue();
+ waitInterval = (Integer) client.execute(
+ "crawldaemon.getWaitInterval", argList);
} catch (XmlRpcException e) {
throw new CrawlException(e.getMessage());
} catch (IOException e) {
@@ -109,8 +109,8 @@ public class CrawlDaemonController {
int numCrawls = -1;
try {
- numCrawls = ((Integer) client.execute("crawldaemon.getNumCrawls",
- argList)).intValue();
+ numCrawls = (Integer) client.execute("crawldaemon.getNumCrawls",
+ argList);
} catch (XmlRpcException e) {
throw new CrawlException(e.getMessage());
} catch (IOException e) {
@@ -126,8 +126,8 @@ public class CrawlDaemonController {
boolean running = false;
try {
- running = ((Boolean) client.execute("crawldaemon.isRunning",
- argList)).booleanValue();
+ running = (Boolean) client.execute("crawldaemon.isRunning",
+ argList);
} catch (XmlRpcException e) {
throw new CrawlException(e.getMessage());
} catch (IOException e) {
@@ -142,8 +142,7 @@ public class CrawlDaemonController {
boolean running = false;
try {
- running = ((Boolean) client.execute("crawldaemon.stop", argList))
- .booleanValue();
+ running = (Boolean) client.execute("crawldaemon.stop", argList);
} catch (XmlRpcException e) {
throw new CrawlException(e.getMessage());
} catch (IOException e) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MimeExtractorConfigReader.java
----------------------------------------------------------------------
diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MimeExtractorConfigReader.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MimeExtractorConfigReader.java
index 520245a..db39a56 100644
--- a/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MimeExtractorConfigReader.java
+++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MimeExtractorConfigReader.java
@@ -54,7 +54,7 @@ public final class MimeExtractorConfigReader implements
MimeExtractorRepo extractorRepo = new MimeExtractorRepo();
extractorRepo.setMagic(Boolean.valueOf(
- root.getAttribute(MAGIC_ATTR)).booleanValue());
+ root.getAttribute(MAGIC_ATTR)));
String mimeTypeFile = PathUtils.replaceEnvVariables(root
.getAttribute(MIME_REPO_ATTR));
if (!mimeTypeFile.startsWith("/")) {
@@ -183,8 +183,7 @@ public final class MimeExtractorConfigReader implements
Element elem = XMLUtils.getFirstElement(elemName, root);
if (elem != null) {
filePath = elem.getAttribute(FILE_ATTR);
- if (Boolean.valueOf(elem.getAttribute(ENV_REPLACE_ATTR))
- .booleanValue())
+ if (Boolean.valueOf(elem.getAttribute(ENV_REPLACE_ATTR)))
filePath = PathUtils.replaceEnvVariables(filePath);
}
return filePath;
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/crawler/src/test/java/org/apache/oodt/cas/crawl/option/TestBooleanOptions.java
----------------------------------------------------------------------
diff --git a/crawler/src/test/java/org/apache/oodt/cas/crawl/option/TestBooleanOptions.java b/crawler/src/test/java/org/apache/oodt/cas/crawl/option/TestBooleanOptions.java
index 63d2a94..865b5fc 100644
--- a/crawler/src/test/java/org/apache/oodt/cas/crawl/option/TestBooleanOptions.java
+++ b/crawler/src/test/java/org/apache/oodt/cas/crawl/option/TestBooleanOptions.java
@@ -39,7 +39,7 @@ public final class TestBooleanOptions extends TestCase {
try {
crawler.getClass().getMethod("setNoRecur",
new Class[] { boolean.class }).invoke(crawler,
- new Object[] { new Boolean(true) });
+ new Object[] { true });
} catch (Exception e) {
fail(e.getMessage());
}
@@ -47,7 +47,7 @@ public final class TestBooleanOptions extends TestCase {
try {
crawler.getClass().getMethod("setCrawlForDirs",
new Class[] { boolean.class }).invoke(crawler,
- new Object[] { new Boolean(true) });
+ new Object[] { true });
} catch (Exception e) {
fail(e.getMessage());
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/curator/services/src/main/java/org/apache/oodt/cas/curation/service/DirectoryResource.java
----------------------------------------------------------------------
diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/DirectoryResource.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/DirectoryResource.java
index 85e07c3..e469fb4 100644
--- a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/DirectoryResource.java
+++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/DirectoryResource.java
@@ -87,7 +87,7 @@ public class DirectoryResource extends CurationService {
public String getDirectoryAreaAsHTML(String base, String path,
boolean showFiles) {
- StringBuffer html = new StringBuffer();
+ StringBuilder html = new StringBuilder();
String relativePath = null;
try {
relativePath = this.cleansePath(path);
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/curator/services/src/main/java/org/apache/oodt/cas/curation/service/IngestionResource.java
----------------------------------------------------------------------
diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/IngestionResource.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/IngestionResource.java
index 0a28842..e1ba9b9 100644
--- a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/IngestionResource.java
+++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/IngestionResource.java
@@ -183,7 +183,7 @@ public class IngestionResource extends CurationService {
}
private String encodeTaskListAsHTML(List<IngestionTask> taskList) {
- StringBuffer out = new StringBuffer();
+ StringBuilder out = new StringBuilder();
for (IngestionTask task : taskList) {
out.append("<tr>");
@@ -245,7 +245,7 @@ public class IngestionResource extends CurationService {
}
private String encodeIngestResponseAsHTML(boolean success, String msg) {
- StringBuffer out = new StringBuffer();
+ StringBuilder out = new StringBuilder();
if (success) {
out.append("Success");
} else {
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/curator/services/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java
----------------------------------------------------------------------
diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java
index e7ed3db..73a6e85 100644
--- a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java
+++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java
@@ -170,7 +170,7 @@ public class MetadataResource extends CurationService {
protected String getExtractorConfigIdsAsHTML(String[] configIds,
String current) {
- StringBuffer html = new StringBuffer();
+ StringBuilder html = new StringBuilder();
for (int i = 0; i < configIds.length; i++) {
html.append("<option ");
if (configIds[i].equals(current)) {
@@ -407,7 +407,7 @@ public class MetadataResource extends CurationService {
return "<table></table>";
}
- StringBuffer html = new StringBuffer();
+ StringBuilder html = new StringBuilder();
html.append("<table>\r\n");
for (String key : (Set<String>) metadata.getHashtable().keySet()) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/curator/services/src/main/java/org/apache/oodt/cas/curation/service/PolicyResource.java
----------------------------------------------------------------------
diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/PolicyResource.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/PolicyResource.java
index 0fa980a..56912d2 100644
--- a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/PolicyResource.java
+++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/PolicyResource.java
@@ -203,7 +203,7 @@ public class PolicyResource extends CurationService {
}
private String encodePoliciesAsHTML(String[] policyDirs) {
- StringBuffer out = new StringBuffer();
+ StringBuilder out = new StringBuilder();
out.append("<ul class=\"fileTree\" >");
for (String policy : policyDirs) {
out.append("<li class=\"directory collapsed\"><a href=\"#\" rel=\"/");
@@ -228,7 +228,7 @@ public class PolicyResource extends CurationService {
}
private String encodeProductTypesAsHTML(String policy, String[] typeNames) {
- StringBuffer out = new StringBuffer();
+ StringBuilder out = new StringBuilder();
out.append("<ul class=\"fileTree\" >");
for (String type : typeNames) {
out
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigWriter.java
----------------------------------------------------------------------
diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigWriter.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigWriter.java
index 3e3488d..5571c23 100644
--- a/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigWriter.java
+++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigWriter.java
@@ -35,7 +35,7 @@ public class ExtractorConfigWriter {
props.setProperty(ExtractorConfig.PROP_CLASS_NAME, config.getClassName());
File configDir = new File(dir, config.getIdentifier());
configDir.mkdirs();
- StringBuffer files = new StringBuffer();
+ StringBuilder files = new StringBuilder();
for (Iterator<File> i = config.getConfigFiles().iterator(); i.hasNext();) {
File file = i.next();
files.append(file.toURI());
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalogFactory.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalogFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalogFactory.java
index 6975397..cdb16c7 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalogFactory.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalogFactory.java
@@ -127,13 +127,13 @@ public class DataSourceCatalogFactory implements CatalogFactory {
.getBoolean("org.apache.oodt.cas.filemgr.catalog.datasource.quoteFields");
pageSize = Integer
- .getInteger(
- "org.apache.oodt.cas.filemgr.catalog.datasource.pageSize",
- 20).intValue();
+ .getInteger(
+ "org.apache.oodt.cas.filemgr.catalog.datasource.pageSize",
+ 20);
cacheUpdateMinutes = Long
- .getLong(
- "org.apache.oodt.cas.filemgr.catalog.datasource.cacheUpdateMinutes",
- 5L).longValue();
+ .getLong(
+ "org.apache.oodt.cas.filemgr.catalog.datasource.cacheUpdateMinutes",
+ 5L);
productIdString = Boolean.parseBoolean(
System.getProperty("org.apache.oodt.cas.filemgr.catalog.datasource.productId.string", "false") );
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalogFactory.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalogFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalogFactory.java
index 35bfe7c..a80c52f 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalogFactory.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalogFactory.java
@@ -92,19 +92,18 @@ public class LuceneCatalogFactory implements CatalogFactory {
.getValidationLayerFromFactory(validationLayerFactoryClass);
}
- pageSize = Integer.getInteger("org.apache.oodt.cas.filemgr.catalog.lucene.pageSize", 20).intValue();
+ pageSize = Integer.getInteger("org.apache.oodt.cas.filemgr.catalog.lucene.pageSize", 20);
commitLockTimeOut = Long
- .getLong(
- "org.apache.oodt.cas.filemgr.catalog.lucene.commitLockTimeout.seconds",
- 60).longValue();
+ .getLong(
+ "org.apache.oodt.cas.filemgr.catalog.lucene.commitLockTimeout.seconds",
+ 60);
writeLockTimeOut = Long
- .getLong(
- "org.apache.oodt.cas.filemgr.catalog.lucene.writeLockTimeout.seconds",
- 60).longValue();
+ .getLong(
+ "org.apache.oodt.cas.filemgr.catalog.lucene.writeLockTimeout.seconds",
+ 60);
mergeFactor = Integer.getInteger(
- "org.apache.oodt.cas.filemgr.catalog.lucene.mergeFactor", 20)
- .intValue();
+ "org.apache.oodt.cas.filemgr.catalog.lucene.mergeFactor", 20);
}
/*
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/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 d299765..5de3afe 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
@@ -175,8 +175,9 @@ public class DefaultProductSerializer implements ProductSerializer {
for (String key : metadata.getKeys()) {
if (! (key.startsWith(Parameters.NS) // skip metadata keys starting with reserved namespace
- || Parameters.PRODUCT_TYPE_NAME.indexOf(key)>=0 // skip 'ProductType' as already stored as 'CAS.ProductTypeName'
- || Parameters.PRODUCT_STRUCTURE.indexOf(key)>=0)) { // skip 'ProductType' as already stored as 'CAS.ProductStructure'
+ || Parameters.PRODUCT_TYPE_NAME.contains(key)
+ // skip 'ProductType' as already stored as 'CAS.ProductTypeName'
+ || Parameters.PRODUCT_STRUCTURE.contains(key))) { // skip 'ProductType' as already stored as 'CAS.ProductStructure'
for (String value : metadata.getAllMetadata(key)) {
this.addKeyValueToMap(fields, key, value);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/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 7c15a44..5073617 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
@@ -73,7 +73,7 @@ public abstract class AbstractQueryCliAction extends FileManagerCliAction {
complexQuery.setQueryFilter(filter);
}
List<QueryResult> results = getClient().complexQuery(complexQuery);
- StringBuffer returnString = new StringBuffer("");
+ StringBuilder returnString = new StringBuilder("");
for (QueryResult qr : results) {
returnString.append(qr.toString() + delimiter);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferFactory.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferFactory.java
index 7b4e95a..ecd89ab 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferFactory.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferFactory.java
@@ -44,8 +44,8 @@ public class RemoteDataTransferFactory implements DataTransferFactory {
*/
public RemoteDataTransferFactory() throws InstantiationException {
chunkSize = Integer.getInteger(
- "org.apache.oodt.cas.filemgr.datatransfer.remote.chunkSize",
- 1024).intValue();
+ "org.apache.oodt.cas.filemgr.datatransfer.remote.chunkSize",
+ 1024);
LOG.log(Level.INFO, "RemoteDataTransfer enabled: using chunk size: ["
+ chunkSize + "]");
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Product.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Product.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Product.java
index 3c25ed3..fb089db 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Product.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Product.java
@@ -355,8 +355,7 @@ public class Product {
Reference r = new Reference();
r.setOrigReference(refElem.getAttribute("orig"));
r.setDataStoreReference(refElem.getAttribute("dataStore"));
- r.setFileSize(Long.valueOf(refElem.getAttribute("size"))
- .longValue());
+ r.setFileSize(Long.valueOf(refElem.getAttribute("size")));
this.references.add(r);
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Query.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Query.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Query.java
index 3b4f19a..257d69a 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Query.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Query.java
@@ -79,7 +79,7 @@ public class Query {
* @return A String representation of this Query.
*/
public String toString() {
- StringBuffer rStr = new StringBuffer();
+ StringBuilder rStr = new StringBuilder();
rStr.append("q=");
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/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 b761530..ba9ece4 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
@@ -250,7 +250,7 @@ public final class QueryTool {
complexQuery.setSortByMetKey(sortBy);
complexQuery.setToStringResultFormat(outputFormat);
List<QueryResult> results = new XmlRpcFileManagerClient(new URL(filemgrUrl)).complexQuery(complexQuery);
- StringBuffer returnString = new StringBuffer("");
+ StringBuilder returnString = new StringBuilder("");
for (QueryResult qr : results)
returnString.append(qr.toString() + delimiter);
return returnString.substring(0, returnString.length() - delimiter.length());
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/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 f5ee4a9..0c8c1b1 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
@@ -41,7 +41,7 @@ public class QueryUtils {
public static String getQueryResultsAsString(
List<QueryResult> queryResults, String delimiter) {
- StringBuffer returnString = new StringBuffer("");
+ StringBuilder returnString = new StringBuilder("");
for (QueryResult qr : queryResults)
returnString.append(qr.toString() + delimiter);
return returnString.substring(0, returnString.length() - delimiter.length());
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java
index 4912830..bb3496a 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java
@@ -155,10 +155,9 @@ public final class XmlStructFactory {
String propertyValue = propertyElem
.getAttribute("value");
if (Boolean
- .valueOf(
- propertyElem
- .getAttribute("envReplace"))
- .booleanValue()) {
+ .valueOf(
+ propertyElem
+ .getAttribute("envReplace"))) {
propertyValue = PathUtils
.replaceEnvVariables(propertyValue);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/MetadataBasedFileVersioner.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/MetadataBasedFileVersioner.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/MetadataBasedFileVersioner.java
index 99e7d19..93c90e1 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/MetadataBasedFileVersioner.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/MetadataBasedFileVersioner.java
@@ -109,7 +109,7 @@ public class MetadataBasedFileVersioner implements Versioner {
private String parseFilePathSpec(String filePathSpec,
String productTypeRepoPath, Metadata metadata) {
- StringBuffer finalFilePath = new StringBuffer();
+ StringBuilder finalFilePath = new StringBuilder();
finalFilePath.append(productTypeRepoPath);
if (finalFilePath.charAt(finalFilePath.length() - 1) == '/') {
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/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 7c09e3a..9182dde 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
@@ -451,11 +451,11 @@ public class TestTypeHandler extends TestCase {
String tableName = type.getName() + "_metadata";
String subSelectQueryBase = "SELECT product_id FROM "
+ tableName + " ";
- StringBuffer selectClause = new StringBuffer(
+ StringBuilder selectClause = new StringBuilder(
"SELECT DISTINCT p.product_id ");
- StringBuffer fromClause = new StringBuffer("FROM " + tableName
+ StringBuilder fromClause = new StringBuilder("FROM " + tableName
+ " p ");
- StringBuffer whereClause = new StringBuffer("WHERE ");
+ StringBuilder whereClause = new StringBuilder("WHERE ");
boolean gotFirstClause = false;
int clauseNum = 0;
@@ -692,11 +692,11 @@ public class TestTypeHandler extends TestCase {
String tableName = type.getName() + "_metadata";
String subSelectQueryBase = "SELECT product_id FROM "
+ tableName + " ";
- StringBuffer selectClause = new StringBuffer(
+ StringBuilder selectClause = new StringBuilder(
"SELECT COUNT(DISTINCT p.product_id) AS numResults ");
- StringBuffer fromClause = new StringBuffer("FROM " + tableName
+ StringBuilder fromClause = new StringBuilder("FROM " + tableName
+ " p ");
- StringBuffer whereClause = new StringBuffer("WHERE ");
+ StringBuilder whereClause = new StringBuilder("WHERE ");
boolean gotFirstClause = false;
int clauseNum = 0;
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/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 0bfcce2..7d24d36 100644
--- a/grid/src/main/java/org/apache/oodt/grid/RestfulProductQueryServlet.java
+++ b/grid/src/main/java/org/apache/oodt/grid/RestfulProductQueryServlet.java
@@ -60,7 +60,7 @@ public class RestfulProductQueryServlet extends ProductQueryServlet {
// combine all HTTP (name, value) pairs into XML query string with logical AND
} else {
- StringBuffer q = new StringBuffer("");
+ StringBuilder q = new StringBuilder("");
Enumeration<String> parameterNames = req.getParameterNames();
while (parameterNames.hasMoreElements()) {
String paramName = parameterNames.nextElement();
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/grid/src/main/java/org/apache/oodt/grid/Utility.java
----------------------------------------------------------------------
diff --git a/grid/src/main/java/org/apache/oodt/grid/Utility.java b/grid/src/main/java/org/apache/oodt/grid/Utility.java
index 93cc215..e160e52 100755
--- a/grid/src/main/java/org/apache/oodt/grid/Utility.java
+++ b/grid/src/main/java/org/apache/oodt/grid/Utility.java
@@ -32,7 +32,7 @@ public class Utility {
* @return <var>str</var> escaped.
*/
public static String esc(String str) {
- StringBuffer s = new StringBuffer(str.length()); // Assume at least the same
+ StringBuilder s = new StringBuilder(str.length()); // Assume at least the same
// length
for (int i = 0; i < str.length(); ++i) { // For each character
char c = str.charAt(i); // Grab the character
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReader.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReader.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReader.java
index c770763..18a5d4c 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReader.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReader.java
@@ -67,8 +67,7 @@ public final class ExternConfigReader implements MetExtractorConfigReader,
Element binPathElem = XMLUtils.getFirstElement(
EXTRACTOR_BIN_PATH_TAG, execElement);
String binPath = XMLUtils.getSimpleElementText(binPathElem);
- if (Boolean.valueOf(binPathElem.getAttribute(ENV_REPLACE_ATTR))
- .booleanValue()) {
+ if (Boolean.valueOf(binPathElem.getAttribute(ENV_REPLACE_ATTR))) {
binPath = PathUtils.replaceEnvVariables(binPath);
}
@@ -90,12 +89,12 @@ public final class ExternConfigReader implements MetExtractorConfigReader,
Element argElem = (Element) argNodes.item(i);
String argStr = null;
if (Boolean.valueOf(
- argElem.getAttribute(IS_DATA_FILE_ATTR)
- .toLowerCase()).booleanValue())
+ argElem.getAttribute(IS_DATA_FILE_ATTR)
+ .toLowerCase()))
argStr = DATA_FILE_PLACE_HOLDER;
else if (Boolean.valueOf(
- argElem.getAttribute(IS_MET_FILE_ATTR)
- .toLowerCase()).booleanValue())
+ argElem.getAttribute(IS_MET_FILE_ATTR)
+ .toLowerCase()))
argStr = MET_FILE_PLACE_HOLDER;
else
argStr = XMLUtils.getSimpleElementText(argElem);
@@ -106,13 +105,11 @@ public final class ExternConfigReader implements MetExtractorConfigReader,
argStr += "." + appendExt;
if (Boolean.valueOf(
- argElem.getAttribute(ENV_REPLACE_ATTR))
- .booleanValue()) {
+ argElem.getAttribute(ENV_REPLACE_ATTR))) {
argStr = PathUtils.replaceEnvVariables(argStr);
}
- if (Boolean.valueOf(argElem.getAttribute(IS_PATH_ATTR))
- .booleanValue()) {
+ if (Boolean.valueOf(argElem.getAttribute(IS_PATH_ATTR))) {
argStr = argStr.replaceAll("\\s", "\\\\ ");
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/metadata/src/main/java/org/apache/oodt/cas/metadata/util/PathUtils.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/util/PathUtils.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/util/PathUtils.java
index 7b6586a..bfa245e 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/util/PathUtils.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/util/PathUtils.java
@@ -61,7 +61,7 @@ public final class PathUtils {
public static String replaceEnvVariables(String origPath,
Metadata metadata, boolean expand) {
- StringBuffer finalPath = new StringBuffer();
+ StringBuilder finalPath = new StringBuilder();
for (int i = 0; i < origPath.length(); i++) {
if (origPath.charAt(i) == '[') {
@@ -340,7 +340,7 @@ public final class PathUtils {
}
private static VarData readEnvVarName(String origPathStr, int startIdx) {
- StringBuffer varName = new StringBuffer();
+ StringBuilder varName = new StringBuilder();
int idx = startIdx + 1;
do {
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/pcs/core/src/main/java/org/apache/oodt/pcs/pedigree/PedigreeTree.java
----------------------------------------------------------------------
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/pedigree/PedigreeTree.java b/pcs/core/src/main/java/org/apache/oodt/pcs/pedigree/PedigreeTree.java
index 0498d27..f57b7da 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/pedigree/PedigreeTree.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/pedigree/PedigreeTree.java
@@ -91,7 +91,7 @@ public class PedigreeTree {
}
private String getTabStr(int num) {
- StringBuffer tabStrBuf = new StringBuffer();
+ StringBuilder tabStrBuf = new StringBuilder();
for (int i = 0; i < num; i++) {
tabStrBuf.append("\t");
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSHealthMonitor.java
----------------------------------------------------------------------
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSHealthMonitor.java b/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSHealthMonitor.java
index a5b92d1..889f8aa 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSHealthMonitor.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSHealthMonitor.java
@@ -587,8 +587,7 @@ public final class PCSHealthMonitor implements CoreMetKeys,
Vector argList = new Vector();
try {
- return ((Boolean) client.execute("batchstub.isAlive", argList))
- .booleanValue();
+ return (Boolean) client.execute("batchstub.isAlive", argList);
} catch (Exception e) {
return false;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java
----------------------------------------------------------------------
diff --git a/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java b/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java
index bdf21d1..36c03b8 100644
--- a/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java
+++ b/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java
@@ -200,5 +200,5 @@ final class ChunkedProductInputStream extends InputStream {
private boolean open;
/** Size of chunks. */
- private static final int BLOCK_SIZE = Integer.getInteger("org.apache.oodt.xmlquery.blockSize", 4096).intValue();
+ private static final int BLOCK_SIZE = Integer.getInteger("org.apache.oodt.xmlquery.blockSize", 4096);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/profile/src/main/java/org/apache/oodt/profile/Profile.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/Profile.java b/profile/src/main/java/org/apache/oodt/profile/Profile.java
index bd7e0e6..7fab8ec 100644
--- a/profile/src/main/java/org/apache/oodt/profile/Profile.java
+++ b/profile/src/main/java/org/apache/oodt/profile/Profile.java
@@ -369,7 +369,7 @@ public class Profile implements Serializable, Cloneable, Comparable<Object>, Doc
System.err.println("Usage: <profile.xml>");
System.exit(1);
}
- StringBuffer b = new StringBuffer();
+ StringBuilder b = new StringBuilder();
BufferedReader reader = new BufferedReader(new FileReader(argv[0]));
char[] buf = new char[512];
int num;
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServer.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServer.java b/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServer.java
index dba1d80..c31db1c 100644
--- a/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServer.java
+++ b/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServer.java
@@ -271,7 +271,7 @@ final public class LightweightProfileServer implements ProfileHandler {
LightweightProfileServer lp = new LightweightProfileServer();
// Gather together the command-line arguments into a single long string.
- StringBuffer b = new StringBuffer();
+ StringBuilder b = new StringBuilder();
for (int i = 0; i < argv.length; ++i)
b.append(argv[i]).append(' ');
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/profile/src/test/java/org/apache/oodt/profile/ProfileTest.java
----------------------------------------------------------------------
diff --git a/profile/src/test/java/org/apache/oodt/profile/ProfileTest.java b/profile/src/test/java/org/apache/oodt/profile/ProfileTest.java
index a6eee4d..c6061b5 100644
--- a/profile/src/test/java/org/apache/oodt/profile/ProfileTest.java
+++ b/profile/src/test/java/org/apache/oodt/profile/ProfileTest.java
@@ -43,7 +43,7 @@ public class ProfileTest extends TestCase {
oldProfNS = System.getProperty("jpl.rdf.ns");
System.setProperty("jpl.rdf.ns", "http://enterprise.jpl.nasa.gov/rdfs/prof.rdf#");
- StringBuffer buffer = new StringBuffer("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
+ StringBuilder buffer = new StringBuilder("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
buffer.append("<!DOCTYPE profile PUBLIC \"").append(Profile.PROFILES_DTD_FPI).append("\" \"")
.append(Profile.PROFILES_DTD_URL).append("\">\n");
BufferedReader reader = new BufferedReader(new InputStreamReader(getClass().getResourceAsStream("test.xml")));
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/protocol/http/src/main/java/org/apache/oodt/cas/protocol/http/util/HttpUtils.java
----------------------------------------------------------------------
diff --git a/protocol/http/src/main/java/org/apache/oodt/cas/protocol/http/util/HttpUtils.java b/protocol/http/src/main/java/org/apache/oodt/cas/protocol/http/util/HttpUtils.java
index a006598..5788262 100644
--- a/protocol/http/src/main/java/org/apache/oodt/cas/protocol/http/util/HttpUtils.java
+++ b/protocol/http/src/main/java/org/apache/oodt/cas/protocol/http/util/HttpUtils.java
@@ -92,7 +92,7 @@ public class HttpUtils {
Scanner scanner = new Scanner(conn.getInputStream());
// Read in link
- StringBuffer sb = new StringBuffer("");
+ StringBuilder sb = new StringBuilder("");
while (scanner.hasNext())
sb.append(scanner.nextLine());
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/protocol/imaps/src/main/java/org/apache/oodt/cas/protocol/imaps/ImapsProtocol.java
----------------------------------------------------------------------
diff --git a/protocol/imaps/src/main/java/org/apache/oodt/cas/protocol/imaps/ImapsProtocol.java b/protocol/imaps/src/main/java/org/apache/oodt/cas/protocol/imaps/ImapsProtocol.java
index 723d2ae..8ee8e87 100644
--- a/protocol/imaps/src/main/java/org/apache/oodt/cas/protocol/imaps/ImapsProtocol.java
+++ b/protocol/imaps/src/main/java/org/apache/oodt/cas/protocol/imaps/ImapsProtocol.java
@@ -305,7 +305,7 @@ public class ImapsProtocol implements Protocol {
private String getContentFromPlainText(Part p) throws MessagingException,
IOException, DecoderException {
- StringBuffer content = new StringBuffer("");
+ StringBuilder content = new StringBuilder("");
if (p.isMimeType("text/plain")) {
content.append((String) p.getContent());
} else if (p.isMimeType("multipart/*")) {
@@ -323,7 +323,7 @@ public class ImapsProtocol implements Protocol {
private String getContentFromHTML(Part p) throws MessagingException,
IOException, DecoderException, SAXException, TikaException {
- StringBuffer content = new StringBuffer("");
+ StringBuilder content = new StringBuilder("");
if (p.isMimeType("multipart/*")) {
Multipart mp = (Multipart) p.getContent();
int count = mp.getCount();
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/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 68849e6..9a1ba4d 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
@@ -194,7 +194,7 @@ public class VirtualFile {
public String getAbsolutePath() {
if (regExp == null)
return null;
- StringBuffer path = new StringBuffer(this.regExp);
+ StringBuilder path = new StringBuilder(this.regExp);
VirtualFile parent = this.parent;
while (parent != null) {
path.insert(0, (parent.regExp != "/" ? parent.regExp : "") + "/");
@@ -270,7 +270,7 @@ public class VirtualFile {
}
public String toString() {
- StringBuffer sb = new StringBuffer(
+ StringBuilder sb = new StringBuilder(
"-<VirtualFile>\t : allowNewDirs/noDirs\t : allowNewFiles/noFiles\n------------\n");
LinkedList<VirtualFile> printFiles = new LinkedList<VirtualFile>();
printFiles.add(this);
http://git-wip-us.apache.org/repos/asf/oodt/blob/559a65f6/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/FileRetrievalSystem.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/FileRetrievalSystem.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/FileRetrievalSystem.java
index 23b7fca..c7d5bb4 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/FileRetrievalSystem.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/FileRetrievalSystem.java
@@ -439,7 +439,7 @@ public class FileRetrievalSystem {
String description = this.mimeTypeDetection
.getDescriptionForMimeType(mimeType);
if (!Strings.isNullOrEmpty(description)) {
- if(description.indexOf("&") != -1){
+ if(description.contains("&")){
for (String field : description.split("\\&\\&")) {
String[] keyval = field.split("\\=");
remoteFile.addMetadata(keyval[0].trim(), keyval[1].trim());
[2/4] oodt git commit: OODT-899 inline variables
Posted by ma...@apache.org.
OODT-899 inline variables
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/edb01cb2
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/edb01cb2
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/edb01cb2
Branch: refs/heads/master
Commit: edb01cb22c4fabc2e96e86ab509a1e26219e72d6
Parents: bd08d40
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Oct 25 11:30:44 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Oct 25 11:30:44 2015 +0000
----------------------------------------------------------------------
.../org/apache/oodt/commons/Configuration.java | 3 +--
.../commons/pagination/PaginationUtils.java | 3 +--
.../apache/oodt/commons/util/DateConvert.java | 27 +++++++-------------
.../java/org/apache/oodt/commons/util/XML.java | 3 +--
.../cas/curation/service/DirectoryResource.java | 3 +--
.../cas/curation/service/IngestionResource.java | 3 +--
.../curation/util/ExtractorConfigReader.java | 5 ++--
.../oodt/cas/filemgr/catalog/LuceneCatalog.java | 3 +--
.../catalog/solr/DefaultProductSerializer.java | 3 +--
.../cas/filemgr/catalog/solr/SolrClient.java | 6 ++---
.../datatransfer/TransferStatusTracker.java | 3 +--
.../cas/filemgr/structs/RangeQueryCriteria.java | 3 +--
.../cas/filemgr/structs/TermQueryCriteria.java | 3 +--
.../oodt/cas/filemgr/util/DbStructFactory.java | 3 +--
.../oodt/grid/RestfulProductQueryServlet.java | 3 +--
.../org/apache/oodt/opendapps/Profiler.java | 3 +--
.../oodt/opendapps/util/ProfileUtils.java | 3 +--
.../java/org/apache/oodt/profile/Profile.java | 3 +--
.../cas/protocol/sftp/TestJschSftpProtocol.java | 3 +--
.../cas/resource/util/XmlStructFactory.java | 8 ++----
.../apache/oodt/security/sso/OpenSSOImpl.java | 3 +--
.../webcomponents/health/VisibilityToggler.java | 3 +--
.../apache/oodt/cas/product/rss/RSSUtils.java | 3 +--
.../engine/ThreadPoolWorkflowEngine.java | 6 ++---
.../lifecycle/WorkflowLifecycleManager.java | 6 ++---
.../DataSourceWorkflowRepository.java | 5 ++--
.../oodt/cas/workflow/structs/TaskJob.java | 3 +--
.../workflow/system/XmlRpcWorkflowManager.java | 3 +--
.../system/XmlRpcWorkflowManagerClient.java | 8 +++---
.../oodt/cas/workflow/util/DbStructFactory.java | 3 +--
.../structs/TestFILOPrioritySorter.java | 3 +--
.../structs/TestHighestFIFOPrioritySorter.java | 3 +--
.../structs/TestHighestPrioritySorter.java | 3 +--
.../apache/oodt/xmlps/product/DBMSExecutor.java | 3 +--
.../oodt/xmlps/profile/XMLPSProfileHandler.java | 3 +--
.../java/org/apache/oodt/xmlquery/XMLQuery.java | 5 ++--
36 files changed, 53 insertions(+), 104 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/commons/src/main/java/org/apache/oodt/commons/Configuration.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/Configuration.java b/commons/src/main/java/org/apache/oodt/commons/Configuration.java
index 938c11c..69a6909 100644
--- a/commons/src/main/java/org/apache/oodt/commons/Configuration.java
+++ b/commons/src/main/java/org/apache/oodt/commons/Configuration.java
@@ -627,8 +627,7 @@ public class Configuration {
*/
static Document createDocument(String documentElementName) throws DOMException {
DocumentType docType = XML.getDOMImplementation().createDocumentType(documentElementName, DTD_FPI, DTD_URL);
- Document doc = XML.getDOMImplementation().createDocument(/*namespaceURI*/null, documentElementName, docType);
- return doc;
+ return XML.getDOMImplementation().createDocument(/*namespaceURI*/null, documentElementName, docType);
}
/** The formal public identifier (FPI) of the configuration document type definition (DTD). */
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/commons/src/main/java/org/apache/oodt/commons/pagination/PaginationUtils.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/pagination/PaginationUtils.java b/commons/src/main/java/org/apache/oodt/commons/pagination/PaginationUtils.java
index 80e48cd..927748b 100644
--- a/commons/src/main/java/org/apache/oodt/commons/pagination/PaginationUtils.java
+++ b/commons/src/main/java/org/apache/oodt/commons/pagination/PaginationUtils.java
@@ -73,8 +73,7 @@ public final class PaginationUtils {
}
public static int computeNextStartIdx(int maxPage, int productsPerPage) {
- int nextPage = maxPage;
- return (nextPage * productsPerPage);
+ return (maxPage * productsPerPage);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/commons/src/main/java/org/apache/oodt/commons/util/DateConvert.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/util/DateConvert.java b/commons/src/main/java/org/apache/oodt/commons/util/DateConvert.java
index 9f6cc5a..4e4ea57 100644
--- a/commons/src/main/java/org/apache/oodt/commons/util/DateConvert.java
+++ b/commons/src/main/java/org/apache/oodt/commons/util/DateConvert.java
@@ -194,9 +194,8 @@ public class DateConvert {
}
// Parse the given string.
- Date parseDate = dateFormat.parse(inputString);
- return(parseDate);
+ return(dateFormat.parse(inputString));
}
@@ -213,9 +212,8 @@ public class DateConvert {
// Setup the date format and convert the given date.
SimpleDateFormat dateFormat = new SimpleDateFormat(DOY_FORMAT);
- String dateString = dateFormat.format(inputDate);
- return(dateString);
+ return(dateFormat.format(inputDate));
}
@@ -235,9 +233,8 @@ public class DateConvert {
// Setup the date format and parse the given string.
SimpleDateFormat dateFormat = new SimpleDateFormat(DOY_FORMAT);
dateFormat.setLenient(false);
- Date parseDate = dateFormat.parse(inputString);
- return(parseDate);
+ return(dateFormat.parse(inputString));
}
@@ -254,9 +251,8 @@ public class DateConvert {
// Setup the date format and convert the given date.
SimpleDateFormat dateFormat = new SimpleDateFormat(TS_FORMAT);
- String dateString = dateFormat.format(inputDate);
- return(dateString);
+ return(dateFormat.format(inputDate));
}
@@ -276,9 +272,8 @@ public class DateConvert {
// Setup the date format and parse the given string.
SimpleDateFormat dateFormat = new SimpleDateFormat(TS_FORMAT);
dateFormat.setLenient(false);
- Date parseDate = dateFormat.parse(inputString);
- return(parseDate);
+ return(dateFormat.parse(inputString));
}
@@ -295,9 +290,8 @@ public class DateConvert {
// Setup the date format and convert the given date.
SimpleDateFormat dateFormat = new SimpleDateFormat(DBMS_FORMAT);
- String dateString = dateFormat.format(inputDate);
- return(dateString);
+ return(dateFormat.format(inputDate));
}
@@ -317,9 +311,8 @@ public class DateConvert {
// Setup the date format and parse the given string.
SimpleDateFormat dateFormat = new SimpleDateFormat(DBMS_FORMAT);
dateFormat.setLenient(false);
- Date parseDate = dateFormat.parse(inputString);
- return(parseDate);
+ return(dateFormat.parse(inputString));
}
@@ -336,9 +329,8 @@ public class DateConvert {
// Setup the date format and convert the given date.
SimpleDateFormat dateFormat = new SimpleDateFormat(YMD_FORMAT);
- String dateString = dateFormat.format(inputDate);
- return(dateString);
+ return(dateFormat.format(inputDate));
}
@@ -358,9 +350,8 @@ public class DateConvert {
// Setup the date format and parse the given string.
SimpleDateFormat dateFormat = new SimpleDateFormat(YMD_FORMAT);
dateFormat.setLenient(false);
- Date parseDate = dateFormat.parse(inputString);
- return(parseDate);
+ return(dateFormat.parse(inputString));
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/commons/src/main/java/org/apache/oodt/commons/util/XML.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/util/XML.java b/commons/src/main/java/org/apache/oodt/commons/util/XML.java
index 8b4551a..3f82380 100644
--- a/commons/src/main/java/org/apache/oodt/commons/util/XML.java
+++ b/commons/src/main/java/org/apache/oodt/commons/util/XML.java
@@ -167,8 +167,7 @@ public class XML {
System.err.println("Fatal parse error: " + ex.getMessage());
}
});
- SAXParser p = new SAXParser(saxParser);
- return p;
+ return new SAXParser(saxParser);
} catch (ParserConfigurationException ex) {
throw new IllegalStateException("Unexpected ParserConfigurationException: " + ex.getMessage());
} catch (SAXException ex) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/curator/services/src/main/java/org/apache/oodt/cas/curation/service/DirectoryResource.java
----------------------------------------------------------------------
diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/DirectoryResource.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/DirectoryResource.java
index a55ffad..85e07c3 100644
--- a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/DirectoryResource.java
+++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/DirectoryResource.java
@@ -57,9 +57,8 @@ public class DirectoryResource extends CurationService {
@DefaultValue("true") @QueryParam("showFiles") boolean showFiles,
@DefaultValue(FORMAT_HTML) @QueryParam("format") String format) {
if (FORMAT_HTML.equals(format)) {
- String response = this.getDirectoryAreaAsHTML(
+ return this.getDirectoryAreaAsHTML(
CurationService.config.getStagingAreaPath(), path, showFiles);
- return response;
}
return this.getDirectoryAreaAsJSON(
CurationService.config.getStagingAreaPath(), path, showFiles);
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/curator/services/src/main/java/org/apache/oodt/cas/curation/service/IngestionResource.java
----------------------------------------------------------------------
diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/IngestionResource.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/IngestionResource.java
index 2ea61bb..0a28842 100644
--- a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/IngestionResource.java
+++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/IngestionResource.java
@@ -265,8 +265,7 @@ public class IngestionResource extends CurationService {
}
private Ingester configureIngester() {
- StdIngester ingest = new StdIngester(DATA_TRANSFER_SERVICE);
- return ingest;
+ return new StdIngester(DATA_TRANSFER_SERVICE);
}
private URL safeGetUrl(String urlStr) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigReader.java
----------------------------------------------------------------------
diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigReader.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigReader.java
index a355d67..638b61b 100644
--- a/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigReader.java
+++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigReader.java
@@ -37,8 +37,7 @@ public class ExtractorConfigReader {
props
.load(new FileInputStream(new File(propsFileDir,
"config.properties")));
-
- String identifier = configId;
+
String className = props.getProperty(ExtractorConfig.PROP_CLASS_NAME);
List<File> files = new ArrayList<File>();
String[] fileList = props.getProperty(ExtractorConfig.PROP_CONFIG_FILES)
@@ -47,6 +46,6 @@ public class ExtractorConfigReader {
files.add(new File(PathUtils.replaceEnvVariables(fileList[0])));
}
- return new ExtractorConfig(identifier, className, files);
+ return new ExtractorConfig(configId, className, files);
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java
index c3ce8e2..e5a2fb1 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java
@@ -389,9 +389,8 @@ public class LuceneCatalog implements Catalog {
}
Document productDoc = hits.doc(0);
- CompleteProduct prod = toCompleteProduct(productDoc, getRefs,
+ return toCompleteProduct(productDoc, getRefs,
getMet);
- return prod;
} catch (IOException e) {
LOG.log(Level.WARNING,
"IOException when opening index directory: ["
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/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 de60a5f..d299765 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
@@ -475,8 +475,7 @@ public class DefaultProductSerializer implements ProductSerializer {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
DocumentBuilder parser = factory.newDocumentBuilder();
- Document document = parser.parse( new InputSource(new StringReader(xml)) );
- return document;
+ return parser.parse( new InputSource(new StringReader(xml)) );
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/SolrClient.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/SolrClient.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/SolrClient.java
index 7876ef5..7b2c016 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/SolrClient.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/SolrClient.java
@@ -116,9 +116,8 @@ public class SolrClient {
// send POST request
LOG.info("Posting message:"+message+" to URL:"+url);
- String response = doPost(url, message, Parameters.MIME_TYPE_XML);
- return response;
+ return doPost(url, message, Parameters.MIME_TYPE_XML);
} catch(Exception e) {
e.printStackTrace();
@@ -213,8 +212,7 @@ public class SolrClient {
String url = this.buildSelectUrl();
// execute request
- String response = this.doGet(url, parameters, mimeType);
- return response;
+ return this.doGet(url, parameters, mimeType);
} catch(Exception e) {
e.printStackTrace();
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/TransferStatusTracker.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/TransferStatusTracker.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/TransferStatusTracker.java
index 6cf8624..b277dbd 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/TransferStatusTracker.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/TransferStatusTracker.java
@@ -164,8 +164,7 @@ public class TransferStatusTracker {
try {
destFile = new File(new URI(r.getDataStoreReference()));
- long bytesTransferred = destFile.length();
- return bytesTransferred;
+ return destFile.length();
} catch (URISyntaxException e) {
LOG.log(Level.WARNING,
"URISyntaxException when checking size of destFile: ["
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/RangeQueryCriteria.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/RangeQueryCriteria.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/RangeQueryCriteria.java
index 4aa74dc..3b21dfe 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/RangeQueryCriteria.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/RangeQueryCriteria.java
@@ -175,8 +175,7 @@ public class RangeQueryCriteria extends QueryCriteria {
* @return The query as a String.
*/
public String toString() {
- String serial = elementName + ":[" + startValue + " TO " + endValue + "]";
- return serial;
+ return elementName + ":[" + startValue + " TO " + endValue + "]";
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/TermQueryCriteria.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/TermQueryCriteria.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/TermQueryCriteria.java
index 01541b1..5f9ce7f 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/TermQueryCriteria.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/TermQueryCriteria.java
@@ -104,8 +104,7 @@ public class TermQueryCriteria extends QueryCriteria {
* @return The query as a String.
*/
public String toString() {
- String serial = this.elementName + ":" + value;
- return serial;
+ return this.elementName + ":" + value;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/DbStructFactory.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/DbStructFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/DbStructFactory.java
index 389fb9c..e7f8c52 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/DbStructFactory.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/DbStructFactory.java
@@ -99,8 +99,7 @@ public final class DbStructFactory {
}
public static String getParent(ResultSet rs) throws SQLException {
- String parent = rs.getString("parent_id");
- return parent;
+ return rs.getString("parent_id");
}
public static Element toScienceDataElement(ResultSet rs) throws SQLException {
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/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 70eb625..0bfcce2 100644
--- a/grid/src/main/java/org/apache/oodt/grid/RestfulProductQueryServlet.java
+++ b/grid/src/main/java/org/apache/oodt/grid/RestfulProductQueryServlet.java
@@ -55,8 +55,7 @@ public class RestfulProductQueryServlet extends ProductQueryServlet {
// if DIS-style parameters are found, default to standard processing
if (req.getParameter("xmlq") !=null || req.getParameter("q")!=null) {
- XMLQuery xmlQuery = super.getQuery(req, res);
- return xmlQuery;
+ return super.getQuery(req, res);
// combine all HTTP (name, value) pairs into XML query string with logical AND
} else {
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/opendapps/src/main/java/org/apache/oodt/opendapps/Profiler.java
----------------------------------------------------------------------
diff --git a/opendapps/src/main/java/org/apache/oodt/opendapps/Profiler.java b/opendapps/src/main/java/org/apache/oodt/opendapps/Profiler.java
index 6ffc432..8884db9 100644
--- a/opendapps/src/main/java/org/apache/oodt/opendapps/Profiler.java
+++ b/opendapps/src/main/java/org/apache/oodt/opendapps/Profiler.java
@@ -140,8 +140,7 @@ public class Profiler {
final String query = "<query><queryKWQString>"
+ "PFunction=findall?ConfigUrl=" + file.getAbsolutePath()
+ "</queryKWQString></query>";
- final XMLQuery xmlQuery = new XMLQuery(query);
- return xmlQuery;
+ return new XMLQuery(query);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/opendapps/src/main/java/org/apache/oodt/opendapps/util/ProfileUtils.java
----------------------------------------------------------------------
diff --git a/opendapps/src/main/java/org/apache/oodt/opendapps/util/ProfileUtils.java b/opendapps/src/main/java/org/apache/oodt/opendapps/util/ProfileUtils.java
index 07950ed..02b46ab 100644
--- a/opendapps/src/main/java/org/apache/oodt/opendapps/util/ProfileUtils.java
+++ b/opendapps/src/main/java/org/apache/oodt/opendapps/util/ProfileUtils.java
@@ -420,8 +420,7 @@ public class ProfileUtils {
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
TimeZone tz = TimeZone.getTimeZone("UTC");
df.setTimeZone(tz);
- String output = df.format(date);
- return output;
+ return df.format(date);
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/profile/src/main/java/org/apache/oodt/profile/Profile.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/Profile.java b/profile/src/main/java/org/apache/oodt/profile/Profile.java
index bb37768..bd7e0e6 100644
--- a/profile/src/main/java/org/apache/oodt/profile/Profile.java
+++ b/profile/src/main/java/org/apache/oodt/profile/Profile.java
@@ -340,8 +340,7 @@ public class Profile implements Serializable, Cloneable, Comparable<Object>, Doc
*/
static Document createDocument(String root) {
DocumentType docType = XML.getDOMImplementation().createDocumentType(root, PROFILES_DTD_FPI, PROFILES_DTD_URL);
- Document doc = XML.getDOMImplementation().createDocument(/*namespaceURI*/null, root, docType);
- return doc;
+ return XML.getDOMImplementation().createDocument(/*namespaceURI*/null, root, docType);
}
/** My profile attributes. */
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/protocol/sftp/src/test/java/org/apache/oodt/cas/protocol/sftp/TestJschSftpProtocol.java
----------------------------------------------------------------------
diff --git a/protocol/sftp/src/test/java/org/apache/oodt/cas/protocol/sftp/TestJschSftpProtocol.java b/protocol/sftp/src/test/java/org/apache/oodt/cas/protocol/sftp/TestJschSftpProtocol.java
index 5107ce2..a4a250a 100644
--- a/protocol/sftp/src/test/java/org/apache/oodt/cas/protocol/sftp/TestJschSftpProtocol.java
+++ b/protocol/sftp/src/test/java/org/apache/oodt/cas/protocol/sftp/TestJschSftpProtocol.java
@@ -182,8 +182,7 @@ public class TestJschSftpProtocol extends TestCase {
}
- String str = build.toString();
- return str;
+ return build.toString();
}catch(IOException ioe){
ioe.printStackTrace();
}finally{
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/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 908c83b..5f191c7 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
@@ -76,9 +76,7 @@ public final class XmlStructFactory {
e.printStackTrace();
}
- ResourceNode resource = new ResourceNode(id, ip, capacity);
-
- return resource;
+ return new ResourceNode(id, ip, capacity);
}
public static List getQueueAssignment(Node node) {
@@ -154,9 +152,7 @@ public final class XmlStructFactory {
in.configure(inputConfigProps);
}
- JobSpec spec = new JobSpec(in, job);
-
- return spec;
+ return new JobSpec(in, job);
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/sso/src/main/java/org/apache/oodt/security/sso/OpenSSOImpl.java
----------------------------------------------------------------------
diff --git a/sso/src/main/java/org/apache/oodt/security/sso/OpenSSOImpl.java b/sso/src/main/java/org/apache/oodt/security/sso/OpenSSOImpl.java
index f50c6c2..c20b683 100755
--- a/sso/src/main/java/org/apache/oodt/security/sso/OpenSSOImpl.java
+++ b/sso/src/main/java/org/apache/oodt/security/sso/OpenSSOImpl.java
@@ -162,10 +162,9 @@ public class OpenSSOImpl extends AbstractWebBasedSingleSignOn implements
Cookie[] cookies = this.req.getCookies();
for (Cookie cookie : cookies) {
if (cookie.getName().equals(name)) {
- String cookieVal = cookie.getValue().startsWith("\"")
+ return cookie.getValue().startsWith("\"")
&& cookie.getValue().endsWith("\"") ? cookie.getValue().substring(
1, cookie.getValue().length() - 1) : cookie.getValue();
- return cookieVal;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/VisibilityToggler.java
----------------------------------------------------------------------
diff --git a/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/VisibilityToggler.java b/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/VisibilityToggler.java
index 406c9b5..8a53976 100644
--- a/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/VisibilityToggler.java
+++ b/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/VisibilityToggler.java
@@ -102,8 +102,7 @@ public class VisibilityToggler extends WebMarkupContainer {
private static List subsetModelObject(Object obj) {
List objList = (List) obj;
- List subsetList = getTopN(objList, 3);
- return subsetList;
+ return getTopN(objList, 3);
}
private static List getTopN(List statuses, int topN) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/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 5110a41..12278db 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
@@ -49,10 +49,9 @@ public class RSSUtils {
if (channelLink != null && !channelLink.equals("")) {
return PathUtils.replaceEnvVariables(channelLink, channelMet);
} else {
- String cLink = channelMet.getMetadata("BaseUrl") + "/rdf/dataset?type="
+ return channelMet.getMetadata("BaseUrl") + "/rdf/dataset?type="
+ channelMet.getMetadata("ProductType") + "&typeID="
+ channelMet.getMetadata("ProductTypeId");
- return cLink;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java
index d332854..78ef705 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java
@@ -382,8 +382,7 @@ public class ThreadPoolWorkflowEngine implements WorkflowEngine, WorkflowStatus
long diffMs = currentDateOrStopTime.getTime()
- workflowStartDateTime.getTime();
double diffSecs = (diffMs * 1.0 / 1000.0);
- double diffMins = diffSecs / 60.0;
- return diffMins;
+ return diffSecs / 60.0;
}
@@ -429,8 +428,7 @@ public class ThreadPoolWorkflowEngine implements WorkflowEngine, WorkflowStatus
long diffMs = currentDateOrStopTime.getTime()
- workflowTaskStartDateTime.getTime();
double diffSecs = (diffMs * 1.0 / 1000.0);
- double diffMins = diffSecs / 60.0;
- return diffMins;
+ return diffSecs / 60.0;
}
private synchronized void persistWorkflowInstance(WorkflowInstance wInst)
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleManager.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleManager.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleManager.java
index 7b2e770..05b7780 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleManager.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleManager.java
@@ -110,9 +110,8 @@ public class WorkflowLifecycleManager {
WorkflowLifecycle lifecycle = getLifecycleForWorkflow(inst
.getWorkflow());
if (lifecycle != null) {
- WorkflowLifecycleStage stage = lifecycle.getStageForWorkflow(inst
+ return lifecycle.getStageForWorkflow(inst
.getStatus());
- return stage;
} else
return null;
}
@@ -131,8 +130,7 @@ public class WorkflowLifecycleManager {
int numStages = getNumStages(inst.getWorkflow());
int lastCompletedStageNum = getLastCompletedStageNum(inst);
- double pct = (double) ((lastCompletedStageNum * 1.0) / (numStages * 1.0));
- return pct;
+ return (double) ((lastCompletedStageNum * 1.0) / (numStages * 1.0));
}
/**
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/DataSourceWorkflowRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/DataSourceWorkflowRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/DataSourceWorkflowRepository.java
index 375b058..a8eea51 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/DataSourceWorkflowRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/DataSourceWorkflowRepository.java
@@ -1165,9 +1165,8 @@ public class DataSourceWorkflowRepository implements WorkflowRepository {
}
}
}
-
- String taskId = this.commitTask(null, task);
- return taskId;
+
+ return this.commitTask(null, task);
}
/*
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJob.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJob.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJob.java
index 3ed12bb..16ca5c7 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJob.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJob.java
@@ -192,8 +192,7 @@ public class TaskJob implements JobInstance, WorkflowStatus, CoreMetKeys{
// Get hostname by textual representation of IP address
InetAddress addr = InetAddress.getLocalHost();
// Get the host name
- String hostname = addr.getHostName();
- return hostname;
+ return addr.getHostName();
} catch (UnknownHostException e) {
}
return null;
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java
index 5824f24..7e7d732 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java
@@ -652,8 +652,7 @@ public class XmlRpcWorkflowManager {
// Get hostname by textual representation of IP address
InetAddress addr = InetAddress.getLocalHost();
// Get the host name
- String hostname = addr.getHostName();
- return hostname;
+ return addr.getHostName();
} catch (UnknownHostException e) {
}
return null;
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/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 1f58e9f..ce5c67d 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
@@ -528,9 +528,8 @@ public class XmlRpcWorkflowManagerClient {
try {
Hashtable workflowInstance = (Hashtable) client.execute(
"workflowmgr.getWorkflowInstanceById", argList);
- WorkflowInstance wInst = XmlRpcStructFactory
- .getWorkflowInstanceFromXmlRpc(workflowInstance);
- return wInst;
+ return XmlRpcStructFactory
+ .getWorkflowInstanceFromXmlRpc(workflowInstance);
} catch (XmlRpcException e) {
e.printStackTrace();
throw new Exception(e.getMessage());
@@ -548,8 +547,7 @@ public class XmlRpcWorkflowManagerClient {
try {
Hashtable workflow = (Hashtable) client.execute(
"workflowmgr.getWorkflowById", argList);
- Workflow w = XmlRpcStructFactory.getWorkflowFromXmlRpc(workflow);
- return w;
+ return XmlRpcStructFactory.getWorkflowFromXmlRpc(workflow);
} catch (XmlRpcException e) {
e.printStackTrace();
throw new Exception(e.getMessage());
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/workflow/src/main/java/org/apache/oodt/cas/workflow/util/DbStructFactory.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/DbStructFactory.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/DbStructFactory.java
index 63c7391..32feb7a 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/DbStructFactory.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/DbStructFactory.java
@@ -50,8 +50,7 @@ public final class DbStructFactory {
}
public static String getEvent(ResultSet rs) throws SQLException {
- String eventName = rs.getString("event_name");
- return eventName;
+ return rs.getString("event_name");
}
public static WorkflowInstance getWorkflowInstance(ResultSet rs)
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/workflow/src/test/java/org/apache/oodt/cas/workflow/structs/TestFILOPrioritySorter.java
----------------------------------------------------------------------
diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/structs/TestFILOPrioritySorter.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/structs/TestFILOPrioritySorter.java
index 8baf818..c412e75 100644
--- a/workflow/src/test/java/org/apache/oodt/cas/workflow/structs/TestFILOPrioritySorter.java
+++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/structs/TestFILOPrioritySorter.java
@@ -80,8 +80,7 @@ public class TestFILOPrioritySorter extends TestCase {
workflow.setTasks(Collections.EMPTY_LIST);
inst.setWorkflow(workflow);
inst.setPriority(Priority.getPriority(priority));
- SequentialProcessor processor = new SequentialProcessor(lifecycleManager, inst);
- return processor;
+ return new SequentialProcessor(lifecycleManager, inst);
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/workflow/src/test/java/org/apache/oodt/cas/workflow/structs/TestHighestFIFOPrioritySorter.java
----------------------------------------------------------------------
diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/structs/TestHighestFIFOPrioritySorter.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/structs/TestHighestFIFOPrioritySorter.java
index 77801d3..93b2c43 100644
--- a/workflow/src/test/java/org/apache/oodt/cas/workflow/structs/TestHighestFIFOPrioritySorter.java
+++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/structs/TestHighestFIFOPrioritySorter.java
@@ -75,8 +75,7 @@ public class TestHighestFIFOPrioritySorter extends TestCase {
workflow.setTasks(Collections.EMPTY_LIST);
inst.setWorkflow(workflow);
inst.setPriority(Priority.getPriority(priority));
- SequentialProcessor processor = new SequentialProcessor(lifecycleManager, inst);
- return processor;
+ return new SequentialProcessor(lifecycleManager, inst);
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/workflow/src/test/java/org/apache/oodt/cas/workflow/structs/TestHighestPrioritySorter.java
----------------------------------------------------------------------
diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/structs/TestHighestPrioritySorter.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/structs/TestHighestPrioritySorter.java
index d306392..0ed6da8 100644
--- a/workflow/src/test/java/org/apache/oodt/cas/workflow/structs/TestHighestPrioritySorter.java
+++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/structs/TestHighestPrioritySorter.java
@@ -78,8 +78,7 @@ public class TestHighestPrioritySorter extends TestCase {
workflow.setTasks(Collections.EMPTY_LIST);
inst.setWorkflow(workflow);
inst.setPriority(Priority.getPriority(priority));
- SequentialProcessor processor = new SequentialProcessor(lifecycleManager, inst);
- return processor;
+ return new SequentialProcessor(lifecycleManager, inst);
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/xmlps/src/main/java/org/apache/oodt/xmlps/product/DBMSExecutor.java
----------------------------------------------------------------------
diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/product/DBMSExecutor.java b/xmlps/src/main/java/org/apache/oodt/xmlps/product/DBMSExecutor.java
index a335d49..de082f9 100644
--- a/xmlps/src/main/java/org/apache/oodt/xmlps/product/DBMSExecutor.java
+++ b/xmlps/src/main/java/org/apache/oodt/xmlps/product/DBMSExecutor.java
@@ -53,8 +53,7 @@ public class DBMSExecutor {
Connection conn = dataSource.getConnection();
Statement statement = conn.createStatement();
ResultSet rs = statement.executeQuery(sql);
- CDEResult result = new CDEResult(rs, conn);
- return result;
+ return new CDEResult(rs, conn);
} catch (SQLException e) {
e.printStackTrace();
throw e;
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/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 4399f83..f7d6175 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
@@ -121,8 +121,7 @@ public class XMLPSProfileHandler extends XMLPSProductHandler implements
e.printStackTrace();
throw new ProfileException(e.getMessage());
}
- List<Profile> profs = queryAndPackageProfiles(query);
- return profs;
+ return queryAndPackageProfiles(query);
}
/*
http://git-wip-us.apache.org/repos/asf/oodt/blob/edb01cb2/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 263e840..b9a8095 100755
--- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java
+++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java
@@ -535,10 +535,9 @@ public class XMLQuery implements java.io.Serializable, Cloneable {
*/
private static boolean isFromToken (String s1)
{
- String tmpStr = s1;
- for (int i = 0; i < FROM_TOKENS.length; i++)
+ for (int i = 0; i < FROM_TOKENS.length; i++)
{
- if (tmpStr.compareTo(FROM_TOKENS[i]) == 0) {
+ if (s1.compareTo(FROM_TOKENS[i]) == 0) {
return true;
}
}