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:59 UTC
[2/4] oodt git commit: OODT-899 inline variables
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;
}
}