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 17:21:46 UTC
[01/16] oodt git commit: OODT-902 tidy up fix enums
Repository: oodt
Updated Branches:
refs/heads/master 8c054377a -> dd7577b50
OODT-902 tidy up fix enums
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/73d960ed
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/73d960ed
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/73d960ed
Branch: refs/heads/master
Commit: 73d960ed0d31cc1745cdf5b5bde6bfeec984c90a
Parents: 8c05437
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Oct 25 15:31:48 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Oct 25 15:31:48 2015 +0000
----------------------------------------------------------------------
.../query/ComparisonQueryExpression.java | 2 +-
.../org/apache/oodt/commons/date/DateUtils.java | 4 +--
.../cas/crawl/action/CrawlerActionPhases.java | 2 +-
.../oodt/cas/filemgr/tools/QueryTool.java | 38 ++++++++++----------
.../cas/filemgr/catalog/TestLuceneCatalog.java | 2 ++
5 files changed, 25 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/73d960ed/catalog/src/main/java/org/apache/oodt/cas/catalog/query/ComparisonQueryExpression.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/ComparisonQueryExpression.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/ComparisonQueryExpression.java
index fc04920..f294e01 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/ComparisonQueryExpression.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/ComparisonQueryExpression.java
@@ -26,7 +26,7 @@ package org.apache.oodt.cas.catalog.query;
*/
public class ComparisonQueryExpression extends TermQueryExpression {
- public static enum Operator { EQUAL_TO("=="), LESS_THAN_EQUAL_TO("<="), GREATER_THAN_EQUAL_TO(">="), LESS_THAN("<"), GREATER_THAN(">"), LIKE("LIKE");
+ public enum Operator { EQUAL_TO("=="), LESS_THAN_EQUAL_TO("<="), GREATER_THAN_EQUAL_TO(">="), LESS_THAN("<"), GREATER_THAN(">"), LIKE("LIKE");
private String value;
http://git-wip-us.apache.org/repos/asf/oodt/blob/73d960ed/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java b/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java
index 188a5eb..83b823d 100644
--- a/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java
+++ b/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java
@@ -35,7 +35,7 @@ import java.util.TimeZone;
*/
public class DateUtils {
- public static enum FormatType { UTC_FORMAT, LOCAL_FORMAT, TAI_FORMAT };
+ public enum FormatType { UTC_FORMAT, LOCAL_FORMAT, TAI_FORMAT };
public static Calendar tai93epoch = new GregorianCalendar(1993, GregorianCalendar.JANUARY, 1);
@@ -53,7 +53,7 @@ public class DateUtils {
taiFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
}
- static enum IndexType {
+ enum IndexType {
DATE(0),
LEAP_SECS(1);
http://git-wip-us.apache.org/repos/asf/oodt/blob/73d960ed/crawler/src/main/java/org/apache/oodt/cas/crawl/action/CrawlerActionPhases.java
----------------------------------------------------------------------
diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/CrawlerActionPhases.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/CrawlerActionPhases.java
index 00cc7f6..c0522e7 100644
--- a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/CrawlerActionPhases.java
+++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/CrawlerActionPhases.java
@@ -29,7 +29,7 @@ public enum CrawlerActionPhases {
private String name;
- private CrawlerActionPhases(String name) {
+ CrawlerActionPhases(String name) {
this.name = name;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/73d960ed/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 871c850..ba77bb8 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
@@ -18,15 +18,15 @@
package org.apache.oodt.cas.filemgr.tools;
//JDK imports
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-//OODT imports
+import org.apache.lucene.index.Term;
+import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.search.BooleanClause;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.PhraseQuery;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.RangeQuery;
+import org.apache.lucene.search.TermQuery;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.ProductType;
import org.apache.oodt.cas.filemgr.structs.RangeQueryCriteria;
@@ -40,16 +40,16 @@ import org.apache.oodt.cas.filemgr.structs.query.QueryResult;
import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
import org.apache.oodt.cas.filemgr.util.SqlParser;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+//OODT imports
//APACHE imports
-import org.apache.lucene.index.Term;
-import org.apache.lucene.queryParser.ParseException;
-import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.search.BooleanClause;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.PhraseQuery;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.RangeQuery;
-import org.apache.lucene.search.TermQuery;
/**
* @author mattmann
@@ -67,7 +67,7 @@ public final class QueryTool {
private XmlRpcFileManagerClient client = null;
- private static enum QueryType { LUCENE, SQL };
+ private enum QueryType { LUCENE, SQL };
/* our log stream */
private static final Logger LOG = Logger.getLogger(QueryTool.class.getName());
http://git-wip-us.apache.org/repos/asf/oodt/blob/73d960ed/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java
index 3115d10..4e30b40 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java
@@ -983,6 +983,8 @@ public class TestLuceneCatalog extends TestCase {
public void testNullIndexPath(){
System.clearProperty("org.apache.oodt.cas.filemgr.catalog.lucene.idxPath");
+ Properties sysProps = System.getProperties();
+
try{
LuceneCatalogFactory fact = new LuceneCatalogFactory();
fail( "Missing exception" );
[08/16] oodt git commit: remove unused imports
Posted by ma...@apache.org.
remove unused imports
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/d3ee12a2
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/d3ee12a2
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/d3ee12a2
Branch: refs/heads/master
Commit: d3ee12a2f88ef79a27325865a7862573a060ae00
Parents: ed6be8c
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Oct 25 15:46:03 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Oct 25 15:46:03 2015 +0000
----------------------------------------------------------------------
.../java/org/apache/oodt/cas/cli/util/TestCmdLineUtils.java | 2 --
.../src/main/java/org/apache/oodt/commons/Configuration.java | 1 -
.../main/java/org/apache/oodt/commons/ExecServerConfig.java | 1 -
commons/src/main/java/org/apache/oodt/commons/Executable.java | 1 -
.../java/org/apache/oodt/commons/io/NullOutputStream.java | 1 -
.../main/java/org/apache/oodt/commons/util/Documentable.java | 2 --
commons/src/main/java/org/apache/oodt/commons/util/LDAP.java | 3 ---
.../test/java/org/apache/oodt/commons/AbstractTestCase.java | 1 -
commons/src/test/java/org/apache/oodt/commons/AppTest.java | 1 -
.../test/java/org/apache/oodt/commons/ConfigurationTest.java | 2 +-
.../java/org/apache/oodt/commons/ConfiguredTestCaseTest.java | 1 -
.../src/test/java/org/apache/oodt/commons/NaughtyTest.java | 1 -
.../apache/oodt/commons/io/FixedBufferOutputStreamTest.java | 1 -
.../java/org/apache/oodt/commons/io/NullInputStreamTest.java | 2 +-
.../java/org/apache/oodt/commons/io/NullOutputStreamTest.java | 2 +-
.../test/java/org/apache/oodt/commons/util/Base64Test.java | 1 -
.../test/java/org/apache/oodt/commons/util/CacheMapTest.java | 2 --
.../src/test/java/org/apache/oodt/commons/util/LDAPTest.java | 2 --
.../src/test/java/org/apache/oodt/commons/util/XMLTest.java | 2 +-
.../crawl/typedetection/TestMimeExtractorConfigReader.java | 1 -
.../java/org/apache/oodt/cas/filemgr/ingest/LocalCache.java | 1 -
.../apache/oodt/cas/filemgr/ingest/TestCachedIngester.java | 1 -
.../oodt/cas/filemgr/system/MockXmlRpcFileManagerClient.java | 1 -
.../src/main/java/org/apache/oodt/pcs/pedigree/Pedigree.java | 1 -
.../org/apache/oodt/profile/RangedProfileElementTest.java | 1 -
.../java/org/apache/oodt/cas/protocol/TestProtocolFile.java | 1 -
.../oodt/cas/protocol/ftp/TestCogJGlobusFtpProtocol.java | 1 -
.../oodt/cas/resource/batchmgr/XmlRpcBatchMgrFactory.java | 1 -
.../oodt/cas/workflow/engine/QuerierAndRunnerUtils.java | 3 ---
.../instrepo/TestLuceneWorkflowInstanceRepository.java | 1 -
.../src/main/java/org/apache/oodt/xmlquery/CodecFactory.java | 1 -
xmlquery/src/main/java/org/apache/oodt/xmlquery/Header.java | 2 +-
.../src/main/java/org/apache/oodt/xmlquery/QueryElement.java | 3 +--
xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java | 2 +-
xmlquery/src/main/java/org/apache/oodt/xmlquery/Results.java | 1 -
.../src/main/java/org/apache/oodt/xmlquery/StringCodec.java | 2 +-
.../src/test/java/org/apache/oodt/xmlquery/CodecTest.java | 3 ---
.../org/apache/oodt/xmlquery/CompressedObjectCodecTest.java | 6 ------
.../org/apache/oodt/xmlquery/CompressedStringCodecTest.java | 7 +------
.../org/apache/oodt/xmlquery/EmptyByteArrayCodecTest.java | 6 ------
.../src/test/java/org/apache/oodt/xmlquery/HeaderTest.java | 2 --
.../test/java/org/apache/oodt/xmlquery/ObjectCodecTest.java | 6 ------
.../test/java/org/apache/oodt/xmlquery/QueryElementTest.java | 3 ---
.../src/test/java/org/apache/oodt/xmlquery/ResultTest.java | 2 --
.../test/java/org/apache/oodt/xmlquery/StringCodecTest.java | 7 +------
.../src/test/java/org/apache/oodt/xmlquery/XMLQueryTest.java | 2 --
46 files changed, 10 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/cli/src/test/java/org/apache/oodt/cas/cli/util/TestCmdLineUtils.java
----------------------------------------------------------------------
diff --git a/cli/src/test/java/org/apache/oodt/cas/cli/util/TestCmdLineUtils.java b/cli/src/test/java/org/apache/oodt/cas/cli/util/TestCmdLineUtils.java
index c4ce9cc..08aadee 100644
--- a/cli/src/test/java/org/apache/oodt/cas/cli/util/TestCmdLineUtils.java
+++ b/cli/src/test/java/org/apache/oodt/cas/cli/util/TestCmdLineUtils.java
@@ -51,11 +51,9 @@ import org.apache.oodt.cas.cli.option.GroupCmdLineOption;
import org.apache.oodt.cas.cli.option.GroupSubOption;
import org.apache.oodt.cas.cli.option.HelpCmdLineOption;
import org.apache.oodt.cas.cli.option.PrintSupportedActionsCmdLineOption;
-import org.apache.oodt.cas.cli.option.SimpleCmdLineOption;
import org.apache.oodt.cas.cli.option.handler.CmdLineOptionHandler;
import org.apache.oodt.cas.cli.option.validator.AllowedArgsCmdLineOptionValidator;
import org.apache.oodt.cas.cli.option.validator.CmdLineOptionValidator;
-import org.apache.oodt.cas.cli.test.util.TestUtils;
import org.apache.oodt.cas.cli.util.CmdLineUtils;
//Google imports
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/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 740d810..e142165 100644
--- a/commons/src/main/java/org/apache/oodt/commons/Configuration.java
+++ b/commons/src/main/java/org/apache/oodt/commons/Configuration.java
@@ -29,7 +29,6 @@ import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.naming.NoInitialContextException;
import java.rmi.registry.Registry;
-import java.util.StringTokenizer;
/** EDA Configuration.
*
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/commons/src/main/java/org/apache/oodt/commons/ExecServerConfig.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/ExecServerConfig.java b/commons/src/main/java/org/apache/oodt/commons/ExecServerConfig.java
index ebea28f..c037cdf 100644
--- a/commons/src/main/java/org/apache/oodt/commons/ExecServerConfig.java
+++ b/commons/src/main/java/org/apache/oodt/commons/ExecServerConfig.java
@@ -17,7 +17,6 @@
package org.apache.oodt.commons;
-import java.io.*;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.*;
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/commons/src/main/java/org/apache/oodt/commons/Executable.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/Executable.java b/commons/src/main/java/org/apache/oodt/commons/Executable.java
index dc3940a..44f1287 100644
--- a/commons/src/main/java/org/apache/oodt/commons/Executable.java
+++ b/commons/src/main/java/org/apache/oodt/commons/Executable.java
@@ -18,7 +18,6 @@
package org.apache.oodt.commons;
import java.io.*;
-import java.util.*;
/** An executable object.
*
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/commons/src/main/java/org/apache/oodt/commons/io/NullOutputStream.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/io/NullOutputStream.java b/commons/src/main/java/org/apache/oodt/commons/io/NullOutputStream.java
index 0190c03..d7a332d 100644
--- a/commons/src/main/java/org/apache/oodt/commons/io/NullOutputStream.java
+++ b/commons/src/main/java/org/apache/oodt/commons/io/NullOutputStream.java
@@ -16,7 +16,6 @@
package org.apache.oodt.commons.io;
import java.io.*;
-import java.util.*;
/** A null output stream.
*
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/commons/src/main/java/org/apache/oodt/commons/util/Documentable.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/util/Documentable.java b/commons/src/main/java/org/apache/oodt/commons/util/Documentable.java
index 90c9ce9..0190f0c 100644
--- a/commons/src/main/java/org/apache/oodt/commons/util/Documentable.java
+++ b/commons/src/main/java/org/apache/oodt/commons/util/Documentable.java
@@ -15,8 +15,6 @@
package org.apache.oodt.commons.util;
-import java.io.*;
-import java.util.*;
import org.w3c.dom.*;
/** A documentable object.
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/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 0dc52d4..fbb5f67 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
@@ -15,9 +15,6 @@
package org.apache.oodt.commons.util;
-import java.io.*;
-import java.util.*;
-
/** LDAP services.
*
* This class provides LDAP convenience services.
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/commons/src/test/java/org/apache/oodt/commons/AbstractTestCase.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/oodt/commons/AbstractTestCase.java b/commons/src/test/java/org/apache/oodt/commons/AbstractTestCase.java
index 144d545..5ffaf34 100644
--- a/commons/src/test/java/org/apache/oodt/commons/AbstractTestCase.java
+++ b/commons/src/test/java/org/apache/oodt/commons/AbstractTestCase.java
@@ -18,7 +18,6 @@ package org.apache.oodt.commons;
import java.io.File;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* Abstract base class for test cases.
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/commons/src/test/java/org/apache/oodt/commons/AppTest.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/oodt/commons/AppTest.java b/commons/src/test/java/org/apache/oodt/commons/AppTest.java
index 52e65db..4af4d0f 100644
--- a/commons/src/test/java/org/apache/oodt/commons/AppTest.java
+++ b/commons/src/test/java/org/apache/oodt/commons/AppTest.java
@@ -15,7 +15,6 @@
package org.apache.oodt.commons;
import junit.framework.Test;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
/**
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/commons/src/test/java/org/apache/oodt/commons/ConfigurationTest.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/oodt/commons/ConfigurationTest.java b/commons/src/test/java/org/apache/oodt/commons/ConfigurationTest.java
index b37df44..839116c 100644
--- a/commons/src/test/java/org/apache/oodt/commons/ConfigurationTest.java
+++ b/commons/src/test/java/org/apache/oodt/commons/ConfigurationTest.java
@@ -19,7 +19,7 @@ import java.io.*;
import java.net.MalformedURLException;
import java.util.*;
import junit.framework.*;
-import org.w3c.dom.*;
+
import org.xml.sax.*;
/** Unit test the {@link Configuration} class.
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/commons/src/test/java/org/apache/oodt/commons/ConfiguredTestCaseTest.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/oodt/commons/ConfiguredTestCaseTest.java b/commons/src/test/java/org/apache/oodt/commons/ConfiguredTestCaseTest.java
index 0e062a1..a10d042 100644
--- a/commons/src/test/java/org/apache/oodt/commons/ConfiguredTestCaseTest.java
+++ b/commons/src/test/java/org/apache/oodt/commons/ConfiguredTestCaseTest.java
@@ -16,7 +16,6 @@
package org.apache.oodt.commons;
import junit.framework.TestCase;
-import org.xml.sax.SAXParseException;
/**
* Unit test the ConfiguredTestCase class.
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/commons/src/test/java/org/apache/oodt/commons/NaughtyTest.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/oodt/commons/NaughtyTest.java b/commons/src/test/java/org/apache/oodt/commons/NaughtyTest.java
index a825b7e..d73152f 100644
--- a/commons/src/test/java/org/apache/oodt/commons/NaughtyTest.java
+++ b/commons/src/test/java/org/apache/oodt/commons/NaughtyTest.java
@@ -16,7 +16,6 @@
package org.apache.oodt.commons;
import junit.framework.Test;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
/**
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/commons/src/test/java/org/apache/oodt/commons/io/FixedBufferOutputStreamTest.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/oodt/commons/io/FixedBufferOutputStreamTest.java b/commons/src/test/java/org/apache/oodt/commons/io/FixedBufferOutputStreamTest.java
index a3efa38..b08ee73 100644
--- a/commons/src/test/java/org/apache/oodt/commons/io/FixedBufferOutputStreamTest.java
+++ b/commons/src/test/java/org/apache/oodt/commons/io/FixedBufferOutputStreamTest.java
@@ -16,7 +16,6 @@
package org.apache.oodt.commons.io;
import java.io.IOException;
-import java.io.OutputStream;
import java.util.Arrays;
import junit.framework.TestCase;
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/commons/src/test/java/org/apache/oodt/commons/io/NullInputStreamTest.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/oodt/commons/io/NullInputStreamTest.java b/commons/src/test/java/org/apache/oodt/commons/io/NullInputStreamTest.java
index cf92b7f..7efcb8c 100644
--- a/commons/src/test/java/org/apache/oodt/commons/io/NullInputStreamTest.java
+++ b/commons/src/test/java/org/apache/oodt/commons/io/NullInputStreamTest.java
@@ -16,7 +16,7 @@
package org.apache.oodt.commons.io;
import java.io.IOException;
-import java.io.InputStream;
+
import junit.framework.TestCase;
/**
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/commons/src/test/java/org/apache/oodt/commons/io/NullOutputStreamTest.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/oodt/commons/io/NullOutputStreamTest.java b/commons/src/test/java/org/apache/oodt/commons/io/NullOutputStreamTest.java
index b6a234e..5b37f80 100644
--- a/commons/src/test/java/org/apache/oodt/commons/io/NullOutputStreamTest.java
+++ b/commons/src/test/java/org/apache/oodt/commons/io/NullOutputStreamTest.java
@@ -16,7 +16,7 @@
package org.apache.oodt.commons.io;
import java.io.*;
-import java.util.*;
+
import junit.framework.*;
/** Unit test the {@link NullOutputStream} class.
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/commons/src/test/java/org/apache/oodt/commons/util/Base64Test.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/oodt/commons/util/Base64Test.java b/commons/src/test/java/org/apache/oodt/commons/util/Base64Test.java
index 9554b66..b3becdf 100644
--- a/commons/src/test/java/org/apache/oodt/commons/util/Base64Test.java
+++ b/commons/src/test/java/org/apache/oodt/commons/util/Base64Test.java
@@ -15,7 +15,6 @@
package org.apache.oodt.commons.util;
-import java.io.*;
import java.util.*;
import junit.framework.*;
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/commons/src/test/java/org/apache/oodt/commons/util/CacheMapTest.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/oodt/commons/util/CacheMapTest.java b/commons/src/test/java/org/apache/oodt/commons/util/CacheMapTest.java
index a7c82e6..dbdc570 100644
--- a/commons/src/test/java/org/apache/oodt/commons/util/CacheMapTest.java
+++ b/commons/src/test/java/org/apache/oodt/commons/util/CacheMapTest.java
@@ -15,8 +15,6 @@
package org.apache.oodt.commons.util;
-import java.io.*;
-import java.util.*;
import junit.framework.*;
/** Unit test the {@link CacheMap} class.
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/commons/src/test/java/org/apache/oodt/commons/util/LDAPTest.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/oodt/commons/util/LDAPTest.java b/commons/src/test/java/org/apache/oodt/commons/util/LDAPTest.java
index 9874643..8bf5cb4 100644
--- a/commons/src/test/java/org/apache/oodt/commons/util/LDAPTest.java
+++ b/commons/src/test/java/org/apache/oodt/commons/util/LDAPTest.java
@@ -15,8 +15,6 @@
package org.apache.oodt.commons.util;
-import java.io.*;
-import java.util.*;
import junit.framework.*;
/** Unit test the {@link LDAP} class.
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/commons/src/test/java/org/apache/oodt/commons/util/XMLTest.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/oodt/commons/util/XMLTest.java b/commons/src/test/java/org/apache/oodt/commons/util/XMLTest.java
index fe26a83..f2098b9 100644
--- a/commons/src/test/java/org/apache/oodt/commons/util/XMLTest.java
+++ b/commons/src/test/java/org/apache/oodt/commons/util/XMLTest.java
@@ -16,7 +16,7 @@
package org.apache.oodt.commons.util;
import java.io.*;
-import java.util.*;
+
import junit.framework.*;
import org.w3c.dom.*;
import org.xml.sax.*;
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/crawler/src/test/java/org/apache/oodt/cas/crawl/typedetection/TestMimeExtractorConfigReader.java
----------------------------------------------------------------------
diff --git a/crawler/src/test/java/org/apache/oodt/cas/crawl/typedetection/TestMimeExtractorConfigReader.java b/crawler/src/test/java/org/apache/oodt/cas/crawl/typedetection/TestMimeExtractorConfigReader.java
index 4a7e410..bfc445d 100644
--- a/crawler/src/test/java/org/apache/oodt/cas/crawl/typedetection/TestMimeExtractorConfigReader.java
+++ b/crawler/src/test/java/org/apache/oodt/cas/crawl/typedetection/TestMimeExtractorConfigReader.java
@@ -27,7 +27,6 @@ import org.apache.commons.io.FileUtils;
//OODT imports
import org.apache.oodt.cas.metadata.extractors.CopyAndRewriteExtractor;
import org.apache.oodt.cas.metadata.extractors.MetReaderExtractor;
-import org.apache.oodt.cas.metadata.filenaming.PathUtilsNamingConvention;
//Google imports
import com.google.common.collect.Lists;
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/LocalCache.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/LocalCache.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/LocalCache.java
index a4c56b1..8ea8634 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/LocalCache.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/LocalCache.java
@@ -29,7 +29,6 @@ import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
//JDK imports
import java.net.URL;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Vector;
import java.util.logging.Level;
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java
index fa809f7..d7c122a 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java
@@ -21,7 +21,6 @@ package org.apache.oodt.cas.filemgr.ingest;
//JDK imports
import java.io.File;
import java.io.FileInputStream;
-import java.net.MalformedURLException;
import java.net.URL;
import java.util.Date;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/MockXmlRpcFileManagerClient.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/MockXmlRpcFileManagerClient.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/MockXmlRpcFileManagerClient.java
index cf80e91..ef0c537 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/MockXmlRpcFileManagerClient.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/MockXmlRpcFileManagerClient.java
@@ -27,7 +27,6 @@ import org.apache.oodt.cas.filemgr.structs.FileTransferStatus;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.ProductPage;
import org.apache.oodt.cas.filemgr.structs.ProductType;
-import org.apache.oodt.cas.filemgr.structs.Query;
import org.apache.oodt.cas.filemgr.structs.Reference;
import org.apache.oodt.cas.filemgr.structs.exceptions.ConnectionException;
import org.apache.oodt.cas.filemgr.structs.exceptions.DataTransferException;
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/pcs/core/src/main/java/org/apache/oodt/pcs/pedigree/Pedigree.java
----------------------------------------------------------------------
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/pedigree/Pedigree.java b/pcs/core/src/main/java/org/apache/oodt/pcs/pedigree/Pedigree.java
index 1aa321c..7f6f7b3 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/pedigree/Pedigree.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/pedigree/Pedigree.java
@@ -28,7 +28,6 @@ import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.metadata.Metadata;
//JDK imports
-import java.util.Iterator;
import java.util.List;
import java.util.Stack;
import java.util.Vector;
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/profile/src/test/java/org/apache/oodt/profile/RangedProfileElementTest.java
----------------------------------------------------------------------
diff --git a/profile/src/test/java/org/apache/oodt/profile/RangedProfileElementTest.java b/profile/src/test/java/org/apache/oodt/profile/RangedProfileElementTest.java
index e8ede4e..7fe75cf 100644
--- a/profile/src/test/java/org/apache/oodt/profile/RangedProfileElementTest.java
+++ b/profile/src/test/java/org/apache/oodt/profile/RangedProfileElementTest.java
@@ -25,7 +25,6 @@ import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
import org.apache.oodt.commons.io.NullOutputStream;
import org.apache.oodt.commons.util.XML;
-import junit.framework.TestCase;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/protocol/api/src/test/java/org/apache/oodt/cas/protocol/TestProtocolFile.java
----------------------------------------------------------------------
diff --git a/protocol/api/src/test/java/org/apache/oodt/cas/protocol/TestProtocolFile.java b/protocol/api/src/test/java/org/apache/oodt/cas/protocol/TestProtocolFile.java
index f0c472d..0d7cdeb 100644
--- a/protocol/api/src/test/java/org/apache/oodt/cas/protocol/TestProtocolFile.java
+++ b/protocol/api/src/test/java/org/apache/oodt/cas/protocol/TestProtocolFile.java
@@ -17,7 +17,6 @@
package org.apache.oodt.cas.protocol;
//JDK imports
-import java.io.File;
//JUnit imports
import junit.framework.TestCase;
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/protocol/ftp/src/test/java/org/apache/oodt/cas/protocol/ftp/TestCogJGlobusFtpProtocol.java
----------------------------------------------------------------------
diff --git a/protocol/ftp/src/test/java/org/apache/oodt/cas/protocol/ftp/TestCogJGlobusFtpProtocol.java b/protocol/ftp/src/test/java/org/apache/oodt/cas/protocol/ftp/TestCogJGlobusFtpProtocol.java
index e69bf9e..379276f 100644
--- a/protocol/ftp/src/test/java/org/apache/oodt/cas/protocol/ftp/TestCogJGlobusFtpProtocol.java
+++ b/protocol/ftp/src/test/java/org/apache/oodt/cas/protocol/ftp/TestCogJGlobusFtpProtocol.java
@@ -18,7 +18,6 @@ package org.apache.oodt.cas.protocol.ftp;
//JUnit imports
import java.io.File;
-import java.util.ArrayList;
import java.util.List;
import java.util.Vector;
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgrFactory.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgrFactory.java b/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgrFactory.java
index 3a344ed..5fb1ce4 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgrFactory.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgrFactory.java
@@ -18,7 +18,6 @@
package org.apache.oodt.cas.resource.batchmgr;
-import org.apache.oodt.cas.resource.util.GenericResourceManagerObjectFactory;
import org.apache.oodt.cas.resource.monitor.Monitor;
/**
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/QuerierAndRunnerUtils.java
----------------------------------------------------------------------
diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/QuerierAndRunnerUtils.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/QuerierAndRunnerUtils.java
index 0d83638..b936617 100644
--- a/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/QuerierAndRunnerUtils.java
+++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/QuerierAndRunnerUtils.java
@@ -23,11 +23,8 @@ import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.util.Collections;
import java.util.Date;
-import java.util.List;
-import java.util.Vector;
//OODT imports
-import org.apache.oodt.cas.workflow.engine.processor.SequentialProcessor;
import org.apache.oodt.cas.workflow.engine.processor.TaskProcessor;
import org.apache.oodt.cas.workflow.engine.processor.WorkflowProcessor;
import org.apache.oodt.cas.workflow.engine.processor.WorkflowProcessorBuilder;
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/workflow/src/test/java/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java
index f9d27c4..323e4cf 100644
--- a/workflow/src/test/java/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java
+++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java
@@ -31,7 +31,6 @@ import org.apache.oodt.cas.workflow.structs.exceptions.InstanceRepositoryExcepti
//JDK imports
import java.io.File;
import java.io.FileInputStream;
-import java.io.IOException;
import java.util.Iterator;
import java.util.List;
import java.util.Vector;
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/xmlquery/src/main/java/org/apache/oodt/xmlquery/CodecFactory.java
----------------------------------------------------------------------
diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/CodecFactory.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/CodecFactory.java
index 8935e53..b74b238 100755
--- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/CodecFactory.java
+++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/CodecFactory.java
@@ -18,7 +18,6 @@
package org.apache.oodt.xmlquery;
-import java.io.*;
import java.util.*;
/** A factory for codecs.
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/xmlquery/src/main/java/org/apache/oodt/xmlquery/Header.java
----------------------------------------------------------------------
diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Header.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Header.java
index 7cb7dab..8e7cf7f 100755
--- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Header.java
+++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Header.java
@@ -20,7 +20,7 @@ package org.apache.oodt.xmlquery;
import java.io.*;
import java.util.*;
-import java.util.zip.*;
+
import org.apache.oodt.commons.util.*;
import org.w3c.dom.*;
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryElement.java
----------------------------------------------------------------------
diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryElement.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryElement.java
index 4032e01..02e1a5c 100755
--- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryElement.java
+++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryElement.java
@@ -19,8 +19,7 @@
package org.apache.oodt.xmlquery;
import java.io.*;
-import java.util.*;
-import java.util.zip.*;
+
import org.apache.oodt.commons.util.*;
import org.w3c.dom.*;
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java
----------------------------------------------------------------------
diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java
index 73ad7e7..afbc65d 100755
--- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java
+++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java
@@ -20,7 +20,7 @@ package org.apache.oodt.xmlquery;
import java.io.*;
import java.util.*;
-import java.util.zip.*;
+
import org.apache.oodt.commons.util.*;
import org.w3c.dom.*;
import org.apache.oodt.product.Retriever;
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/xmlquery/src/main/java/org/apache/oodt/xmlquery/Results.java
----------------------------------------------------------------------
diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Results.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Results.java
index 69cf39c..cfd8c9a 100755
--- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Results.java
+++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Results.java
@@ -18,7 +18,6 @@
package org.apache.oodt.xmlquery;
import java.util.Vector;
-import org.apache.oodt.commons.util.*;
/************************************************************************
**
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/xmlquery/src/main/java/org/apache/oodt/xmlquery/StringCodec.java
----------------------------------------------------------------------
diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/StringCodec.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/StringCodec.java
index 73713d3..cc429d3 100755
--- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/StringCodec.java
+++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/StringCodec.java
@@ -19,7 +19,7 @@
package org.apache.oodt.xmlquery;
import java.io.*;
-import java.util.zip.*;
+
import org.apache.oodt.commons.util.*;
import org.w3c.dom.*;
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/xmlquery/src/test/java/org/apache/oodt/xmlquery/CodecTest.java
----------------------------------------------------------------------
diff --git a/xmlquery/src/test/java/org/apache/oodt/xmlquery/CodecTest.java b/xmlquery/src/test/java/org/apache/oodt/xmlquery/CodecTest.java
index 42b7b12..15e4017 100755
--- a/xmlquery/src/test/java/org/apache/oodt/xmlquery/CodecTest.java
+++ b/xmlquery/src/test/java/org/apache/oodt/xmlquery/CodecTest.java
@@ -18,12 +18,9 @@
package org.apache.oodt.xmlquery;
-import java.io.*;
-import java.util.*;
import org.apache.oodt.commons.util.*;
import junit.framework.*;
import org.w3c.dom.*;
-import org.xml.sax.*;
/** Unit test a codec.
*
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/xmlquery/src/test/java/org/apache/oodt/xmlquery/CompressedObjectCodecTest.java
----------------------------------------------------------------------
diff --git a/xmlquery/src/test/java/org/apache/oodt/xmlquery/CompressedObjectCodecTest.java b/xmlquery/src/test/java/org/apache/oodt/xmlquery/CompressedObjectCodecTest.java
index e248b10..ff9d49e 100755
--- a/xmlquery/src/test/java/org/apache/oodt/xmlquery/CompressedObjectCodecTest.java
+++ b/xmlquery/src/test/java/org/apache/oodt/xmlquery/CompressedObjectCodecTest.java
@@ -18,12 +18,6 @@
package org.apache.oodt.xmlquery;
-import java.io.*;
-import java.util.*;
-import org.apache.oodt.commons.util.*;
-import junit.framework.*;
-import org.w3c.dom.*;
-import org.xml.sax.*;
import org.apache.oodt.xmlquery.CompressedObjectCodec; // Imported for javadoc
/** Unit test the {@link CompressedObjectCodec} class.
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/xmlquery/src/test/java/org/apache/oodt/xmlquery/CompressedStringCodecTest.java
----------------------------------------------------------------------
diff --git a/xmlquery/src/test/java/org/apache/oodt/xmlquery/CompressedStringCodecTest.java b/xmlquery/src/test/java/org/apache/oodt/xmlquery/CompressedStringCodecTest.java
index 1581e5b..e7f8a79 100755
--- a/xmlquery/src/test/java/org/apache/oodt/xmlquery/CompressedStringCodecTest.java
+++ b/xmlquery/src/test/java/org/apache/oodt/xmlquery/CompressedStringCodecTest.java
@@ -18,13 +18,8 @@
package org.apache.oodt.xmlquery;
-import java.io.*;
-import java.util.*;
import org.apache.oodt.xmlquery.CompressedStringCodec; // Imported for Javadoc
-import org.apache.oodt.commons.util.*;
-import junit.framework.*;
-import org.w3c.dom.*;
-import org.xml.sax.*;
+
/** Unit test the {@link CompressedStringCodec} class.
*
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/xmlquery/src/test/java/org/apache/oodt/xmlquery/EmptyByteArrayCodecTest.java
----------------------------------------------------------------------
diff --git a/xmlquery/src/test/java/org/apache/oodt/xmlquery/EmptyByteArrayCodecTest.java b/xmlquery/src/test/java/org/apache/oodt/xmlquery/EmptyByteArrayCodecTest.java
index d886f79..2d3eee6 100755
--- a/xmlquery/src/test/java/org/apache/oodt/xmlquery/EmptyByteArrayCodecTest.java
+++ b/xmlquery/src/test/java/org/apache/oodt/xmlquery/EmptyByteArrayCodecTest.java
@@ -18,12 +18,6 @@
package org.apache.oodt.xmlquery;
-import java.io.*;
-import java.util.*;
-import org.apache.oodt.commons.util.*;
-import junit.framework.*;
-import org.w3c.dom.*;
-import org.xml.sax.*;
import org.apache.oodt.xmlquery.ByteArrayCodec; // Imported for javadoc
/**
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/xmlquery/src/test/java/org/apache/oodt/xmlquery/HeaderTest.java
----------------------------------------------------------------------
diff --git a/xmlquery/src/test/java/org/apache/oodt/xmlquery/HeaderTest.java b/xmlquery/src/test/java/org/apache/oodt/xmlquery/HeaderTest.java
index 00e5a68..5340546 100755
--- a/xmlquery/src/test/java/org/apache/oodt/xmlquery/HeaderTest.java
+++ b/xmlquery/src/test/java/org/apache/oodt/xmlquery/HeaderTest.java
@@ -18,12 +18,10 @@
package org.apache.oodt.xmlquery;
-import java.io.*;
import java.util.*;
import org.apache.oodt.commons.util.*;
import junit.framework.*;
import org.w3c.dom.*;
-import org.xml.sax.*;
/** Unit test the {@link Header} class.
*
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/xmlquery/src/test/java/org/apache/oodt/xmlquery/ObjectCodecTest.java
----------------------------------------------------------------------
diff --git a/xmlquery/src/test/java/org/apache/oodt/xmlquery/ObjectCodecTest.java b/xmlquery/src/test/java/org/apache/oodt/xmlquery/ObjectCodecTest.java
index 99e92c6..a997a06 100755
--- a/xmlquery/src/test/java/org/apache/oodt/xmlquery/ObjectCodecTest.java
+++ b/xmlquery/src/test/java/org/apache/oodt/xmlquery/ObjectCodecTest.java
@@ -18,12 +18,6 @@
package org.apache.oodt.xmlquery;
-import java.io.*;
-import java.util.*;
-import org.apache.oodt.commons.util.*;
-import junit.framework.*;
-import org.w3c.dom.*;
-import org.xml.sax.*;
import org.apache.oodt.xmlquery.ObjectCodec; // Imported for javadoc
/** Unit test the {@link ObjectCodec} class.
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/xmlquery/src/test/java/org/apache/oodt/xmlquery/QueryElementTest.java
----------------------------------------------------------------------
diff --git a/xmlquery/src/test/java/org/apache/oodt/xmlquery/QueryElementTest.java b/xmlquery/src/test/java/org/apache/oodt/xmlquery/QueryElementTest.java
index 01f0b0a..65109d4 100755
--- a/xmlquery/src/test/java/org/apache/oodt/xmlquery/QueryElementTest.java
+++ b/xmlquery/src/test/java/org/apache/oodt/xmlquery/QueryElementTest.java
@@ -18,12 +18,9 @@
package org.apache.oodt.xmlquery;
-import java.io.*;
-import java.util.*;
import org.apache.oodt.commons.util.*;
import junit.framework.*;
import org.w3c.dom.*;
-import org.xml.sax.*;
/** Unit test the {@link QueryElement} class.
*
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/xmlquery/src/test/java/org/apache/oodt/xmlquery/ResultTest.java
----------------------------------------------------------------------
diff --git a/xmlquery/src/test/java/org/apache/oodt/xmlquery/ResultTest.java b/xmlquery/src/test/java/org/apache/oodt/xmlquery/ResultTest.java
index 60b8f87..350fb38 100755
--- a/xmlquery/src/test/java/org/apache/oodt/xmlquery/ResultTest.java
+++ b/xmlquery/src/test/java/org/apache/oodt/xmlquery/ResultTest.java
@@ -18,12 +18,10 @@
package org.apache.oodt.xmlquery;
-import java.io.*;
import java.util.*;
import org.apache.oodt.commons.util.*;
import junit.framework.*;
import org.w3c.dom.*;
-import org.xml.sax.*;
/** Unit test the {@link Result} class.
*
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/xmlquery/src/test/java/org/apache/oodt/xmlquery/StringCodecTest.java
----------------------------------------------------------------------
diff --git a/xmlquery/src/test/java/org/apache/oodt/xmlquery/StringCodecTest.java b/xmlquery/src/test/java/org/apache/oodt/xmlquery/StringCodecTest.java
index 2adc0ae..b869c45 100755
--- a/xmlquery/src/test/java/org/apache/oodt/xmlquery/StringCodecTest.java
+++ b/xmlquery/src/test/java/org/apache/oodt/xmlquery/StringCodecTest.java
@@ -18,13 +18,8 @@
package org.apache.oodt.xmlquery;
-import java.io.*;
-import java.util.*;
-import org.apache.oodt.commons.util.*;
import org.apache.oodt.xmlquery.StringCodec; // Imported for javadoc
-import junit.framework.*;
-import org.w3c.dom.*;
-import org.xml.sax.*;
+
/** Unit test the {@link StringCodec} class.
*
http://git-wip-us.apache.org/repos/asf/oodt/blob/d3ee12a2/xmlquery/src/test/java/org/apache/oodt/xmlquery/XMLQueryTest.java
----------------------------------------------------------------------
diff --git a/xmlquery/src/test/java/org/apache/oodt/xmlquery/XMLQueryTest.java b/xmlquery/src/test/java/org/apache/oodt/xmlquery/XMLQueryTest.java
index a5a7dd3..ee90684 100755
--- a/xmlquery/src/test/java/org/apache/oodt/xmlquery/XMLQueryTest.java
+++ b/xmlquery/src/test/java/org/apache/oodt/xmlquery/XMLQueryTest.java
@@ -18,10 +18,8 @@
package org.apache.oodt.xmlquery;
-import java.io.*;
import java.util.*;
import org.apache.oodt.commons.util.*;
-import junit.framework.*;
import org.w3c.dom.*;
import org.xml.sax.*;
[09/16] oodt git commit: OODT-905 swap for for foreach...
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/resource/src/main/java/org/apache/oodt/cas/resource/tools/JobSubmitter.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/tools/JobSubmitter.java b/resource/src/main/java/org/apache/oodt/cas/resource/tools/JobSubmitter.java
index 9df69e1..1c27311 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/tools/JobSubmitter.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/tools/JobSubmitter.java
@@ -66,15 +66,15 @@ public final class JobSubmitter {
File[] jobFiles = jobFileDir.listFiles(JOB_FILE_FILTER);
if (jobFiles != null && jobFiles.length > 0) {
- for (int i = 0; i < jobFiles.length; i++) {
+ for (File jobFile : jobFiles) {
try {
- String id = submitJobFile(jobFiles[i]);
+ String id = submitJobFile(jobFile);
LOG.log(Level.INFO, "Job Submitted: id: [" + id + "]");
} catch (Exception e) {
e.printStackTrace();
LOG.log(Level.WARNING, "Exception submitting job file: ["
- + jobFiles[i] + "]: Message: " + e.getMessage());
+ + jobFile + "]: Message: " + e.getMessage());
}
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java b/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java
index b3467fc..021e146 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java
@@ -73,10 +73,10 @@ public final class XmlRpcStructFactory {
Vector jobVector = new Vector();
if(jobs != null && jobs.size() > 0){
- for(Iterator i = jobs.iterator(); i.hasNext();){
- Job job = (Job)i.next();
- jobVector.add(getXmlRpcJob(job));
- }
+ for (Object job1 : jobs) {
+ Job job = (Job) job1;
+ jobVector.add(getXmlRpcJob(job));
+ }
}
return jobVector;
@@ -86,10 +86,10 @@ public final class XmlRpcStructFactory {
List jobs = new Vector();
if(jobVector != null && jobVector.size() > 0){
- for(Iterator i = jobVector.iterator(); i.hasNext(); ){
- Hashtable jobHash = (Hashtable)i.next();
- jobs.add(getJobFromXmlRpc(jobHash));
- }
+ for (Object aJobVector : jobVector) {
+ Hashtable jobHash = (Hashtable) aJobVector;
+ jobs.add(getJobFromXmlRpc(jobHash));
+ }
}
return jobs;
@@ -99,10 +99,10 @@ public final class XmlRpcStructFactory {
Vector resNodeVector = new Vector();
if (resNodes != null && resNodes.size() > 0) {
- for (Iterator i = resNodes.iterator(); i.hasNext();) {
- ResourceNode node = (ResourceNode) i.next();
- resNodeVector.add(getXmlRpcResourceNode(node));
- }
+ for (Object resNode : resNodes) {
+ ResourceNode node = (ResourceNode) resNode;
+ resNodeVector.add(getXmlRpcResourceNode(node));
+ }
}
return resNodeVector;
@@ -112,10 +112,10 @@ public final class XmlRpcStructFactory {
List resNodes = new Vector();
if (resNodeVector != null && resNodeVector.size() > 0) {
- for (Iterator i = resNodeVector.iterator(); i.hasNext();) {
- Hashtable resNodeHash = (Hashtable) i.next();
- resNodes.add(getResourceNodeFromXmlRpc(resNodeHash));
- }
+ for (Object aResNodeVector : resNodeVector) {
+ Hashtable resNodeHash = (Hashtable) aResNodeVector;
+ resNodes.add(getResourceNodeFromXmlRpc(resNodeHash));
+ }
}
return resNodes;
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/resource/src/test/java/org/apache/oodt/cas/resource/monitor/TestAssignmentMonitor.java
----------------------------------------------------------------------
diff --git a/resource/src/test/java/org/apache/oodt/cas/resource/monitor/TestAssignmentMonitor.java b/resource/src/test/java/org/apache/oodt/cas/resource/monitor/TestAssignmentMonitor.java
index 5368e71..6514cd2 100644
--- a/resource/src/test/java/org/apache/oodt/cas/resource/monitor/TestAssignmentMonitor.java
+++ b/resource/src/test/java/org/apache/oodt/cas/resource/monitor/TestAssignmentMonitor.java
@@ -93,13 +93,13 @@ public class TestAssignmentMonitor extends TestCase {
boolean hasNode1 = false;
- for (Iterator i = resNodes.iterator(); i.hasNext();) {
- ResourceNode node = (ResourceNode) i.next();
+ for (Object resNode : resNodes) {
+ ResourceNode node = (ResourceNode) resNode;
assertNotNull(node);
if (node.getNodeId().equals("localhost")) {
hasNode1 = true;
assertEquals(node.getIpAddr().toExternalForm(),
- "http://localhost:2001");
+ "http://localhost:2001");
}
assertEquals(node.getCapacity(), 8);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/resource/src/test/java/org/apache/oodt/cas/resource/system/TestXmlRpcResourceManager.java
----------------------------------------------------------------------
diff --git a/resource/src/test/java/org/apache/oodt/cas/resource/system/TestXmlRpcResourceManager.java b/resource/src/test/java/org/apache/oodt/cas/resource/system/TestXmlRpcResourceManager.java
index e2c0307..342194e 100644
--- a/resource/src/test/java/org/apache/oodt/cas/resource/system/TestXmlRpcResourceManager.java
+++ b/resource/src/test/java/org/apache/oodt/cas/resource/system/TestXmlRpcResourceManager.java
@@ -107,8 +107,8 @@ public class TestXmlRpcResourceManager extends TestCase {
File[] delFiles = startDirFile.listFiles();
if (delFiles != null && delFiles.length > 0) {
- for (int i = 0; i < delFiles.length; i++) {
- delFiles[i].delete();
+ for (File delFile : delFiles) {
+ delFile.delete();
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 d9f3052..b3a22a1 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
@@ -126,8 +126,7 @@ public class WorkflowViewer extends Panel {
String[] words = orig.split(" ");
StringBuilder summarizedString = new StringBuilder();
- for (int i = 0; i < words.length; i++) {
- String word = words[i];
+ for (String word : words) {
summarizedString.append(word.substring(0, Math.min(wordThreshhold, word
.length())));
summarizedString.append(" ");
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataUtils.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataUtils.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataUtils.java
index aa2eadf..5941922 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataUtils.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataUtils.java
@@ -94,20 +94,19 @@ public final class DataUtils implements DataDeliveryKeys {
ZipOutputStream out = new ZipOutputStream(new FileOutputStream(
datasetZipFilePath));
- for (int i = 0; i < productZipFiles.length; i++) {
- String filename = productZipFiles[i].getName();
- FileInputStream in = new FileInputStream(productZipFiles[i]
+ for (File productZipFile : productZipFiles) {
+ String filename = productZipFile.getName();
+ FileInputStream in = new FileInputStream(productZipFile
.getAbsoluteFile());
addZipEntryFromStream(in, out, filename);
in.close();
-
- if (!productZipFiles[i].delete()) {
+
+ if (!productZipFile.delete()) {
LOG.log(Level.WARNING, "Unable to remove tempoary product zip file: ["
- + productZipFiles[i].getAbsolutePath() + "]");
- }
- else{
+ + productZipFile.getAbsolutePath() + "]");
+ } else {
LOG.log(Level.INFO, "Deleting original product zip file: ["
- + productZipFiles[i].getAbsolutePath() + "]");
+ + productZipFile.getAbsolutePath() + "]");
}
}
@@ -138,15 +137,13 @@ public final class DataUtils implements DataDeliveryKeys {
ZipOutputStream out = new ZipOutputStream(new FileOutputStream(
productZipFilePath));
- for (Iterator i = product.getProductReferences().iterator(); i.hasNext();) {
- Reference r = (Reference) i.next();
-
+ for (Reference r : product.getProductReferences()) {
try {
File prodFile = new File(new URI(r.getDataStoreReference()));
if (prodFile.isDirectory()) {
- LOG.log(Level.WARNING, "Data store reference is a directory. Not adding directory to the zip file: ["
- + r.getDataStoreReference() + "]");
- continue;
+ LOG.log(Level.WARNING, "Data store reference is a directory. Not adding directory to the zip file: ["
+ + r.getDataStoreReference() + "]");
+ continue;
}
String filename = prodFile.getName();
FileInputStream in = new FileInputStream(prodFile.getAbsoluteFile());
@@ -154,7 +151,7 @@ public final class DataUtils implements DataDeliveryKeys {
in.close();
} catch (URISyntaxException e) {
LOG.log(Level.WARNING, "Unable to get filename from uri: ["
- + r.getDataStoreReference() + "]");
+ + r.getDataStoreReference() + "]");
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 5b4eb3b..5d69e85 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
@@ -200,29 +200,23 @@ public class RDFDatasetServlet extends HttpServlet {
Element rdf = XMLUtils.addNode(doc, doc, "rdf:RDF");
RDFUtils.addNamespaces(doc, rdf, this.rdfConf);
- for (Iterator<ProductType> i = productTypes.iterator(); i.hasNext();) {
- ProductType type = i.next();
-
+ for (ProductType type : productTypes) {
Element productTypeRdfDesc = XMLUtils.addNode(doc, rdf, this.rdfConf
- .getTypeNs(type.getName())
- + ":" + type.getName());
+ .getTypeNs(type.getName())
+ + ":" + type.getName());
XMLUtils.addAttribute(doc, productTypeRdfDesc, "rdf:about", base
- + "?typeID=" + type.getProductTypeId());
+ + "?typeID=" + type.getProductTypeId());
// for all of its metadata keys and values, loop through them
// and add RDF nodes underneath the RdfDesc for this product
if (type.getTypeMetadata() != null) {
- for (Iterator<String> j = type.getTypeMetadata().getHashtable().keySet()
- .iterator(); j.hasNext();) {
- String key = (String) j.next();
-
+ for (String key : type.getTypeMetadata().getHashtable().keySet()) {
List<String> vals = type.getTypeMetadata().getAllMetadata(key);
if (vals != null && vals.size() > 0) {
- for (Iterator<String> k = vals.iterator(); k.hasNext();) {
- String val = (String) k.next();
+ for (String val : vals) {
//OODT-665 fix, take keys like
//PRODUCT Experiment Type
//and transform it into ProductExperimentType
@@ -231,7 +225,7 @@ public class RDFDatasetServlet extends HttpServlet {
outputKey = StringUtils.join(WordUtils.capitalizeFully(outputKey).split(
" "));
}
-
+
val = StringEscapeUtils.escapeXml(val);
Element rdfElem = RDFUtils.getRDFElement(outputKey, val,
this.rdfConf, doc);
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 d2fb2ac..1b3a53c 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
@@ -205,9 +205,7 @@ public class RDFProductServlet extends HttpServlet {
Element rdf = XMLUtils.addNode(doc, doc, "rdf:RDF");
RDFUtils.addNamespaces(doc, rdf, this.rdfConf);
- for (Iterator<Product> i = products.iterator(); i.hasNext();) {
- Product p = i.next();
-
+ for (Product p : products) {
String productTypeIdStr = p.getProductType().getProductTypeId();
ProductType productType = null;
@@ -220,8 +218,8 @@ public class RDFProductServlet extends HttpServlet {
e.printStackTrace();
LOG.log(Level.SEVERE,
"Unable to obtain product type from product type id: ["
- + ((Product) products.get(0)).getProductType()
- .getProductTypeId() + "]: Message: " + e.getMessage());
+ + ((Product) products.get(0)).getProductType()
+ .getProductTypeId() + "]: Message: " + e.getMessage());
return;
}
}
@@ -229,10 +227,10 @@ public class RDFProductServlet extends HttpServlet {
p.setProductType(productType);
Element productRdfDesc = XMLUtils.addNode(doc, rdf, this.rdfConf
- .getTypeNs(productType.getName())
- + ":" + productType.getName());
+ .getTypeNs(productType.getName())
+ + ":" + productType.getName());
XMLUtils.addAttribute(doc, productRdfDesc, "rdf:about", base
- + "?productID=" + p.getProductId());
+ + "?productID=" + p.getProductId());
// now add all its metadata
Metadata prodMetadata = safeGetMetadata(p);
@@ -241,22 +239,18 @@ public class RDFProductServlet extends HttpServlet {
// and add RDF nodes underneath the RdfDesc for this product
if (prodMetadata != null) {
- for (Iterator<String> j = prodMetadata.getHashtable().keySet()
- .iterator(); j.hasNext();) {
- String key = (String) j.next();
-
+ for (String key : prodMetadata.getHashtable().keySet()) {
List<String> vals = prodMetadata.getAllMetadata(key);
if (vals != null && vals.size() > 0) {
- for (Iterator<String> k = vals.iterator(); k.hasNext();) {
- String val = (String) k.next();
+ for (String val : vals) {
String outputKey = key;
if (outputKey.contains(" ")) {
outputKey = StringUtils.join(WordUtils.capitalizeFully(outputKey).split(
" "));
- }
-
+ }
+
val = StringEscapeUtils.escapeXml(val);
Element rdfElem = RDFUtils.getRDFElement(outputKey, val,
this.rdfConf, doc);
@@ -292,9 +286,7 @@ public class RDFProductServlet extends HttpServlet {
if (types != null && types.size() > 0) {
products = new Vector<Product>();
- for (Iterator<ProductType> i = types.iterator(); i.hasNext();) {
- ProductType type = i.next();
-
+ for (ProductType type : types) {
ProductPage page = null;
try {
@@ -306,8 +298,9 @@ public class RDFProductServlet extends HttpServlet {
products.addAll(page.getPageProducts());
if (!page.isLastPage()) {
page = fClient.getNextPage(type, page);
- } else
+ } else {
break;
+ }
}
}
} catch (Exception ignore) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFUtils.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFUtils.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFUtils.java
index 0804592..6598724 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFUtils.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFUtils.java
@@ -68,9 +68,7 @@ public final class RDFUtils {
}
public static void addNamespaces(Document doc, Element rdf, RDFConfig rdfConf) {
- for (Iterator<String> i = rdfConf.getNsMap().keySet().iterator(); i
- .hasNext();) {
- String nsName = i.next();
+ for (String nsName : rdfConf.getNsMap().keySet()) {
String nsUrl = rdfConf.getNsMap().get(nsName);
XMLUtils.addAttribute(doc, rdf, "xmlns:" + nsName, nsUrl);
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 34b5f11..065d619 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
@@ -223,8 +223,8 @@ public class RSSProductServlet extends HttpServlet {
XMLUtils.addNode(doc, channel, "generator", "CAS File Manager");
XMLUtils.addNode(doc, channel, "lastBuildDate", buildPubDate);
- for (Iterator i = products.iterator(); i.hasNext();) {
- Product p = (Product) i.next();
+ for (Object product : products) {
+ Product p = (Product) product;
String productTypeIdStr = p.getProductType().getProductTypeId();
ProductType productType = null;
@@ -235,8 +235,8 @@ public class RSSProductServlet extends HttpServlet {
e.printStackTrace();
LOG.log(Level.SEVERE,
"Unable to obtain product type from product type id: ["
- + ((Product) products.get(0)).getProductType()
- .getProductTypeId() + "]: Message: " + e.getMessage());
+ + ((Product) products.get(0)).getProductType()
+ .getProductTypeId() + "]: Message: " + e.getMessage());
return;
}
@@ -247,9 +247,9 @@ public class RSSProductServlet extends HttpServlet {
XMLUtils.addNode(doc, item, "title", p.getProductName());
XMLUtils.addNode(doc, item, "description", p.getProductType()
- .getName());
+ .getName());
XMLUtils.addNode(doc, item, "link", base + "/data?productID="
- + p.getProductId());
+ + p.getProductId());
Metadata m = this.safeGetMetadata(p);
String productReceivedTime = m.getMetadata("CAS.ProductReceivedTime");
@@ -269,7 +269,7 @@ public class RSSProductServlet extends HttpServlet {
if (p.getProductReferences() != null
&& p.getProductReferences().size() == 1) {
m.addMetadata("FileSize", String.valueOf(p.getProductReferences()
- .get(0).getFileSize()));
+ .get(0).getFileSize()));
}
// add additional elements from the RSSConfig
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java
index 65150dd..a516226 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java
@@ -207,58 +207,58 @@ public class RSSProductTransferServlet extends HttpServlet {
XMLUtils.addNode(doc, channel, "generator", "CAS File Manager");
XMLUtils.addNode(doc, channel, "lastBuildDate", buildPubDate);
- for (Iterator i = currentTransfers.iterator(); i.hasNext();) {
- FileTransferStatus status = (FileTransferStatus) i.next();
-
- Element item = XMLUtils.addNode(doc, channel, "item");
-
- XMLUtils.addNode(doc, item, "title", status
- .getParentProduct().getProductName());
- XMLUtils.addNode(doc, item, "description", status
- .getParentProduct().getProductType().getName());
- XMLUtils.addNode(doc, item, "link", base
- + "/viewTransfer?ref="
- + status.getFileRef().getOrigReference() + "&size="
- + status.getFileRef().getFileSize());
-
- Metadata m = null;
-
- try {
- m = fClient.getMetadata(status.getParentProduct());
-
- String productReceivedTime = m
- .getMetadata("CAS.ProductReceivedTime");
- Date receivedTime = null;
-
- try {
- receivedTime = DateConvert
- .isoParse(productReceivedTime);
- } catch (ParseException ignore) {
- }
-
- if (receivedTime != null) {
- XMLUtils.addNode(doc, item, "pubDate",
- dateFormatter.format(receivedTime));
- }
-
- // set product transfer metadata
- m.addMetadata("BytesTransferred",
- "" + status.getBytesTransferred());
- m.addMetadata("TotalBytes",
- "" + status.getFileRef().getFileSize());
- m.addMetadata("PercentComplete",
- "" + status.computePctTransferred());
-
- } catch (CatalogException ignore) {
- }
-
- // add additional elements from the RSSConfig
- for (RSSTag tag : rssconf.getTags()) {
- item.appendChild(RSSUtils.emitRSSTag(tag, m, doc, item));
- }
+ for (Object currentTransfer : currentTransfers) {
+ FileTransferStatus status = (FileTransferStatus) currentTransfer;
+
+ Element item = XMLUtils.addNode(doc, channel, "item");
+
+ XMLUtils.addNode(doc, item, "title", status
+ .getParentProduct().getProductName());
+ XMLUtils.addNode(doc, item, "description", status
+ .getParentProduct().getProductType().getName());
+ XMLUtils.addNode(doc, item, "link", base
+ + "/viewTransfer?ref="
+ + status.getFileRef().getOrigReference() + "&size="
+ + status.getFileRef().getFileSize());
+
+ Metadata m = null;
+
+ try {
+ m = fClient.getMetadata(status.getParentProduct());
+
+ String productReceivedTime = m
+ .getMetadata("CAS.ProductReceivedTime");
+ Date receivedTime = null;
+
+ try {
+ receivedTime = DateConvert
+ .isoParse(productReceivedTime);
+ } catch (ParseException ignore) {
+ }
+
+ if (receivedTime != null) {
+ XMLUtils.addNode(doc, item, "pubDate",
+ dateFormatter.format(receivedTime));
+ }
+
+ // set product transfer metadata
+ m.addMetadata("BytesTransferred",
+ "" + status.getBytesTransferred());
+ m.addMetadata("TotalBytes",
+ "" + status.getFileRef().getFileSize());
+ m.addMetadata("PercentComplete",
+ "" + status.computePctTransferred());
+
+ } catch (CatalogException ignore) {
+ }
+ // add additional elements from the RSSConfig
+ for (RSSTag tag : rssconf.getTags()) {
+ item.appendChild(RSSUtils.emitRSSTag(tag, m, doc, item));
}
+ }
+
DOMSource source = new DOMSource(doc);
TransformerFactory transFactory = TransformerFactory
.newInstance();
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetTaskByIdCliAction.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetTaskByIdCliAction.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetTaskByIdCliAction.java
index 8831ecc..aee4f90 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetTaskByIdCliAction.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetTaskByIdCliAction.java
@@ -39,10 +39,12 @@ public class GetTaskByIdCliAction extends WorkflowCliAction {
WorkflowTask task = getClient().getTaskById(taskId);
String requiredMetFields = "";
- for (Iterator i = task.getRequiredMetFields().iterator(); i.hasNext();) {
- if (requiredMetFields.length()>0) requiredMetFields += ", ";
- requiredMetFields += (String) i.next();
- }
+ for (Object o : task.getRequiredMetFields()) {
+ if (requiredMetFields.length() > 0) {
+ requiredMetFields += ", ";
+ }
+ requiredMetFields += (String) o;
+ }
printer.println("Task: [id=" + task.getTaskId()
+ ", name=" + task.getTaskName()
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/AbstractPaginatibleInstanceRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/AbstractPaginatibleInstanceRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/AbstractPaginatibleInstanceRepository.java
index 0bd1eef..edc69ed 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/AbstractPaginatibleInstanceRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/AbstractPaginatibleInstanceRepository.java
@@ -177,8 +177,8 @@ public abstract class AbstractPaginatibleInstanceRepository implements
if (wInstIds != null && wInstIds.size() > 0) {
List workflowInstances = new Vector(wInstIds.size());
- for (Iterator i = wInstIds.iterator(); i.hasNext();) {
- String workflowInstId = (String) i.next();
+ for (Object wInstId : wInstIds) {
+ String workflowInstId = (String) wInstId;
WorkflowInstance inst = getWorkflowInstanceById(workflowInstId);
workflowInstances.add(inst);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java
index 94b3081..2d5f377 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java
@@ -563,22 +563,20 @@ public class LuceneWorkflowInstanceRepository extends
private void addInstanceMetadataToDoc(Document doc, Metadata met) {
if (met != null && met.getHashtable().keySet().size() > 0) {
- for (Iterator i = met.getHashtable().keySet().iterator(); i
- .hasNext();) {
- String metKey = (String) i.next();
+ for (String metKey : met.getHashtable().keySet()) {
List metVals = met.getAllMetadata(metKey);
if (metVals != null && metVals.size() > 0) {
- for (Iterator j = metVals.iterator(); j.hasNext();) {
- String metVal = (String) j.next();
+ for (Object metVal1 : metVals) {
+ String metVal = (String) metVal1;
doc.add(new Field(metKey, metVal, Field.Store.YES,
- Field.Index.UN_TOKENIZED));
+ Field.Index.UN_TOKENIZED));
}
// now index the field name so that we can use it to
// look it up when converting from doc to
// WorkflowInstance
doc.add(new Field("workflow_inst_met_flds", metKey,
- Field.Store.YES, Field.Index.NO));
+ Field.Store.YES, Field.Index.NO));
}
}
@@ -587,18 +585,18 @@ public class LuceneWorkflowInstanceRepository extends
private void addTasksToDoc(Document doc, List tasks) {
if (tasks != null && tasks.size() > 0) {
- for (Iterator i = tasks.iterator(); i.hasNext();) {
- WorkflowTask task = (WorkflowTask) i.next();
+ for (Object task1 : tasks) {
+ WorkflowTask task = (WorkflowTask) task1;
doc.add(new Field("task_id", task.getTaskId(), Field.Store.YES,
- Field.Index.UN_TOKENIZED));
+ Field.Index.UN_TOKENIZED));
doc.add(new Field("task_name", task.getTaskName(),
- Field.Store.YES, Field.Index.NO));
+ Field.Store.YES, Field.Index.NO));
doc.add(new Field("task_order",
- String.valueOf(task.getOrder()), Field.Store.YES,
- Field.Index.NO));
+ String.valueOf(task.getOrder()), Field.Store.YES,
+ Field.Index.NO));
doc.add(new Field("task_class",
- task.getTaskInstanceClassName(), Field.Store.YES,
- Field.Index.NO));
+ task.getTaskInstanceClassName(), Field.Store.YES,
+ Field.Index.NO));
addConditionsToDoc(task.getTaskId(), task.getConditions(), doc);
addTaskConfigToDoc(task.getTaskId(), task.getTaskConfig(), doc);
@@ -609,15 +607,14 @@ public class LuceneWorkflowInstanceRepository extends
private void addTaskConfigToDoc(String taskId,
WorkflowTaskConfiguration config, Document doc) {
if (config != null) {
- for (Iterator i = config.getProperties().keySet().iterator(); i
- .hasNext();) {
- String propName = (String) i.next();
+ for (Object o : config.getProperties().keySet()) {
+ String propName = (String) o;
String propValue = config.getProperty(propName);
doc.add(new Field(taskId + "_config_property_name", propName,
- Field.Store.YES, Field.Index.NO));
+ Field.Store.YES, Field.Index.NO));
doc.add(new Field(taskId + "_config_property_value", propValue,
- Field.Store.YES, Field.Index.NO));
+ Field.Store.YES, Field.Index.NO));
}
}
}
@@ -625,21 +622,21 @@ public class LuceneWorkflowInstanceRepository extends
private void addConditionsToDoc(String taskId, List conditionList,
Document doc) {
if (conditionList != null && conditionList.size() > 0) {
- for (Iterator i = conditionList.iterator(); i.hasNext();) {
- WorkflowCondition cond = (WorkflowCondition) i.next();
- doc.add(new Field(taskId + "_condition_name", cond.getConditionName(),
- Field.Store.YES, Field.Index.NO));
- doc.add(new Field(taskId + "_condition_id", cond.getConditionId(),
- Field.Store.YES, Field.Index.UN_TOKENIZED));
- doc.add(new Field(taskId + "_condition_class", cond
- .getConditionInstanceClassName(), Field.Store.YES, Field.Index.NO));
- doc.add(new Field(taskId + "_condition_order", String.valueOf(cond
- .getOrder()), Field.Store.YES, Field.Index.NO));
- doc.add(new Field(taskId + "_condition_timeout", String.valueOf(cond
- .getTimeoutSeconds()), Field.Store.YES, Field.Index.NO));
- doc.add(new Field(taskId+"_condition_optional", String.valueOf(cond.isOptional()),
- Field.Store.YES, Field.Index.NO));
- }
+ for (Object aConditionList : conditionList) {
+ WorkflowCondition cond = (WorkflowCondition) aConditionList;
+ doc.add(new Field(taskId + "_condition_name", cond.getConditionName(),
+ Field.Store.YES, Field.Index.NO));
+ doc.add(new Field(taskId + "_condition_id", cond.getConditionId(),
+ Field.Store.YES, Field.Index.UN_TOKENIZED));
+ doc.add(new Field(taskId + "_condition_class", cond
+ .getConditionInstanceClassName(), Field.Store.YES, Field.Index.NO));
+ doc.add(new Field(taskId + "_condition_order", String.valueOf(cond
+ .getOrder()), Field.Store.YES, Field.Index.NO));
+ doc.add(new Field(taskId + "_condition_timeout", String.valueOf(cond
+ .getTimeoutSeconds()), Field.Store.YES, Field.Index.NO));
+ doc.add(new Field(taskId + "_condition_optional", String.valueOf(cond.isOptional()),
+ Field.Store.YES, Field.Index.NO));
+ }
}
}
@@ -683,12 +680,11 @@ public class LuceneWorkflowInstanceRepository extends
Metadata sharedContext = new Metadata();
String[] instMetFields = doc.getValues("workflow_inst_met_flds");
if (instMetFields != null && instMetFields.length > 0) {
- for (int i = 0; i < instMetFields.length; i++) {
- String fldName = instMetFields[i];
+ for (String fldName : instMetFields) {
String[] vals = doc.getValues(fldName);
if (vals != null && vals.length > 0) {
- for (int j = 0; j < vals.length; j++) {
- sharedContext.addMetadata(fldName, vals[j]);
+ for (String val : vals) {
+ sharedContext.addMetadata(fldName, val);
}
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/MemoryWorkflowInstanceRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/MemoryWorkflowInstanceRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/MemoryWorkflowInstanceRepository.java
index b5d7afc..4e6c462 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/MemoryWorkflowInstanceRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/MemoryWorkflowInstanceRepository.java
@@ -137,10 +137,10 @@ public class MemoryWorkflowInstanceRepository extends
throws InstanceRepositoryException {
List instances = new Vector();
- for (Iterator i = workflowInstMap.keySet().iterator(); i.hasNext();) {
- String workflowInstId = (String) i.next();
+ for (Object o : workflowInstMap.keySet()) {
+ String workflowInstId = (String) o;
WorkflowInstance inst = (WorkflowInstance) workflowInstMap
- .get(workflowInstId);
+ .get(workflowInstId);
if (inst.getStatus().equals(status)) {
instances.add(inst);
}
@@ -208,11 +208,10 @@ public class MemoryWorkflowInstanceRepository extends
if (this.workflowInstMap != null
&& this.workflowInstMap.keySet() != null
&& this.workflowInstMap.keySet().size() > 0) {
- for (Iterator i = this.workflowInstMap.keySet().iterator(); i
- .hasNext();) {
- String wInstId = (String) i.next();
+ for (Object o : this.workflowInstMap.keySet()) {
+ String wInstId = (String) o;
WorkflowInstance inst = (WorkflowInstance) this.workflowInstMap
- .get(wInstId);
+ .get(wInstId);
if (inst.getStatus().equals(status)) {
cnt++;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetMap.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetMap.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetMap.java
index 5bce6d3..3705080 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetMap.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetMap.java
@@ -51,8 +51,8 @@ public final class WorkflowInstanceMetMap implements WorkflowInstanceMetMapKeys{
public void addWorkflowToMap(String id, List fields) {
if (fields != null && fields.size() > 0) {
- for (Iterator i = fields.iterator(); i.hasNext();) {
- String fld = (String) i.next();
+ for (Object field : fields) {
+ String fld = (String) field;
addFieldToWorkflow(id, fld);
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycle.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycle.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycle.java
index 2443b25..602b958 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycle.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycle.java
@@ -169,10 +169,10 @@ public class WorkflowLifecycle {
@Deprecated
public WorkflowLifecycleStage getStageForWorkflow(String status) {
if (this.stages != null && this.stages.size() > 0) {
- for (Iterator i = this.stages.iterator(); i.hasNext();) {
- WorkflowLifecycleStage stage = (WorkflowLifecycleStage) i.next();
- for(WorkflowState state: stage.getStates()){
- if(state.getName().equals(status)){
+ for (Object stage1 : this.stages) {
+ WorkflowLifecycleStage stage = (WorkflowLifecycleStage) stage1;
+ for (WorkflowState state : stage.getStates()) {
+ if (state.getName().equals(status)) {
return stage;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 05b7780..8c6e4ae 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
@@ -155,11 +155,11 @@ public class WorkflowLifecycleManager {
WorkflowLifecycle defaultLifecycle = null;
if (this.lifecycles != null && this.lifecycles.size() > 0) {
- for (Iterator i = this.lifecycles.iterator(); i.hasNext();) {
- WorkflowLifecycle lifecycle = (WorkflowLifecycle) i.next();
+ for (Object lifecycle1 : this.lifecycles) {
+ WorkflowLifecycle lifecycle = (WorkflowLifecycle) lifecycle1;
if (lifecycle.getName().equals(
- WorkflowLifecycle.DEFAULT_LIFECYCLE)) {
+ WorkflowLifecycle.DEFAULT_LIFECYCLE)) {
defaultLifecycle = lifecycle;
}
}
@@ -183,14 +183,14 @@ public class WorkflowLifecycleManager {
WorkflowLifecycle defaultLifecycle = null;
if (this.lifecycles != null && this.lifecycles.size() > 0) {
- for (Iterator i = this.lifecycles.iterator(); i.hasNext();) {
- WorkflowLifecycle lifecycle = (WorkflowLifecycle) i.next();
+ for (Object lifecycle1 : this.lifecycles) {
+ WorkflowLifecycle lifecycle = (WorkflowLifecycle) lifecycle1;
if (lifecycle.getWorkflowId().equals(workflow.getId())) {
return lifecycle;
}
if (lifecycle.getName().equals(
- WorkflowLifecycle.DEFAULT_LIFECYCLE)) {
+ WorkflowLifecycle.DEFAULT_LIFECYCLE)) {
defaultLifecycle = lifecycle;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
index 7477b91..71d9a94 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
@@ -152,14 +152,14 @@ public class XMLWorkflowRepository implements WorkflowRepository {
*/
public Workflow getWorkflowByName(String workflowName)
throws RepositoryException {
- for (Iterator i = workflowMap.keySet().iterator(); i.hasNext();) {
- String workflowId = (String) i.next();
- Workflow w = (Workflow) workflowMap.get(workflowId);
+ for (Object o : workflowMap.keySet()) {
+ String workflowId = (String) o;
+ Workflow w = (Workflow) workflowMap.get(workflowId);
- if (w.getName().equals(workflowName)) {
- return w;
- }
+ if (w.getName().equals(workflowName)) {
+ return w;
}
+ }
return null;
}
@@ -222,12 +222,12 @@ public class XMLWorkflowRepository implements WorkflowRepository {
*/
public List getConditionsByTaskName(String taskName)
throws RepositoryException {
- for (Iterator i = taskMap.values().iterator(); i.hasNext();) {
- WorkflowTask t = (WorkflowTask) i.next();
- if (t.getTaskName().equals(taskName)) {
- return t.getConditions();
- }
+ for (Object o : taskMap.values()) {
+ WorkflowTask t = (WorkflowTask) o;
+ if (t.getTaskName().equals(taskName)) {
+ return t.getConditions();
}
+ }
return null;
}
@@ -357,11 +357,11 @@ public class XMLWorkflowRepository implements WorkflowRepository {
uris = new Vector(args.length);
- for (int i = 0; i < args.length; i++) {
- if (args[i] != null) {
- uris.add(args[i]);
- }
+ for (String arg : args) {
+ if (arg != null) {
+ uris.add(arg);
}
+ }
XMLWorkflowRepository repo = new XMLWorkflowRepository(uris);
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 2d4c9db..f0c46bd 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
@@ -148,9 +148,9 @@ public class XmlRpcWorkflowManager {
events = repo.getRegisteredEvents();
if (events != null) {
- for (Iterator i = events.iterator(); i.hasNext();) {
- eventsVector.add(i.next());
- }
+ for (Object event : events) {
+ eventsVector.add(event);
+ }
}
@@ -260,12 +260,12 @@ public class XmlRpcWorkflowManager {
workflows = repo.getWorkflowsForEvent(eventName);
if (workflows != null) {
- for (Iterator i = workflows.iterator(); i.hasNext();) {
- Workflow w = (Workflow) i.next();
- Hashtable workflow = XmlRpcStructFactory
- .getXmlRpcWorkflow(w);
- workflowList.add(workflow);
- }
+ for (Object workflow1 : workflows) {
+ Workflow w = (Workflow) workflow1;
+ Hashtable workflow = XmlRpcStructFactory
+ .getXmlRpcWorkflow(w);
+ workflowList.add(workflow);
+ }
}
return workflowList;
@@ -294,24 +294,24 @@ public class XmlRpcWorkflowManager {
}
if (workflows != null) {
- for (Iterator i = workflows.iterator(); i.hasNext();) {
- Workflow w = (Workflow) i.next();
- LOG.log(Level.INFO, "WorkflowManager: Workflow " + w.getName()
- + " retrieved for event " + eventName);
-
- Metadata m = new Metadata();
- m.addMetadata(metadata);
-
- try {
- engine.startWorkflow(w, m);
- } catch (Exception e) {
- e.printStackTrace();
- throw new EngineException(
- "Engine exception when starting workflow: "
- + w.getName() + ": Message: "
- + e.getMessage());
- }
+ for (Object workflow : workflows) {
+ Workflow w = (Workflow) workflow;
+ LOG.log(Level.INFO, "WorkflowManager: Workflow " + w.getName()
+ + " retrieved for event " + eventName);
+
+ Metadata m = new Metadata();
+ m.addMetadata(metadata);
+
+ try {
+ engine.startWorkflow(w, m);
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new EngineException(
+ "Engine exception when starting workflow: "
+ + w.getName() + ": Message: "
+ + e.getMessage());
}
+ }
return true;
} else
return false;
@@ -390,25 +390,25 @@ public class XmlRpcWorkflowManager {
+ workflowInsts.size() + " instances");
try {
- for (Iterator i = workflowInsts.iterator(); i.hasNext();) {
- WorkflowInstance wInst = (WorkflowInstance) i.next();
- // pick up the description of the workflow
- Workflow wDesc = repo.getWorkflowById(wInst.getWorkflow()
- .getId());
- // TODO: hack for now, fix this, we shouldn't have to cast
- // here, bad
- // design
- if(wDesc == null){
- //Possible dynamic workflow for instance
- //reconsitute it from cache
- wDesc = wInst.getWorkflow();
- repo.addWorkflow(wDesc);
- }
- wInst.setWorkflow(wDesc);
- Hashtable workflowInstance = XmlRpcStructFactory
- .getXmlRpcWorkflowInstance(wInst);
- workflowInstances.add(workflowInstance);
+ for (Object workflowInst : workflowInsts) {
+ WorkflowInstance wInst = (WorkflowInstance) workflowInst;
+ // pick up the description of the workflow
+ Workflow wDesc = repo.getWorkflowById(wInst.getWorkflow()
+ .getId());
+ // TODO: hack for now, fix this, we shouldn't have to cast
+ // here, bad
+ // design
+ if (wDesc == null) {
+ //Possible dynamic workflow for instance
+ //reconsitute it from cache
+ wDesc = wInst.getWorkflow();
+ repo.addWorkflow(wDesc);
}
+ wInst.setWorkflow(wDesc);
+ Hashtable workflowInstance = XmlRpcStructFactory
+ .getXmlRpcWorkflowInstance(wInst);
+ workflowInstances.add(workflowInstance);
+ }
} catch (Exception e) {
e.printStackTrace();
throw new EngineException(
@@ -441,27 +441,27 @@ public class XmlRpcWorkflowManager {
+ workflowInsts.size() + " instances");
try {
- for (Iterator i = workflowInsts.iterator(); i.hasNext();) {
- WorkflowInstance wInst = (WorkflowInstance) i.next();
- // pick up the description of the workflow
- Workflow wDesc = repo.getWorkflowById(wInst.getWorkflow()
- .getId());
- if(wDesc == null){
- //possible dynamic workflow
- //reconsitute it from cached instance
- wDesc = wInst.getWorkflow();
- //now save it
- repo.addWorkflow(wDesc);
-
- }
- // TODO: hack for now, fix this, we shouldn't have to cast
- // here, bad
- // design
- wInst.setWorkflow(wDesc);
- Hashtable workflowInstance = XmlRpcStructFactory
- .getXmlRpcWorkflowInstance(wInst);
- workflowInstances.add(workflowInstance);
+ for (Object workflowInst : workflowInsts) {
+ WorkflowInstance wInst = (WorkflowInstance) workflowInst;
+ // pick up the description of the workflow
+ Workflow wDesc = repo.getWorkflowById(wInst.getWorkflow()
+ .getId());
+ if (wDesc == null) {
+ //possible dynamic workflow
+ //reconsitute it from cached instance
+ wDesc = wInst.getWorkflow();
+ //now save it
+ repo.addWorkflow(wDesc);
+
}
+ // TODO: hack for now, fix this, we shouldn't have to cast
+ // here, bad
+ // design
+ wInst.setWorkflow(wDesc);
+ Hashtable workflowInstance = XmlRpcStructFactory
+ .getXmlRpcWorkflowInstance(wInst);
+ workflowInstances.add(workflowInstance);
+ }
return workflowInstances;
} catch (Exception e) {
e.printStackTrace();
@@ -482,12 +482,12 @@ public class XmlRpcWorkflowManager {
+ workflowList.size() + " workflows");
try {
- for (Iterator i = workflowList.iterator(); i.hasNext();) {
- Workflow w = (Workflow) i.next();
- Hashtable workflow = XmlRpcStructFactory
- .getXmlRpcWorkflow(w);
- workflows.add(workflow);
- }
+ for (Object aWorkflowList : workflowList) {
+ Workflow w = (Workflow) aWorkflowList;
+ Hashtable workflow = XmlRpcStructFactory
+ .getXmlRpcWorkflow(w);
+ workflows.add(workflow);
+ }
return workflows;
} catch (Exception e) {
@@ -676,30 +676,30 @@ public class XmlRpcWorkflowManager {
private void populateWorkflows(List wInsts) {
if (wInsts != null && wInsts.size() > 0) {
- for (Iterator i = wInsts.iterator(); i.hasNext();) {
- WorkflowInstance wInst = (WorkflowInstance) i.next();
- if(wInst.getWorkflow() == null ||
- (wInst.getWorkflow() != null &&
- (wInst.getWorkflow().getName() == null ||
- wInst.getWorkflow().getId() == null))){
- wInst.setWorkflow(safeGetWorkflowById(wInst.getWorkflow()
- .getId()));
+ for (Object wInst1 : wInsts) {
+ WorkflowInstance wInst = (WorkflowInstance) wInst1;
+ if (wInst.getWorkflow() == null ||
+ (wInst.getWorkflow() != null &&
+ (wInst.getWorkflow().getName() == null ||
+ wInst.getWorkflow().getId() == null))) {
+ wInst.setWorkflow(safeGetWorkflowById(wInst.getWorkflow()
+ .getId()));
+ } else {
+ // check to see if the workflow exists in the
+ // repo
+ try {
+ if (repo.getWorkflowById(wInst.getWorkflow().getId()) == null) {
+ repo.addWorkflow(wInst.getWorkflow());
}
- else{
- // check to see if the workflow exists in the
- // repo
- try {
- if(repo.getWorkflowById(wInst.getWorkflow().getId()) == null){
- repo.addWorkflow(wInst.getWorkflow());
- }
- } catch (RepositoryException e) {
- LOG.log(Level.WARNING, "Attempting to look up workflow: ["+wInst.getWorkflow()
- .getId()+"] in populate workflows. Message: "+e.getMessage());
- e.printStackTrace();
- }
+ } catch (RepositoryException e) {
+ LOG.log(Level.WARNING, "Attempting to look up workflow: [" + wInst.getWorkflow()
+ .getId()
+ + "] in populate workflows. Message: " + e.getMessage());
+ e.printStackTrace();
+ }
- }
}
+ }
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 fa21018..a7b1e40 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
@@ -251,12 +251,12 @@ public class XmlRpcWorkflowManagerClient {
"workflowmgr.getWorkflowsByEvent", argList);
if (workflowVector != null) {
- for (Iterator i = workflowVector.iterator(); i.hasNext();) {
- Hashtable workflowHash = (Hashtable) i.next();
- Workflow w = XmlRpcStructFactory
- .getWorkflowFromXmlRpc(workflowHash);
- workflows.add(w);
- }
+ for (Object aWorkflowVector : workflowVector) {
+ Hashtable workflowHash = (Hashtable) aWorkflowVector;
+ Workflow w = XmlRpcStructFactory
+ .getWorkflowFromXmlRpc(workflowHash);
+ workflows.add(w);
+ }
}
return workflows;
@@ -560,12 +560,12 @@ public class XmlRpcWorkflowManagerClient {
if (works != null) {
workflows = new Vector(works.size());
- for (Iterator i = works.iterator(); i.hasNext();) {
- Hashtable workflw = (Hashtable) i.next();
- Workflow w = XmlRpcStructFactory
- .getWorkflowFromXmlRpc(workflw);
- workflows.add(w);
- }
+ for (Object work : works) {
+ Hashtable workflw = (Hashtable) work;
+ Workflow w = XmlRpcStructFactory
+ .getWorkflowFromXmlRpc(workflw);
+ workflows.add(w);
+ }
return workflows;
} else
@@ -628,12 +628,12 @@ public class XmlRpcWorkflowManagerClient {
"workflowmgr.getWorkflowInstancesByStatus", argList);
if (insts != null) {
instsUnpacked = new Vector(insts.size());
- for (Iterator i = insts.iterator(); i.hasNext();) {
- Hashtable hWinst = (Hashtable) i.next();
- WorkflowInstance inst = XmlRpcStructFactory
- .getWorkflowInstanceFromXmlRpc(hWinst);
- instsUnpacked.add(inst);
- }
+ for (Object inst1 : insts) {
+ Hashtable hWinst = (Hashtable) inst1;
+ WorkflowInstance inst = XmlRpcStructFactory
+ .getWorkflowInstanceFromXmlRpc(hWinst);
+ instsUnpacked.add(inst);
+ }
return instsUnpacked;
} else
return null;
@@ -657,12 +657,12 @@ public class XmlRpcWorkflowManagerClient {
argList);
if (insts != null) {
instsUnpacked = new Vector(insts.size());
- for (Iterator i = insts.iterator(); i.hasNext();) {
- Hashtable hWinst = (Hashtable) i.next();
- WorkflowInstance inst = XmlRpcStructFactory
- .getWorkflowInstanceFromXmlRpc(hWinst);
- instsUnpacked.add(inst);
- }
+ for (Object inst1 : insts) {
+ Hashtable hWinst = (Hashtable) inst1;
+ WorkflowInstance inst = XmlRpcStructFactory
+ .getWorkflowInstanceFromXmlRpc(hWinst);
+ instsUnpacked.add(inst);
+ }
return instsUnpacked;
} else
return null;
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java
index e3a3824..bcc61f7 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java
@@ -372,11 +372,11 @@ public final class GenericWorkflowObjectFactory {
public static List copyWorkflows(List workflows){
if(workflows != null){
List newWorkflows = new Vector(workflows.size());
- for(Iterator i = workflows.iterator(); i.hasNext(); ){
- Workflow w = (Workflow)i.next();
- Workflow newWorkflow = copyWorkflow(w);
- newWorkflows.add(newWorkflow);
- }
+ for (Object workflow : workflows) {
+ Workflow w = (Workflow) workflow;
+ Workflow newWorkflow = copyWorkflow(w);
+ newWorkflows.add(newWorkflow);
+ }
return newWorkflows;
}
@@ -420,11 +420,11 @@ public final class GenericWorkflowObjectFactory {
List newTaskList = new Vector(taskList.size());
- for(Iterator i = taskList.iterator(); i.hasNext(); ){
- WorkflowTask t = (WorkflowTask)i.next();
- WorkflowTask newTask = copyTask(t);
- newTaskList.add(newTask);
- }
+ for (Object aTaskList : taskList) {
+ WorkflowTask t = (WorkflowTask) aTaskList;
+ WorkflowTask newTask = copyTask(t);
+ newTaskList.add(newTask);
+ }
return newTaskList;
}
@@ -454,11 +454,11 @@ public final class GenericWorkflowObjectFactory {
if(conditionList != null){
List newConditionList = new Vector(conditionList.size());
- for(Iterator i = conditionList.iterator(); i.hasNext(); ){
- WorkflowCondition c = (WorkflowCondition)i.next();
- WorkflowCondition newCondition = copyCondition(c);
- newConditionList.add(newCondition);
- }
+ for (Object aConditionList : conditionList) {
+ WorkflowCondition c = (WorkflowCondition) aConditionList;
+ WorkflowCondition newCondition = copyCondition(c);
+ newConditionList.add(newCondition);
+ }
return newConditionList;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/workflow/src/main/java/org/apache/oodt/cas/workflow/util/ScriptFile.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/ScriptFile.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/ScriptFile.java
index e964ad0..1361f20 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/ScriptFile.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/ScriptFile.java
@@ -97,8 +97,8 @@ public class ScriptFile {
rStr += "#!" + commandShell + "\n";
- for (Iterator i = commands.iterator(); i.hasNext();) {
- String cmd = (String) i.next();
+ for (Object command : commands) {
+ String cmd = (String) command;
rStr += cmd + "\n";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 31f2128..cf0d706 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
@@ -180,8 +180,8 @@ public final class XmlRpcStructFactory {
List wInsts = new Vector();
if (instsVector != null && instsVector.size() > 0) {
- for (Iterator i = instsVector.iterator(); i.hasNext();) {
- Hashtable wInstHash = (Hashtable) i.next();
+ for (Object anInstsVector : instsVector) {
+ Hashtable wInstHash = (Hashtable) anInstsVector;
WorkflowInstance inst = getWorkflowInstanceFromXmlRpc(wInstHash);
wInsts.add(inst);
}
@@ -203,8 +203,8 @@ public final class XmlRpcStructFactory {
Vector instsVector = new Vector();
if (wInsts != null && wInsts.size() > 0) {
- for (Iterator i = wInsts.iterator(); i.hasNext();) {
- WorkflowInstance inst = (WorkflowInstance) i.next();
+ for (Object wInst : wInsts) {
+ WorkflowInstance inst = (WorkflowInstance) wInst;
instsVector.add(getXmlRpcWorkflowInstance(inst));
}
}
@@ -295,8 +295,8 @@ public final class XmlRpcStructFactory {
return wTasks;
}
- for (Iterator i = tasks.iterator(); i.hasNext();) {
- WorkflowTask t = (WorkflowTask) i.next();
+ for (Object task1 : tasks) {
+ WorkflowTask t = (WorkflowTask) task1;
Hashtable task = getXmlRpcWorkflowTask(t);
wTasks.add(task);
}
@@ -345,8 +345,8 @@ public final class XmlRpcStructFactory {
public static List getWorkflowTasksFromXmlRpc(Vector tsks) {
List tasks = new Vector();
- for (Iterator i = tsks.iterator(); i.hasNext();) {
- Hashtable taskHashtable = (Hashtable) i.next();
+ for (Object tsk : tsks) {
+ Hashtable taskHashtable = (Hashtable) tsk;
WorkflowTask task = getWorkflowTaskFromXmlRpc(taskHashtable);
tasks.add(task);
@@ -420,8 +420,8 @@ public final class XmlRpcStructFactory {
return wConditions;
}
- for (Iterator i = conditions.iterator(); i.hasNext();) {
- WorkflowCondition c = (WorkflowCondition) i.next();
+ for (Object condition1 : conditions) {
+ WorkflowCondition c = (WorkflowCondition) condition1;
Hashtable condition = getXmlRpcWorkflowCondition(c);
wConditions.add(condition);
}
@@ -445,8 +445,8 @@ public final class XmlRpcStructFactory {
return reqFields;
}
- for (Iterator i = fields.iterator(); i.hasNext();) {
- String reqField = (String) i.next();
+ for (Object field : fields) {
+ String reqField = (String) field;
reqFields.add(reqField);
}
@@ -468,8 +468,8 @@ public final class XmlRpcStructFactory {
return fields;
}
- for (Iterator i = metFields.iterator(); i.hasNext();) {
- String reqFieldName = (String) i.next();
+ for (Object metField : metFields) {
+ String reqFieldName = (String) metField;
fields.add(reqFieldName);
}
@@ -534,8 +534,8 @@ public final class XmlRpcStructFactory {
List conditions = new Vector();
if (conds != null && conds.size() > 0) {
- for (Iterator i = conds.iterator(); i.hasNext();) {
- Hashtable cond = (Hashtable) i.next();
+ for (Object cond1 : conds) {
+ Hashtable cond = (Hashtable) cond1;
WorkflowCondition condition = getWorkflowConditionFromXmlRpc(cond);
conditions.add(condition);
}
@@ -560,8 +560,8 @@ public final class XmlRpcStructFactory {
WorkflowTaskConfiguration config) {
Hashtable configuration = new Hashtable();
- for (Iterator i = config.getProperties().keySet().iterator(); i.hasNext();) {
- String name = (String) i.next();
+ for (Object o : config.getProperties().keySet()) {
+ String name = (String) o;
String value = (String) config.getProperties().get(name);
configuration.put(name, value);
}
@@ -582,8 +582,8 @@ public final class XmlRpcStructFactory {
Hashtable config) {
WorkflowTaskConfiguration configuration = new WorkflowTaskConfiguration();
- for (Iterator i = config.keySet().iterator(); i.hasNext();) {
- String name = (String) i.next();
+ for (Object o : config.keySet()) {
+ String name = (String) o;
String value = (String) config.get(name);
configuration.getProperties().put(name, value);
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestAsynchronousLocalEngineRunner.java
----------------------------------------------------------------------
diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestAsynchronousLocalEngineRunner.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestAsynchronousLocalEngineRunner.java
index 68b5b1c..4e5ef23 100644
--- a/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestAsynchronousLocalEngineRunner.java
+++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestAsynchronousLocalEngineRunner.java
@@ -160,8 +160,8 @@ public class TestAsynchronousLocalEngineRunner extends TestCase {
File[] delFiles = startDirFile.listFiles();
if (delFiles != null && delFiles.length > 0) {
- for (int i = 0; i < delFiles.length; i++) {
- delFiles[i].delete();
+ for (File delFile : delFiles) {
+ delFile.delete();
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestTaskRunner.java
----------------------------------------------------------------------
diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestTaskRunner.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestTaskRunner.java
index aecdb34..36389d9 100644
--- a/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestTaskRunner.java
+++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestTaskRunner.java
@@ -119,8 +119,8 @@ public class TestTaskRunner extends TestCase {
File[] delFiles = startDirFile.listFiles();
if (delFiles != null && delFiles.length > 0) {
- for (int i = 0; i < delFiles.length; i++) {
- delFiles[i].delete();
+ for (File delFile : delFiles) {
+ delFile.delete();
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/workflow/src/test/java/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java
index 323e4cf..b5c6558 100644
--- a/workflow/src/test/java/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java
+++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java
@@ -229,9 +229,8 @@ public class TestLuceneWorkflowInstanceRepository extends TestCase implements
boolean gotVal1 = false, gotVal2 = false;
- for (Iterator i = foundInst.getSharedContext().getAllMetadata(
- "TestKey1").iterator(); i.hasNext();) {
- String val = (String) i.next();
+ for (String val : foundInst.getSharedContext().getAllMetadata(
+ "TestKey1")) {
if (val.equals("TestVal1")) {
gotVal1 = true;
} else if (val.equals("TestVal2")) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManagerClient.java
----------------------------------------------------------------------
diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManagerClient.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManagerClient.java
index 7f1bf8d..485d61a 100644
--- a/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManagerClient.java
+++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManagerClient.java
@@ -142,8 +142,7 @@ public class TestXmlRpcWorkflowManagerClient extends TestCase {
// check key-values for key1
boolean checkVal1 = false, checkVal2 = false, checkVal3 = false;
- for (Iterator i = met.getAllMetadata("key1").iterator(); i.hasNext();) {
- String val = (String) i.next();
+ for (String val : met.getAllMetadata("key1")) {
if (val.equals("val1")) {
checkVal1 = true;
} else if (val.equals("val2")) {
@@ -158,8 +157,7 @@ public class TestXmlRpcWorkflowManagerClient extends TestCase {
// check key-values for key2
boolean checkVal4 = false, checkVal5 = false;
- for (Iterator i = met.getAllMetadata("key2").iterator(); i.hasNext();) {
- String val = (String) i.next();
+ for (String val : met.getAllMetadata("key2")) {
if (val.equals("val4")) {
checkVal4 = true;
} else if (val.equals("val5")) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/DatabaseTableGroup.java
----------------------------------------------------------------------
diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/DatabaseTableGroup.java b/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/DatabaseTableGroup.java
index 240ee3a..abe299e 100644
--- a/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/DatabaseTableGroup.java
+++ b/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/DatabaseTableGroup.java
@@ -58,9 +58,7 @@ public class DatabaseTableGroup {
public List<String> getTableNames() {
List<String> names = new Vector<String>();
- for (Iterator<DatabaseTable> i = this.orderedGroup.iterator(); i
- .hasNext();) {
- DatabaseTable tbl = i.next();
+ for (DatabaseTable tbl : this.orderedGroup) {
names.add(tbl.getName());
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java
----------------------------------------------------------------------
diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java b/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java
index b26acf4..39cbcc7 100644
--- a/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java
+++ b/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java
@@ -131,8 +131,7 @@ public class DBMSExecutor {
Metadata met = new Metadata();
- for (Iterator<String> i = map.getFieldNames().iterator(); i.hasNext();) {
- String fldName = i.next();
+ for (String fldName : map.getFieldNames()) {
MappingField fld = map.getFieldByName(fldName);
ProfileElement elem = new EnumeratedProfileElement(profile);
elem.setName(fld.getName());
@@ -142,8 +141,7 @@ public class DBMSExecutor {
elem.getValues().add(fld.getConstantValue());
} else {
String elemDbVal = rs.getString(fld.getDbName());
- for (Iterator<MappingFunc> j = fld.getFuncs().iterator(); j.hasNext();) {
- MappingFunc func = j.next();
+ for (MappingFunc func : fld.getFuncs()) {
CDEValue origVal = new CDEValue(fld.getName(), elemDbVal);
CDEValue newVal = func.translate(origVal);
elemDbVal = newVal.getVal();
@@ -154,8 +152,8 @@ public class DBMSExecutor {
} catch (SQLException e) {
e.printStackTrace();
LOG.log(Level.WARNING, "Unable to obtain field: ["
- + fld.getLocalName() + "] from result set: message: "
- + e.getMessage());
+ + fld.getLocalName() + "] from result set: message: "
+ + e.getMessage());
}
met.addMetadata(elem.getName(), (String) elem.getValues().get(0));
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 eeb3081..03e9719 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
@@ -155,10 +155,10 @@ public class XMLPSProfileHandler extends XMLPSProductHandler implements
sqlBuf.append(" ");
if (mapping.getNumTables() > 0) {
- for (Iterator<String> i = mapping.getTableNames().iterator(); i
- .hasNext();) {
- String tableName = i.next();
- if(tableName.equals(mapping.getDefaultTable())) continue;
+ for (String tableName : mapping.getTableNames()) {
+ if (tableName.equals(mapping.getDefaultTable())) {
+ continue;
+ }
DatabaseTable tbl = mapping.getTableByName(tableName);
sqlBuf.append("INNER JOIN ");
sqlBuf.append(tbl.getName());
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java
----------------------------------------------------------------------
diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java b/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java
index a49d429..a98c835 100644
--- a/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java
+++ b/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java
@@ -117,8 +117,8 @@ public class HandlerQueryParser implements ParseConstants {
Stack<QueryElement> ret = new Stack<QueryElement>();
- for (int i = 0; i < l.size(); i++) {
- ret.push(l.get(i));
+ for (QueryElement aL : l) {
+ ret.push(aL);
}
return ret;
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 67704cb..a882583 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
@@ -43,8 +43,7 @@ public class CDERow {
public String toString() {
StringBuilder rStr = new StringBuilder();
if (vals != null && vals.size() > 0) {
- for (Iterator<CDEValue> i = vals.iterator(); i.hasNext();) {
- CDEValue v = i.next();
+ for (CDEValue v : vals) {
rStr.append(v.getVal()).append(COL_SEPARATOR);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/xmlps/src/test/java/org/apache/oodt/xmlps/product/TestXMLPSProductHandler.java
----------------------------------------------------------------------
diff --git a/xmlps/src/test/java/org/apache/oodt/xmlps/product/TestXMLPSProductHandler.java b/xmlps/src/test/java/org/apache/oodt/xmlps/product/TestXMLPSProductHandler.java
index cc2451c..906222b 100644
--- a/xmlps/src/test/java/org/apache/oodt/xmlps/product/TestXMLPSProductHandler.java
+++ b/xmlps/src/test/java/org/apache/oodt/xmlps/product/TestXMLPSProductHandler.java
@@ -107,8 +107,7 @@ public class TestXMLPSProductHandler extends TestCase {
assertEquals(1, elemNames.size()); // only 1 b/c one field is constant
boolean gotSpecCollected = false;
- for (Iterator<QueryElement> i = elemNames.iterator(); i.hasNext();) {
- QueryElement elem = i.next();
+ for (QueryElement elem : elemNames) {
if (elem.getValue().equals("specimen.specimen_collected")) {
gotSpecCollected = true;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryResult.java
----------------------------------------------------------------------
diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryResult.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryResult.java
index 2267b92..1cce6bc 100755
--- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryResult.java
+++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryResult.java
@@ -88,10 +88,10 @@ public class QueryResult implements Serializable, Cloneable, Documentable {
public Node toXML(Document doc) throws DOMException {
Element root = doc.createElement("queryResultSet");
- for (Iterator i = list.iterator(); i.hasNext();) {
- Result r = (Result) i.next();
- root.appendChild(r.toXML(doc));
- }
+ for (Object aList : list) {
+ Result r = (Result) aList;
+ root.appendChild(r.toXML(doc));
+ }
return root;
}
@@ -121,18 +121,18 @@ public class QueryResult implements Serializable, Cloneable, Documentable {
}
public void setRetriever(Retriever retriever) {
- for (Iterator i = list.iterator(); i.hasNext();) {
- Result r = (Result) i.next();
- r.setRetriever(retriever);
- }
+ for (Object aList : list) {
+ Result r = (Result) aList;
+ r.setRetriever(retriever);
+ }
}
public long getSize() {
long size = 0;
- for (Iterator i = list.iterator(); i.hasNext();) {
- Result r = (Result) i.next();
- size += r.getSize();
- }
+ for (Object aList : list) {
+ Result r = (Result) aList;
+ size += r.getSize();
+ }
return size;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java
----------------------------------------------------------------------
diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java
index afbc65d..8e4b90e 100755
--- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java
+++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java
@@ -87,11 +87,11 @@ public class Result implements Serializable, Cloneable, Documentable {
+ " Result.INFINITE to indicate no expiration");
if (!codecs.containsKey(mimeType))
throw new IllegalArgumentException("MIME type \"" + mimeType + "\" unknown");
- for (Iterator i = headers.iterator(); i.hasNext();) {
- Object header = i.next();
- if (!(header instanceof Header))
- throw new IllegalArgumentException("List of headers doesn't contain Header object");
+ for (Object header : headers) {
+ if (!(header instanceof Header)) {
+ throw new IllegalArgumentException("List of headers doesn't contain Header object");
}
+ }
this.id = id;
this.mimeType = mimeType;
@@ -261,10 +261,10 @@ public class Result implements Serializable, Cloneable, Documentable {
XML.add(root, "identifier", resourceID);
Element resultHeader = doc.createElement("resultHeader");
root.appendChild(resultHeader);
- for (Iterator i = headers.iterator(); i.hasNext();) {
- Header header = (Header) i.next();
- resultHeader.appendChild(header.toXML(doc));
- }
+ for (Object header1 : headers) {
+ Header header = (Header) header1;
+ resultHeader.appendChild(header.toXML(doc));
+ }
Codec codec = (Codec) codecs.get(mimeType);
if (codec == null) throw new IllegalStateException("No codec available for supposedly valid MIME type \""
+ mimeType + "\"");
@@ -394,10 +394,10 @@ public class Result implements Serializable, Cloneable, Documentable {
Properties props = new Properties();
props.load(in);
in.close();
- for (Iterator i = props.entrySet().iterator(); i.hasNext();) {
- Map.Entry entry = (Map.Entry) i.next();
- codecs.put(entry.getKey(), CodecFactory.createCodec((String) entry.getValue()));
- }
+ for (Map.Entry<Object, Object> objectObjectEntry : props.entrySet()) {
+ Map.Entry entry = (Map.Entry) objectObjectEntry;
+ codecs.put(entry.getKey(), CodecFactory.createCodec((String) entry.getValue()));
+ }
} catch (IOException ex) {
System.err.println("I/O exception WHILE reading mime.properties: " + ex.getMessage());
ex.printStackTrace();
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 1b6710c..514b13a 100755
--- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java
+++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java
@@ -531,12 +531,11 @@ public class XMLQuery implements java.io.Serializable, Cloneable {
*/
private static boolean isFromToken (String s1)
{
- for (int i = 0; i < FROM_TOKENS.length; i++)
- {
- if (s1.compareTo(FROM_TOKENS[i]) == 0) {
- return true;
- }
- }
+ for (String FROM_TOKEN : FROM_TOKENS) {
+ if (s1.compareTo(FROM_TOKEN) == 0) {
+ return true;
+ }
+ }
return false;
}
@@ -714,36 +713,36 @@ public class XMLQuery implements java.io.Serializable, Cloneable {
// create and load queryStatistics
elem = doc.createElement("queryStatistics");
query.appendChild(elem);
- for (Iterator i = statistics.iterator(); i.hasNext();) {
- Statistic s = (Statistic) i.next();
- elem.appendChild(s.toXML(doc));
- }
+ for (Object statistic : statistics) {
+ Statistic s = (Statistic) statistic;
+ elem.appendChild(s.toXML(doc));
+ }
// create and load querySelectSet
elem = doc.createElement("querySelectSet");
query.appendChild(elem);
- for (Iterator i = selectElementSet.iterator(); i.hasNext();) {
- QueryElement queryElement = (QueryElement) i.next();
- elem.appendChild(queryElement.toXML(doc));
- }
+ for (Object aSelectElementSet : selectElementSet) {
+ QueryElement queryElement = (QueryElement) aSelectElementSet;
+ elem.appendChild(queryElement.toXML(doc));
+ }
// create and load queryFromSet
elem = doc.createElement("queryFromSet");
query.appendChild(elem);
- for (Iterator i = fromElementSet.iterator(); i.hasNext();) {
- QueryElement queryElement = (QueryElement) i.next();
- elem.appendChild(queryElement.toXML(doc));
- }
+ for (Object aFromElementSet : fromElementSet) {
+ QueryElement queryElement = (QueryElement) aFromElementSet;
+ elem.appendChild(queryElement.toXML(doc));
+ }
// create and load queryWhereSet
elem = doc.createElement("queryWhereSet");
query.appendChild(elem);
- for (Iterator i = whereElementSet.iterator(); i.hasNext();) {
- QueryElement queryElement = (QueryElement) i.next();
- elem.appendChild(queryElement.toXML(doc));
- }
+ for (Object aWhereElementSet : whereElementSet) {
+ QueryElement queryElement = (QueryElement) aWhereElementSet;
+ elem.appendChild(queryElement.toXML(doc));
+ }
query.appendChild(result.toXML(doc));
}
[15/16] oodt git commit: OODT-906 remove unrequired assignment
Posted by ma...@apache.org.
OODT-906 remove unrequired assignment
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/0cc60d17
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/0cc60d17
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/0cc60d17
Branch: refs/heads/master
Commit: 0cc60d170539dac185b5cb062270c4aba94d5981
Parents: 82cc2da
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Oct 25 15:50:20 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Oct 25 15:50:20 2015 +0000
----------------------------------------------------------------------
.../oodt/cas/filemgr/browser/model/CasDB.java | 2 +-
.../gui/perspective/build/BuildPerspective.java | 2 +-
.../perspective/view/impl/DefaultPropView.java | 2 +-
.../perspective/view/impl/DefaultTreeView.java | 2 +-
.../gui/perspective/view/impl/GraphView.java | 8 ++---
.../view/impl/JungJGraphModelAdapter.java | 4 +--
.../catalog/cli/action/PagedQueryCliAction.java | 2 +-
.../cas/catalog/cli/action/QueryCliAction.java | 2 +-
.../cli/action/ReducedPagedQueryCliAction.java | 2 +-
.../cli/action/ReducedQueryCliAction.java | 2 +-
.../catalog/query/FreeTextQueryExpression.java | 2 +-
.../cas/catalog/query/parser/QueryParser.java | 20 ++++++------
.../query/parser/QueryParserTokenManager.java | 2 +-
.../catalog/query/parser/SimpleCharStream.java | 4 +--
.../XmlRpcCommunicationChannelClient.java | 2 +-
.../struct/impl/index/DataSourceIndex.java | 2 +-
.../system/impl/CatalogServiceLocal.java | 4 +--
.../oodt/cas/cli/printer/StdCmdLinePrinter.java | 2 +-
.../apache/oodt/cas/cli/util/CmdLineUtils.java | 2 +-
.../org/apache/oodt/commons/Configuration.java | 2 +-
.../commons/activity/SQLDatabaseStorage.java | 3 --
.../database/DatabaseConnectionBuilder.java | 2 +-
.../apache/oodt/commons/database/SqlScript.java | 8 ++---
.../apache/oodt/commons/exec/EnvUtilities.java | 3 +-
.../apache/oodt/commons/exec/StreamGobbler.java | 2 +-
.../commons/filter/TimeEventWeightedHash.java | 2 +-
.../oodt/commons/object/jndi/RMIContext.java | 2 +-
.../java/org/apache/oodt/commons/util/XML.java | 2 +-
.../apache/oodt/cas/crawl/ProductCrawler.java | 2 +-
.../oodt/cas/crawl/action/FileBasedAction.java | 2 +-
.../cas/crawl/daemon/CrawlDaemonController.java | 12 +++----
.../cas/curation/service/DirectoryResource.java | 2 +-
.../cas/curation/service/IngestionResource.java | 2 +-
.../cas/curation/service/MetadataResource.java | 6 ++--
.../cas/curation/service/PolicyResource.java | 6 ++--
.../org/apache/oodt/cas/curation/HomePage.java | 2 +-
.../cas/filemgr/catalog/DataSourceCatalog.java | 11 ++-----
.../catalog/DataSourceCatalogFactory.java | 2 +-
.../cas/filemgr/catalog/ScienceDataCatalog.java | 1 -
.../catalog/ScienceDataCatalogFactory.java | 2 +-
.../cli/action/RetrieveFilesCliAction.java | 2 +-
.../datatransfer/RemoteDataTransferer.java | 7 ++--
.../datatransfer/TransferStatusTracker.java | 6 ++--
.../cas/filemgr/ingest/CmdLineIngester.java | 6 ++--
.../oodt/cas/filemgr/ingest/StdIngester.java | 6 ++--
.../extractors/AbstractFilemgrMetExtractor.java | 11 ++++---
.../DataSourceRepositoryManagerFactory.java | 2 +-
.../ScienceDataRepositoryManager.java | 15 ---------
.../ScienceDataRepositoryManagerFactory.java | 2 +-
.../repository/XMLRepositoryManager.java | 12 +++----
.../filemgr/structs/FreeTextQueryCriteria.java | 2 +-
.../oodt/cas/filemgr/structs/Product.java | 2 +-
.../cas/filemgr/system/XmlRpcFileManager.java | 14 ++++----
.../oodt/cas/filemgr/tools/CatalogSearch.java | 4 +--
.../oodt/cas/filemgr/tools/DeleteProduct.java | 3 +-
.../oodt/cas/filemgr/tools/ExpImpCatalog.java | 2 +-
.../oodt/cas/filemgr/tools/MetadataDumper.java | 4 +--
.../filemgr/tools/OptimizeLuceneCatalog.java | 1 -
.../oodt/cas/filemgr/tools/ProductDumper.java | 4 +--
.../oodt/cas/filemgr/tools/QueryTool.java | 2 +-
.../cas/filemgr/tools/RangeQueryTester.java | 1 -
.../oodt/cas/filemgr/tools/SolrIndexer.java | 7 ++--
.../util/GenericFileManagerObjectFactory.java | 20 ++++++------
.../apache/oodt/cas/filemgr/util/SqlParser.java | 2 +-
.../oodt/cas/filemgr/util/XmlStructFactory.java | 10 +++---
.../validation/DataSourceValidationLayer.java | 2 +-
.../DataSourceValidationLayerFactory.java | 2 +-
.../validation/ScienceDataValidationLayer.java | 22 -------------
.../ScienceDataValidationLayerFactory.java | 2 +-
.../filemgr/validation/XMLValidationLayer.java | 12 +++----
.../cas/filemgr/versioning/BasicVersioner.java | 2 +-
.../filemgr/versioning/DateTimeVersioner.java | 4 +--
.../cas/filemgr/versioning/VersioningUtils.java | 10 +++---
.../filemgr/catalog/TestDataSourceCatalog.java | 2 +-
.../cas/filemgr/ingest/TestCachedIngester.java | 5 ++-
.../oodt/cas/filemgr/ingest/TestLocalCache.java | 3 +-
.../oodt/cas/filemgr/ingest/TestRmiCache.java | 3 +-
.../cas/filemgr/ingest/TestStdIngester.java | 3 +-
.../filemgr/structs/type/TestTypeHandler.java | 22 +++++--------
.../filemgr/system/TestXmlRpcFileManager.java | 2 +-
.../system/TestXmlRpcFileManagerClient.java | 6 ++--
.../cas/filemgr/tools/TestExpImpCatalog.java | 5 +--
.../tools/TestMetadataBasedProductMover.java | 2 +-
.../cas/filemgr/util/TestXmlStructFactory.java | 2 +-
.../java/org/apache/oodt/grid/GridServlet.java | 2 +-
.../extractors/CmdLineMetExtractor.java | 4 +--
.../extractors/CopyAndRewriteExtractor.java | 2 +-
.../metadata/extractors/ExternConfigReader.java | 4 +--
.../metadata/extractors/ExternMetExtractor.java | 2 +-
.../util/GenericMetadataObjectFactory.java | 4 +--
.../oodt/cas/metadata/util/PathUtils.java | 4 +--
.../OpendapProfileElementExtractor.java | 8 ++---
.../oodt/opendapps/OpendapProfileHandler.java | 2 +-
.../apache/oodt/pcs/tools/PCSHealthMonitor.java | 8 ++---
.../org/apache/oodt/pcs/tools/PCSTrace.java | 2 +-
.../apache/oodt/pcs/util/FileManagerUtils.java | 2 +-
.../oodt/pcs/input/PGEConfigFileReader.java | 10 +++---
.../oodt/pcs/input/PGEConfigFileWriter.java | 2 +-
.../apache/oodt/cas/pge/PGETaskInstance.java | 2 +-
.../MetadataKeyReplacerTemplateWriter.java | 2 +-
.../metlist/MetadataListPcsMetFileWriter.java | 2 +-
.../oodt/cas/pge/TestPGETaskInstance.java | 2 +-
.../handlers/ofsn/AbstractCrawlLister.java | 2 +-
.../ofsn/OFSNFileHandlerConfiguration.java | 1 -
.../handlers/ofsn/StdOFSNGetHandler.java | 1 -
.../product/handlers/ofsn/util/OFSNUtils.java | 3 +-
.../profile/handlers/cas/CASProfileHandler.java | 2 +-
.../cas/protocol/system/ProtocolManager.java | 2 +-
.../oodt/cas/protocol/http/HttpProtocol.java | 2 +-
.../cas/protocol/sftp/TestJschSftpProtocol.java | 2 +-
.../oodt/cas/pushpull/config/RemoteSpecs.java | 7 ++--
.../apache/oodt/cas/pushpull/daemon/Daemon.java | 2 --
.../filerestrictions/FileRestrictions.java | 2 +-
.../parsers/ClassNoaaEmailParser.java | 2 +-
.../pushpull/retrievalmethod/ListRetriever.java | 2 +-
.../retrievalsystem/RetrievalSetup.java | 6 ++--
.../cas/resource/batchmgr/XmlRpcBatchMgr.java | 4 +--
.../resource/batchmgr/XmlRpcBatchMgrProxy.java | 6 ++--
.../cas/resource/monitor/utils/MockGmetad.java | 4 +--
.../cas/resource/mux/XmlBackendRepository.java | 2 +-
.../resource/noderepo/XmlNodeRepository.java | 1 -
.../resource/queuerepo/XmlQueueRepository.java | 1 -
.../cas/resource/scheduler/LRUScheduler.java | 2 +-
.../resource/system/XmlRpcResourceManager.java | 2 +-
.../resource/system/extern/XmlRpcBatchStub.java | 6 ++--
.../cas/resource/tools/RunDirJobSubmitter.java | 4 +--
.../GenericResourceManagerObjectFactory.java | 32 +++++++++---------
.../oodt/cas/resource/util/JobBuilder.java | 2 +-
.../apache/oodt/cas/resource/util/Ulimit.java | 8 ++---
.../cas/resource/jobqueue/TestJobStack.java | 2 +-
.../apache/oodt/security/sso/OpenSSOImpl.java | 4 +--
.../oodt/security/sso/SingleSignOnFactory.java | 4 +--
.../oodt/security/sso/opensso/SSOProxy.java | 10 ++----
.../filemgr/browser/types/TypeBrowser.java | 2 +-
.../health/VisibilityAndSortToggler.java | 2 +-
.../webcomponents/health/VisibilityToggler.java | 2 +-
.../oodt/cas/product/CASProductHandler.java | 1 -
.../cas/product/data/DataDeliveryServlet.java | 9 ++----
.../product/data/DatasetDeliveryServlet.java | 4 +--
.../jaxrs/configurations/RdfConfiguration.java | 2 +-
.../jaxrs/servlets/CasProductJaxrsServlet.java | 2 +-
.../cas/product/jaxrs/writers/RdfWriter.java | 2 +-
.../cas/product/jaxrs/writers/RssWriter.java | 2 +-
.../oodt/cas/product/rdf/RDFDatasetServlet.java | 4 +--
.../oodt/cas/product/rdf/RDFProductServlet.java | 8 ++---
.../apache/oodt/cas/product/rdf/RDFUtils.java | 2 +-
.../oodt/cas/product/rss/RSSProductServlet.java | 6 ++--
.../product/rss/RSSProductTransferServlet.java | 4 +--
.../oodt/cas/product/data/TestDataUtils.java | 2 +-
.../cli/action/GetFirstPageCliAction.java | 2 +-
.../cli/action/GetLastPageCliAction.java | 2 +-
.../cli/action/GetNextPageCliAction.java | 2 +-
.../cli/action/GetPrevPageCliAction.java | 2 +-
.../IterativeWorkflowProcessorThread.java | 2 +-
.../engine/ThreadPoolWorkflowEngine.java | 6 ++--
.../processor/WorkflowProcessorQueue.java | 4 +--
.../runner/AsynchronousLocalEngineRunner.java | 18 +++++------
.../cas/workflow/examples/BranchRedirector.java | 2 +-
.../DataSourceWorkflowInstanceRepository.java | 2 +-
...SourceWorkflowInstanceRepositoryFactory.java | 2 +-
.../LuceneWorkflowInstanceRepository.java | 10 +-----
.../WorkflowInstanceMetadataReader.java | 10 +++---
.../lifecycle/WorkflowLifecycleManager.java | 2 +-
.../lifecycle/WorkflowLifecyclesReader.java | 10 +++---
.../DataSourceWorkflowRepositoryFactory.java | 2 +-
.../repository/PackagedWorkflowRepository.java | 8 ++---
.../repository/XMLWorkflowRepository.java | 5 ++-
.../structs/HighestFIFOPrioritySorter.java | 2 +-
.../workflow/system/XmlRpcWorkflowManager.java | 18 +++++------
.../system/XmlRpcWorkflowManagerClient.java | 34 ++++++++++----------
.../cas/workflow/tools/InstanceRepoCleaner.java | 2 +-
.../cas/workflow/util/CygwinScriptFile.java | 1 -
.../util/GenericWorkflowObjectFactory.java | 14 ++++----
.../oodt/cas/workflow/util/ScriptFile.java | 1 -
.../workflow/engine/QuerierAndRunnerUtils.java | 2 +-
.../oodt/cas/workflow/engine/SimpleTester.java | 1 -
.../TestAsynchronousLocalEngineRunner.java | 1 -
.../cas/workflow/engine/TestTaskQuerier.java | 8 ++---
.../TestLuceneWorkflowInstanceRepository.java | 2 +-
.../TestWorkflowDataSourceRepository.java | 2 +-
.../system/TestXmlRpcWorkflowManagerClient.java | 2 +-
.../apache/oodt/xmlps/profile/DBMSExecutor.java | 2 --
.../xmlps/queryparser/HandlerQueryParser.java | 2 +-
.../xmlps/util/GenericCDEObjectFactory.java | 2 +-
.../xmlps/structs/TestCDEResultInputStream.java | 6 ++--
.../java/org/apache/oodt/xmlquery/Header.java | 18 +++++++----
.../java/org/apache/oodt/xmlquery/Result.java | 2 +-
.../java/org/apache/oodt/xmlquery/XMLQuery.java | 11 +++----
188 files changed, 386 insertions(+), 488 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java
----------------------------------------------------------------------
diff --git a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java
index 01a9631..37b6b9f 100644
--- a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java
+++ b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java
@@ -178,7 +178,7 @@ public class CasDB {
QueryBuilder qb = new QueryBuilder(this);
org.apache.oodt.cas.filemgr.structs.Query casQ = qb.ParseQuery(queryText);
- ProductType type = null;
+ ProductType type;
try {
type = client.getProductTypeByName(productType);
Vector<Product> products = (Vector<Product>) client.query(casQ, type);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/build/BuildPerspective.java
----------------------------------------------------------------------
diff --git a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/build/BuildPerspective.java b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/build/BuildPerspective.java
index cace96e..d7966ec 100644
--- a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/build/BuildPerspective.java
+++ b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/build/BuildPerspective.java
@@ -178,7 +178,7 @@ public class BuildPerspective extends MultiStatePerspective {
this.save();
this.removeAll();
this.setLayout(new BorderLayout());
- JPanel panel = null;
+ JPanel panel;
if (this.activeState != null) {
BuildPanel buildPanel = this.stateViews.get(this.activeState);
buildPanel.refresh();
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultPropView.java
----------------------------------------------------------------------
diff --git a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultPropView.java b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultPropView.java
index 1e0f0b8..d8724fc 100644
--- a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultPropView.java
+++ b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultPropView.java
@@ -104,7 +104,7 @@ public class DefaultPropView extends View {
}
private JTable createTable(final ViewState state) {
- JTable table = null;
+ JTable table;
final ModelGraph selected = state.getSelected();
if (selected != null) {
final Vector<Vector<String>> rows = new Vector<Vector<String>>();
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultTreeView.java
----------------------------------------------------------------------
diff --git a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultTreeView.java b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultTreeView.java
index b8ac2f5..51c517f 100644
--- a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultTreeView.java
+++ b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultTreeView.java
@@ -386,7 +386,7 @@ public class DefaultTreeView extends View {
private void addMetadataNodes(DefaultMutableTreeNode metadataNode,
Metadata staticMetadata) {
for (String group : staticMetadata.getGroups()) {
- Object userObj = null;
+ Object userObj;
if (staticMetadata.getMetadata(group) != null) {
HashMap<String, String> map = new HashMap<String, String>();
map.put(group,
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/GraphView.java
----------------------------------------------------------------------
diff --git a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/GraphView.java b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/GraphView.java
index d2061e0..e576112 100644
--- a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/GraphView.java
+++ b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/GraphView.java
@@ -801,7 +801,7 @@ public class GraphView extends DefaultTreeView {
if (e.getButton() == MouseEvent.BUTTON3) {
Object mouseOverCell = GraphView.this.jgraph.getFirstCellForLocation(
e.getX(), e.getY());
- ModelGraph mouseOverGraph = null;
+ ModelGraph mouseOverGraph;
if (mouseOverCell != null) {
mouseOverGraph = (GuiUtils.find(state.getGraphs(),
((ModelNode) ((DefaultMutableTreeNode) mouseOverCell)
@@ -818,8 +818,6 @@ public class GraphView extends DefaultTreeView {
if (mouseOverGraph != null)
mouseOverCell = GraphView.this.m_jgAdapter
.getVertexCell(mouseOverGraph.getModel());
- else
- mouseOverCell = null;
}
state.setSelected(mouseOverGraph);
} else {
@@ -911,7 +909,7 @@ public class GraphView extends DefaultTreeView {
}
private void createNewGraph(String actionCommand) {
- ModelGraph newGraph = null;
+ ModelGraph newGraph;
if (actionCommand.equals(NEW_TASK_ITEM_NAME)) {
newGraph = new ModelGraph(new ModelNode(state.getFile(),
GuiUtils.createUniqueName()));
@@ -957,7 +955,7 @@ public class GraphView extends DefaultTreeView {
}
public Point getShift(ViewState state, DefaultGraphCell cell, Map nested) {
- ModelGraph graph = null;
+ ModelGraph graph;
if (cell instanceof DefaultEdge) {
IdentifiableEdge edge = (IdentifiableEdge) cell.getUserObject();
Pair pair = GraphView.this.edgeMap.get(edge.id);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/JungJGraphModelAdapter.java
----------------------------------------------------------------------
diff --git a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/JungJGraphModelAdapter.java b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/JungJGraphModelAdapter.java
index a9179ef..094cb88 100644
--- a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/JungJGraphModelAdapter.java
+++ b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/JungJGraphModelAdapter.java
@@ -222,8 +222,8 @@ public class JungJGraphModelAdapter extends DefaultGraphModel {
private void addJGraphEdge(IdentifiableEdge e) {
ConnectionSet set = new ConnectionSet();
DefaultEdge theEdge = new DefaultEdge(e);
- DefaultGraphCell from = null;
- DefaultGraphCell to = null;
+ DefaultGraphCell from;
+ DefaultGraphCell to;
String fromVertexId = e.getFrom().getId();
String toVertexId = e.getTo().getId();
if (!cellMap.containsKey(fromVertexId)) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 efbe7f5..0585045 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
@@ -52,7 +52,7 @@ public class PagedQueryCliAction extends CatalogServiceCliAction {
QueryExpression queryExpression = QueryParser
.parseQueryExpression(query);
- Page page = null;
+ Page page;
if (catalogIds == null) {
page = getClient().getPage(new PageInfo(pageSize, pageNum),
queryExpression);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 1954297..66f58d5 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
@@ -49,7 +49,7 @@ public class QueryCliAction extends CatalogServiceCliAction {
QueryExpression queryExpression = QueryParser
.parseQueryExpression(query);
- QueryPager queryPager = null;
+ QueryPager queryPager;
if (catalogIds == null) {
queryPager = getClient().query(queryExpression);
} else {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 49274ef..5933682 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
@@ -57,7 +57,7 @@ public class ReducedPagedQueryCliAction extends CatalogServiceCliAction {
QueryExpression queryExpression = QueryParser
.parseQueryExpression(query);
- Page page = null;
+ Page page;
if (catalogIds == null) {
page = getClient().getPage(new PageInfo(pageSize, pageNum),
queryExpression);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 e61d5b9..4411950 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
@@ -53,7 +53,7 @@ public class ReducedQueryCliAction extends CatalogServiceCliAction {
QueryExpression queryExpression = QueryParser
.parseQueryExpression(query);
- QueryPager queryPager = null;
+ QueryPager queryPager;
if (catalogIds == null) {
queryPager = getClient().query(queryExpression);
} else {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/catalog/src/main/java/org/apache/oodt/cas/catalog/query/FreeTextQueryExpression.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/FreeTextQueryExpression.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/FreeTextQueryExpression.java
index c5268a9..b7b58a6 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/FreeTextQueryExpression.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/FreeTextQueryExpression.java
@@ -58,7 +58,7 @@ public class FreeTextQueryExpression extends TermQueryExpression {
// tokenize string using default delimiters
StringTokenizer tok = new StringTokenizer(text);
- String token = null;
+ String token;
// filter noise words and add to values vector
List<String> values = new Vector<String>();
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 f095c93..289ce09 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
@@ -23,7 +23,7 @@ import java.util.Vector;
/*@bgen(jjtree) parseInput */
SimpleNode jjtn000 = new SimpleNode(JJTPARSEINPUT);
boolean jjtc000 = true;
- jjtree.openNodeScope(jjtn000);QueryExpression qe = null;
+ jjtree.openNodeScope(jjtn000);QueryExpression qe;
try {
qe = Query(null);
jj_consume_token(0);
@@ -56,7 +56,7 @@ import java.util.Vector;
/*@bgen(jjtree) Query */
SimpleNode jjtn000 = new SimpleNode(JJTQUERY);
boolean jjtc000 = true;
- jjtree.openNodeScope(jjtn000);QueryExpression qe1 = null;
+ jjtree.openNodeScope(jjtn000);QueryExpression qe1;
QueryExpression qe2 = null;
Token operator = null;
try {
@@ -120,7 +120,7 @@ import java.util.Vector;
/*@bgen(jjtree) QueryExpression */
SimpleNode jjtn000 = new SimpleNode(JJTQUERYEXPRESSION);
boolean jjtc000 = true;
- jjtree.openNodeScope(jjtn000);QueryExpression qe = null;
+ jjtree.openNodeScope(jjtn000);QueryExpression qe;
try {
if (jj_2_2(2147483647)) {
qe = PriorityQueryExpression(bucketNames);
@@ -278,8 +278,8 @@ import java.util.Vector;
/*@bgen(jjtree) ComparisonQueryExpression */
SimpleNode jjtn000 = new SimpleNode(JJTCOMPARISONQUERYEXPRESSION);
boolean jjtc000 = true;
- jjtree.openNodeScope(jjtn000);Token termName = null;
- Token operator = null;
+ jjtree.openNodeScope(jjtn000);Token termName;
+ Token operator;
Vector<String> values = new Vector<String>();
try {
termName = jj_consume_token(TERM);
@@ -363,7 +363,7 @@ import java.util.Vector;
/*@bgen(jjtree) PriorityQueryExpression */
SimpleNode jjtn000 = new SimpleNode(JJTPRIORITYQUERYEXPRESSION);
boolean jjtc000 = true;
- jjtree.openNodeScope(jjtn000);QueryExpression qe = null;
+ jjtree.openNodeScope(jjtn000);QueryExpression qe;
try {
jj_consume_token(OPEN_PARENS);
qe = Query(bucketNames);
@@ -397,7 +397,7 @@ import java.util.Vector;
/*@bgen(jjtree) CustomQueryExpression */
SimpleNode jjtn000 = new SimpleNode(JJTCUSTOMQUERYEXPRESSION);
boolean jjtc000 = true;
- jjtree.openNodeScope(jjtn000);Token customNameToken = null;
+ jjtree.openNodeScope(jjtn000);Token customNameToken;
Properties p = new Properties();
try {
jj_consume_token(OPEN_BRACES);
@@ -499,7 +499,7 @@ import java.util.Vector;
/*@bgen(jjtree) getValues */
SimpleNode jjtn000 = new SimpleNode(JJTGETVALUES);
boolean jjtc000 = true;
- jjtree.openNodeScope(jjtn000);Token value = null;
+ jjtree.openNodeScope(jjtn000);Token value;
try {
value = jj_consume_token(VALUE);
label_15:
@@ -539,8 +539,8 @@ import java.util.Vector;
/*@bgen(jjtree) getProperties */
SimpleNode jjtn000 = new SimpleNode(JJTGETPROPERTIES);
boolean jjtc000 = true;
- jjtree.openNodeScope(jjtn000);Token propertyKey = null;
- Token propertyVal = null;
+ jjtree.openNodeScope(jjtn000);Token propertyKey;
+ Token propertyVal;
try {
propertyKey = jj_consume_token(P_KEY);
label_16:
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 30eeff7..73d8198 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
@@ -682,7 +682,7 @@ public Token getNextToken()
int kind;
Token specialToken = null;
Token matchedToken;
- int curPos = 0;
+ int curPos;
EOFLoop :
for (;;)
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleCharStream.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleCharStream.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleCharStream.java
index ef010ae..1fd645d 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleCharStream.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleCharStream.java
@@ -436,8 +436,8 @@ public class SimpleCharStream
len = bufsize - tokenBegin + bufpos + 1 + inBuf;
}
- int i = 0, j = 0, k = 0;
- int nextColDiff = 0, columnDiff = 0;
+ int i = 0, j = 0, k;
+ int nextColDiff, columnDiff = 0;
while (i < len && bufline[j = start % bufsize] == bufline[k = ++start % bufsize])
{
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java
index ca98ff2..2813dd2 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java
@@ -163,7 +163,7 @@ public class XmlRpcCommunicationChannelClient extends AbstractCommunicationChann
byte[] buf = new byte[this.chunkSize];
is = new FileInputStream(new File(fromUrl.getPath()));
int offset = 0;
- int numBytes = 0;
+ int numBytes;
while ((numBytes = is.read(buf, offset, chunkSize)) != -1)
this.transferFile(new File(toURL.getPath()).getAbsolutePath(), buf, offset, numBytes);
}catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndex.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndex.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndex.java
index 8335de9..e9a945a 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndex.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndex.java
@@ -485,7 +485,7 @@ public class DataSourceIndex implements Index, IngestService, QueryService {
sqlQuery.append(")");
}else if (queryExpression instanceof ComparisonQueryExpression){
ComparisonQueryExpression cqe = (ComparisonQueryExpression) queryExpression;
- String operator = null;
+ String operator;
if (cqe.getOperator().equals(ComparisonQueryExpression.Operator.EQUAL_TO)) {
operator = "=";
} else if (cqe.getOperator().equals(ComparisonQueryExpression.Operator.GREATER_THAN)) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
index 79fb47c..41ba30c 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
@@ -475,7 +475,7 @@ public class CatalogServiceLocal implements CatalogService {
if (this.restrictIngestPermissions)
throw new CatalogServiceException("Ingest permissions are restricted for this CatalogService -- request denied");
try {
- boolean performUpdate = false;
+ boolean performUpdate;
TransactionId<?> catalogServiceTransactionId = this.getCatalogServiceTransactionId(metadata);
if (performUpdate = this.ingestMapper.hasCatalogServiceTransactionId(catalogServiceTransactionId))
LOG.log(Level.INFO, "TransactionId '" + catalogServiceTransactionId + "' is an existing TransactionId, switching to update mode");
@@ -1070,7 +1070,7 @@ public class CatalogServiceLocal implements CatalogService {
restrictToCatalogIds.retainAll(getInterestedCatalogs(queryExpression, restrictToCatalogIds));
// check for catalogs interested in wrapped query expression
- QueryResult wrapperExprQueryResult = null;
+ QueryResult wrapperExprQueryResult;
QueryExpression wrapperQE = ((WrapperQueryExpression) queryExpression).getQueryExpression();
if (wrapperQE instanceof QueryLogicalGroup) {
wrapperExprQueryResult = this.queryRecur((QueryLogicalGroup) wrapperQE, restrictToCatalogIds);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/cli/src/main/java/org/apache/oodt/cas/cli/printer/StdCmdLinePrinter.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/printer/StdCmdLinePrinter.java b/cli/src/main/java/org/apache/oodt/cas/cli/printer/StdCmdLinePrinter.java
index 9ebf32b..94b9a07 100644
--- a/cli/src/main/java/org/apache/oodt/cas/cli/printer/StdCmdLinePrinter.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/printer/StdCmdLinePrinter.java
@@ -130,7 +130,7 @@ public class StdCmdLinePrinter implements CmdLinePrinter {
.getArgDescription(action, option);
}
- String argHelp = null;
+ String argHelp;
if (option instanceof ActionCmdLineOption && option.hasArgs()) {
argHelp = " " + action.getName();
} else {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 473acba..d9e0b02 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
@@ -1050,7 +1050,7 @@ public class CmdLineUtils {
int endIndex) {
StringBuilder outputString = new StringBuilder("");
String[] splitStrings = StringUtils.split(string, " ");
- StringBuffer curLine = null;
+ StringBuffer curLine;
for (int i = 0; i < splitStrings.length; i++) {
curLine = new StringBuffer("");
curLine.append(splitStrings[i]).append(" ");
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 f805256..eb44cbd 100644
--- a/commons/src/main/java/org/apache/oodt/commons/Configuration.java
+++ b/commons/src/main/java/org/apache/oodt/commons/Configuration.java
@@ -539,7 +539,7 @@ public class Configuration {
* @throws NamingException If the context can't be created.
*/
public Context getObjectContext() throws NamingException {
- Context c = null;
+ Context c;
final String className = (String) contextEnvironment.get(javax.naming.Context.INITIAL_CONTEXT_FACTORY);
if (className == null)
c = new InitialContext(contextEnvironment);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseStorage.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseStorage.java b/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseStorage.java
index c1d1b06..dc7aa78 100644
--- a/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseStorage.java
+++ b/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseStorage.java
@@ -159,7 +159,6 @@ public class SQLDatabaseStorage implements Storage {
statement.close();
} catch (SQLException ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -167,8 +166,6 @@ public class SQLDatabaseStorage implements Storage {
conn.close();
} catch (SQLException ignore) {
}
- conn = null;
- conn = null;
}
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/commons/src/main/java/org/apache/oodt/commons/database/DatabaseConnectionBuilder.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/database/DatabaseConnectionBuilder.java b/commons/src/main/java/org/apache/oodt/commons/database/DatabaseConnectionBuilder.java
index b3c0f77..1d98191 100644
--- a/commons/src/main/java/org/apache/oodt/commons/database/DatabaseConnectionBuilder.java
+++ b/commons/src/main/java/org/apache/oodt/commons/database/DatabaseConnectionBuilder.java
@@ -41,7 +41,7 @@ public final class DatabaseConnectionBuilder {
public static final DataSource buildDataSource(String user, String pass,
String driver, String url) {
- DataSource ds = null;
+ DataSource ds;
try {
Class.forName(driver);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 09deb6e..1a9e48b 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
@@ -112,9 +112,9 @@ public class SqlScript {
BufferedReader reader = new BufferedReader(new FileReader(script));
try {
- String line = null;
+ String line;
StringBuilder query = new StringBuilder();
- boolean queryEnds = false;
+ boolean queryEnds;
while ((line = reader.readLine()) != null) {
if (isComment(line))
@@ -195,7 +195,6 @@ public class SqlScript {
} catch (Exception ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -204,7 +203,6 @@ public class SqlScript {
} catch (Exception ignore) {
}
- conn = null;
}
}
}
@@ -239,7 +237,6 @@ public class SqlScript {
} catch (Exception ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -248,7 +245,6 @@ public class SqlScript {
} catch (Exception ignore) {
}
- conn = null;
}
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 1cf857a..939238b 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
@@ -150,7 +150,7 @@ public final class EnvUtilities {
// line by line, and replaceAll on \ with \\
// so \\\\ with \\\\\\\\
BufferedReader reader = new BufferedReader(new InputStreamReader(is));
- String line = null;
+ String line;
StringBuilder buf = new StringBuilder();
while ((line = reader.readLine()) != null) {
@@ -165,7 +165,6 @@ public final class EnvUtilities {
} catch (Exception ignore) {
}
- reader = null;
}
return new ByteArrayInputStream(buf.toString().getBytes());
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/commons/src/main/java/org/apache/oodt/commons/exec/StreamGobbler.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/exec/StreamGobbler.java b/commons/src/main/java/org/apache/oodt/commons/exec/StreamGobbler.java
index e17c829..8ddf691 100644
--- a/commons/src/main/java/org/apache/oodt/commons/exec/StreamGobbler.java
+++ b/commons/src/main/java/org/apache/oodt/commons/exec/StreamGobbler.java
@@ -68,7 +68,7 @@ public class StreamGobbler extends Thread {
InputStreamReader isr = new InputStreamReader(is);
BufferedReader br = new BufferedReader(isr);
- String line = null;
+ String line;
while ((line = br.readLine()) != null && this.running) {
if (pw != null)
pw.println(this.type + ": " + line);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 86142dd..9321741 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
@@ -181,7 +181,7 @@ public class TimeEventWeightedHash {
@Override
public boolean add(E ten) {
- boolean wasAdded = false;
+ boolean wasAdded;
if (wasAdded = super.add(ten))
listSet.add(ten);
return wasAdded;
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 b8063be..bf4b5f5 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
@@ -298,7 +298,7 @@ public class RMIContext implements Context {
* @return A list of the current bindings, as simple string names.
*/
private List getCurrentBindings() throws NamingException {
- List names = null;
+ List names;
try {
Registry registry = getRegistry();
names = Arrays.asList(registry.list());
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 65439e3..e631962 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
@@ -300,7 +300,7 @@ public class XML {
* @throws SAXException If a parse error occurs.
*/
public static Document parse(String string) throws SAXException {
- Document doc = null;
+ Document doc;
try {
DOMParser parser = XML.createDOMParser();
StringReader reader = new StringReader(string);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 17d1eaa..e2e702f 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
@@ -96,7 +96,7 @@ public abstract class ProductCrawler extends ProductCrawlerBean {
File dir = (File) stack.pop();
LOG.log(Level.INFO, "Crawling " + dir);
- File[] productFiles = null;
+ File[] productFiles;
if (isCrawlForDirs()) {
productFiles = dir.listFiles(DIR_FILTER);
} else {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/crawler/src/main/java/org/apache/oodt/cas/crawl/action/FileBasedAction.java
----------------------------------------------------------------------
diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/FileBasedAction.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/FileBasedAction.java
index 32e2648..bfd4fe6 100755
--- a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/FileBasedAction.java
+++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/FileBasedAction.java
@@ -76,7 +76,7 @@ public abstract class FileBasedAction extends CrawlerAction {
}
public File getSelectedFile(File product, Metadata metadata) {
- File selectedFile = null;
+ File selectedFile;
if (file == null && fileKey == null) {
selectedFile = product;
} else if (file != null) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 c23264d..a6d1110 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
@@ -56,7 +56,7 @@ public class CrawlDaemonController {
public double getAverageCrawlTime() throws CrawlException {
Vector argList = new Vector();
- double avgCrawlTime = -1.0d;
+ double avgCrawlTime;
try {
avgCrawlTime = (Double) client.execute(
@@ -73,7 +73,7 @@ public class CrawlDaemonController {
public int getMilisCrawling() throws CrawlException {
Vector argList = new Vector();
- int milisCrawling = -1;
+ int milisCrawling;
try {
milisCrawling = (Integer) client.execute(
@@ -90,7 +90,7 @@ public class CrawlDaemonController {
public int getWaitInterval() throws CrawlException {
Vector argList = new Vector();
- int waitInterval = -1;
+ int waitInterval;
try {
waitInterval = (Integer) client.execute(
@@ -106,7 +106,7 @@ public class CrawlDaemonController {
public int getNumCrawls() throws CrawlException {
Vector argList = new Vector();
- int numCrawls = -1;
+ int numCrawls;
try {
numCrawls = (Integer) client.execute("crawldaemon.getNumCrawls",
@@ -123,7 +123,7 @@ public class CrawlDaemonController {
public boolean isRunning() throws CrawlException {
Vector argList = new Vector();
- boolean running = false;
+ boolean running;
try {
running = (Boolean) client.execute("crawldaemon.isRunning",
@@ -139,7 +139,7 @@ public class CrawlDaemonController {
public void stop() throws CrawlException {
Vector argList = new Vector();
- boolean running = false;
+ boolean running;
try {
running = (Boolean) client.execute("crawldaemon.stop", argList);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 db3c449..e46cd93 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
@@ -88,7 +88,7 @@ public class DirectoryResource extends CurationService {
public String getDirectoryAreaAsHTML(String base, String path,
boolean showFiles) {
StringBuilder html = new StringBuilder();
- String relativePath = null;
+ String relativePath;
try {
relativePath = this.cleansePath(path);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 e1ba9b9..fffeb8b 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
@@ -153,7 +153,7 @@ public class IngestionResource extends CurationService {
Ingester ingest = this.configureIngester();
MetadataResource metService = new MetadataResource();
for (String file : task.getFileList()) {
- Metadata fileMet = null;
+ Metadata fileMet;
try {
String vFilePath = this.getVirtualPath(CurationService.config
.getStagingAreaPath(), file);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 e092ed2..4322ee1 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
@@ -139,7 +139,7 @@ public class MetadataResource extends CurationService {
// this.sendRedirect("login.jsp", uriInfo, res);
- Metadata metadata = null;
+ Metadata metadata;
try {
metadata = this.getStagingMetadata(id, configId, overwrite);
@@ -532,7 +532,7 @@ public class MetadataResource extends CurationService {
try {
// retrieve product from catalog
- Product product = null;
+ Product product;
if (StringUtils.hasText(id)) {
id = id.substring(id.lastIndexOf("/") + 1);
product = fmClient.getProductById(id);
@@ -636,7 +636,7 @@ public class MetadataResource extends CurationService {
try {
// retrieve product from catalog
- Product product = null;
+ Product product;
if (StringUtils.hasText(id)) {
id = id.substring(id.lastIndexOf("/") + 1);
product = CurationService.config.getFileManagerClient().getProductById(id);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 56912d2..b0e0f53 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
@@ -86,8 +86,8 @@ public class PolicyResource extends CurationService {
// calls.
String[] pathToks = tokenizeVirtualPath(path);
- String policy = null;
- String productType = null;
+ String policy;
+ String productType;
if (pathToks == null) {
LOG.log(Level.WARNING, "malformed path token string: "
@@ -181,7 +181,7 @@ public class PolicyResource extends CurationService {
}
private String getProductTypesForPolicy(String policy, String format) {
- String[] typeNames = null;
+ String[] typeNames;
try {
typeNames = this.getProductTypeNamesForPolicy(policy);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.java
----------------------------------------------------------------------
diff --git a/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.java b/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.java
index 9ffd38c..f1f6d35 100644
--- a/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.java
+++ b/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.java
@@ -30,7 +30,7 @@ public class HomePage extends WebPage {
public HomePage() {
super();
CurationApp app = ((CurationApp) Application.get());
- String loggedInLabel = null;
+ String loggedInLabel;
String logoutLabel = "Log Out";
CurationSession session = (CurationSession)getSession();
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
index f72cb8d..0663b95 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
@@ -142,7 +142,7 @@ public class DataSourceCatalog implements Catalog {
*/
public synchronized void addMetadata(Metadata m, Product product)
throws CatalogException {
- List<Element> metadataTypes = null;
+ List<Element> metadataTypes;
try {
metadataTypes = validationLayer.getElements(product
@@ -551,7 +551,6 @@ public class DataSourceCatalog implements Catalog {
} catch (SQLException ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -561,7 +560,6 @@ public class DataSourceCatalog implements Catalog {
} catch (SQLException ignore) {
}
- conn = null;
}
}
@@ -961,8 +959,8 @@ public class DataSourceCatalog implements Catalog {
conn = dataSource.getConnection();
statement = conn.createStatement();
- String getProductSql = null;
- String productTypeIdStr = null;
+ String getProductSql;
+ String productTypeIdStr;
if (fieldIdStringFlag) {
productTypeIdStr = "'" + type.getProductTypeId() + "'";
@@ -2059,7 +2057,6 @@ public class DataSourceCatalog implements Catalog {
} catch (SQLException ignore) {
}
- rs = null;
}
if (statement != null) {
@@ -2068,7 +2065,6 @@ public class DataSourceCatalog implements Catalog {
} catch (SQLException ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -2078,7 +2074,6 @@ public class DataSourceCatalog implements Catalog {
} catch (SQLException ignore) {
}
- conn = null;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 cdb16c7..e027d37 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
@@ -71,7 +71,7 @@ public class DataSourceCatalogFactory implements CatalogFactory {
public DataSourceCatalogFactory() {
// instantiate data source
- String jdbcUrl = null, user = null, pass = null, driver = null;
+ String jdbcUrl, user, pass, driver;
jdbcUrl = PathUtils
.replaceEnvVariables(System
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalog.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalog.java
index 94b9868..075e89d 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalog.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalog.java
@@ -1040,7 +1040,6 @@ public class ScienceDataCatalog implements Catalog {
rs.close();
} catch (Exception ignore) {
}
- rs = null;
}
if (statement != null) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalogFactory.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalogFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalogFactory.java
index 19910b7..1340716 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalogFactory.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalogFactory.java
@@ -48,7 +48,7 @@ public class ScienceDataCatalogFactory implements CatalogFactory {
public ScienceDataCatalogFactory() {
- String jdbcUrl = null, user = null, pass = null, driver = null;
+ String jdbcUrl, user, pass, driver;
jdbcUrl = PathUtils.replaceEnvVariables(System
.getProperty("org.apache.cas.filemgr.catalog.science.jdbc.url"));
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/RetrieveFilesCliAction.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/RetrieveFilesCliAction.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/RetrieveFilesCliAction.java
index 187ef90..c668649 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/RetrieveFilesCliAction.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/RetrieveFilesCliAction.java
@@ -44,7 +44,7 @@ public class RetrieveFilesCliAction extends FileManagerCliAction {
try {
XmlRpcFileManagerClient fmClient = getClient();
dt.setFileManagerUrl(fmClient.getFileManagerUrl());
- Product product = null;
+ Product product;
if (productId != null) {
product = fmClient.getProductById(productId);
} else if (productName != null) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java
index 0018916..8d0c397 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java
@@ -116,7 +116,7 @@ public class RemoteDataTransferer implements DataTransfer {
// for each file reference, transfer the file to the remote file manager
for (Reference r : product.getProductReferences()) {
// test whether or not the reference is a directory or a file
- File refFile = null;
+ File refFile;
try {
refFile = new File(new URI(r.getOrigReference()));
} catch (URISyntaxException e) {
@@ -171,7 +171,7 @@ public class RemoteDataTransferer implements DataTransfer {
"RemoteDataTransfer: Copying File: " + "fmp:"
+ dataStoreFile.getAbsolutePath() + " to " + "file:"
+ dest.getAbsolutePath());
- byte[] fileData = null;
+ byte[] fileData;
int offset = 0;
while (true) {
fileData = (byte[]) client.retrieveFile(
@@ -222,7 +222,7 @@ public class RemoteDataTransferer implements DataTransfer {
try {
is = new FileInputStream(origFile);
int offset = 0;
- int numBytes = 0;
+ int numBytes;
// remove the file if it already exists: this operation
// is an overwrite
@@ -252,7 +252,6 @@ public class RemoteDataTransferer implements DataTransfer {
} catch (Exception ignore) {
}
- is = null;
}
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 f743c65..86f1794 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
@@ -154,7 +154,7 @@ public class TransferStatusTracker {
}
private long getBytesTransferred(Reference r) {
- File destFile = null;
+ File destFile;
try {
destFile = new File(new URI(r.getDataStoreReference()));
@@ -169,7 +169,7 @@ public class TransferStatusTracker {
}
private List<Reference> quietGetReferences(Product p) {
- List<Reference> refs = null;
+ List<Reference> refs;
try {
refs = catalog.getProductReferences(p);
@@ -186,7 +186,7 @@ public class TransferStatusTracker {
}
private boolean isDir(Reference r) {
- File fileRef = null;
+ File fileRef;
try {
fileRef = new File(new URI(r.getDataStoreReference()));
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CmdLineIngester.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CmdLineIngester.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CmdLineIngester.java
index b810c7d..4aa9912 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CmdLineIngester.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CmdLineIngester.java
@@ -102,7 +102,7 @@ public class CmdLineIngester extends StdIngester {
}
CmdLineIngester ingester = new CmdLineIngester(transferServiceFactory);
- MetExtractor extractor = null;
+ MetExtractor extractor;
if (readFromStdin) {
List<String> prods = readProdFilesFromStdin();
extractor = GenericMetadataObjectFactory
@@ -110,7 +110,7 @@ public class CmdLineIngester extends StdIngester {
ingester.ingest(new URL(fmUrlStr), prods, extractor, new File(
metConfFilePath));
} else {
- String productID = null;
+ String productID;
if (metFilePath != null) {
productID = ingester.ingest(new URL(fmUrlStr), new File(
filePath), new SerializableMetadata(
@@ -129,7 +129,7 @@ public class CmdLineIngester extends StdIngester {
private static List<String> readProdFilesFromStdin() {
List<String> prodFiles = new Vector<String>();
- BufferedReader br = null;
+ BufferedReader br;
br = new BufferedReader(new InputStreamReader(System.in));
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java
index 1e22209..7b6a5c2 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java
@@ -97,7 +97,7 @@ public class StdIngester implements Ingester, CoreMetKeys {
*/
public String ingest(URL fmUrl, File prodFile, MetExtractor extractor,
File metConfFile) throws IngestException {
- Metadata met = null;
+ Metadata met;
try {
met = extractor.extractMetadata(prodFile, metConfFile);
} catch (MetExtractionException e) {
@@ -119,7 +119,7 @@ public class StdIngester implements Ingester, CoreMetKeys {
MetExtractor extractor, File metConfFile) {
if (prodFiles != null && prodFiles.size() > 0) {
for (String prodFilePath : prodFiles) {
- String productID = null;
+ String productID;
try {
productID = ingest(fmUrl, new File(prodFilePath),
@@ -205,7 +205,7 @@ public class StdIngester implements Ingester, CoreMetKeys {
+ productType + "]: " + FILE_LOCATION + ": [" + fileLocation
+ "]");
- String productID = null;
+ String productID;
try {
productID = fmClient.ingestProduct(product, met, true);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/AbstractFilemgrMetExtractor.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/AbstractFilemgrMetExtractor.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/AbstractFilemgrMetExtractor.java
index b60f556..5eec97d 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/AbstractFilemgrMetExtractor.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/AbstractFilemgrMetExtractor.java
@@ -18,6 +18,11 @@
package org.apache.oodt.cas.filemgr.metadata.extractors;
//JDK imports
+import org.apache.oodt.cas.filemgr.structs.Product;
+import org.apache.oodt.cas.filemgr.structs.Reference;
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
+
import java.io.File;
import java.net.URI;
import java.net.URISyntaxException;
@@ -25,10 +30,6 @@ import java.util.List;
import java.util.Properties;
//OODT imports
-import org.apache.oodt.cas.filemgr.structs.Product;
-import org.apache.oodt.cas.filemgr.structs.Reference;
-import org.apache.oodt.cas.metadata.Metadata;
-import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
/**
* @author mattmann
@@ -109,7 +110,7 @@ public abstract class AbstractFilemgrMetExtractor implements
protected File getProductFile(Product product)
throws MetExtractionException {
- File prodFile = null;
+ File prodFile;
if (product.getProductStructure()
.equals(Product.STRUCTURE_HIERARCHICAL)) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/DataSourceRepositoryManagerFactory.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/DataSourceRepositoryManagerFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/DataSourceRepositoryManagerFactory.java
index 9e36863..0d79942 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/DataSourceRepositoryManagerFactory.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/DataSourceRepositoryManagerFactory.java
@@ -44,7 +44,7 @@ public class DataSourceRepositoryManagerFactory implements
* </p>.
*/
public DataSourceRepositoryManagerFactory() {
- String jdbcUrl = null, user = null, pass = null, driver = null;
+ String jdbcUrl, user, pass, driver;
jdbcUrl = System
.getProperty("org.apache.oodt.cas.filemgr.repositorymgr.datasource.jdbc.url");
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/ScienceDataRepositoryManager.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/ScienceDataRepositoryManager.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/ScienceDataRepositoryManager.java
index 8d889fc..a7d988a 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/ScienceDataRepositoryManager.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/ScienceDataRepositoryManager.java
@@ -84,7 +84,6 @@ public class ScienceDataRepositoryManager implements RepositoryManager {
statement.close();
} catch (Exception ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -92,7 +91,6 @@ public class ScienceDataRepositoryManager implements RepositoryManager {
conn.close();
} catch (Exception ignore) {
}
- conn = null;
}
}
@@ -131,7 +129,6 @@ public class ScienceDataRepositoryManager implements RepositoryManager {
rs.close();
} catch (Exception ignore) {
}
- rs = null;
}
if (statement != null) {
@@ -139,7 +136,6 @@ public class ScienceDataRepositoryManager implements RepositoryManager {
statement.close();
} catch (Exception ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -147,7 +143,6 @@ public class ScienceDataRepositoryManager implements RepositoryManager {
conn.close();
} catch (Exception ignore) {
}
- conn = null;
}
}
@@ -186,7 +181,6 @@ public class ScienceDataRepositoryManager implements RepositoryManager {
rs.close();
} catch (Exception ignore) {
}
- rs = null;
}
if (statement != null) {
@@ -194,7 +188,6 @@ public class ScienceDataRepositoryManager implements RepositoryManager {
statement.close();
} catch (Exception ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -202,7 +195,6 @@ public class ScienceDataRepositoryManager implements RepositoryManager {
conn.close();
} catch (Exception ignore) {
}
- conn = null;
}
}
@@ -238,7 +230,6 @@ public class ScienceDataRepositoryManager implements RepositoryManager {
rs.close();
} catch (Exception ignore) {
}
- rs = null;
}
if (statement != null) {
@@ -246,7 +237,6 @@ public class ScienceDataRepositoryManager implements RepositoryManager {
statement.close();
} catch (Exception ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -254,7 +244,6 @@ public class ScienceDataRepositoryManager implements RepositoryManager {
conn.close();
} catch (Exception ignore) {
}
- conn = null;
}
}
@@ -290,7 +279,6 @@ public class ScienceDataRepositoryManager implements RepositoryManager {
statement.close();
} catch (Exception ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -298,7 +286,6 @@ public class ScienceDataRepositoryManager implements RepositoryManager {
conn.close();
} catch (Exception ignore) {
}
- conn = null;
}
}
@@ -332,7 +319,6 @@ public class ScienceDataRepositoryManager implements RepositoryManager {
statement.close();
} catch (Exception ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -340,7 +326,6 @@ public class ScienceDataRepositoryManager implements RepositoryManager {
conn.close();
} catch (Exception ignore) {
}
- conn = null;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/ScienceDataRepositoryManagerFactory.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/ScienceDataRepositoryManagerFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/ScienceDataRepositoryManagerFactory.java
index 70a5c50..eaeffc0 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/ScienceDataRepositoryManagerFactory.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/ScienceDataRepositoryManagerFactory.java
@@ -40,7 +40,7 @@ public class ScienceDataRepositoryManagerFactory implements
private DataSource dataSource;
public ScienceDataRepositoryManagerFactory() {
- String jdbcUrl = null, user = null, pass = null, driver = null;
+ String jdbcUrl, user, pass, driver;
jdbcUrl = PathUtils
.replaceEnvVariables(System
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManager.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManager.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManager.java
index 2894f6b..1c8623e 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManager.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManager.java
@@ -156,7 +156,7 @@ public class XMLRepositoryManager implements RepositoryManager {
private void saveProductTypes() {
for (String dirUri : productTypeHomeUris) {
- File productTypeDir = null;
+ File productTypeDir;
try {
productTypeDir = new File(new URI(dirUri));
@@ -255,12 +255,12 @@ public class XMLRepositoryManager implements RepositoryManager {
private Document getDocumentRoot(String xmlFile) {
// open up the XML file
- DocumentBuilderFactory factory = null;
- DocumentBuilder parser = null;
- Document document = null;
- InputSource inputSource = null;
+ DocumentBuilderFactory factory;
+ DocumentBuilder parser;
+ Document document;
+ InputSource inputSource;
- InputStream xmlInputStream = null;
+ InputStream xmlInputStream;
try {
xmlInputStream = new File(xmlFile).toURI().toURL().openStream();
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java
index a753dd7..7615bab 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java
@@ -123,7 +123,7 @@ public class FreeTextQueryCriteria extends QueryCriteria {
// tokenize string using default delimiters
StringTokenizer tok = new StringTokenizer(text);
- String token = null;
+ String token;
// filter noise words and add to values vector
while (tok.hasMoreElements()) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 9ae6b4f..5f26656 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
@@ -278,7 +278,7 @@ public class Product {
public Document toXML() throws Exception {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
factory.setNamespaceAware(true);
- Document doc = null;
+ Document doc;
try {
DocumentBuilder builder = factory.newDocumentBuilder();
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
index 04ad7c3..baa30e1 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
@@ -413,7 +413,7 @@ public class XmlRpcFileManager {
public Vector<Hashtable<String, Object>> getProductTypes()
throws RepositoryManagerException {
- List<ProductType> productTypeList = null;
+ List<ProductType> productTypeList;
try {
productTypeList = repositoryManager.getProductTypes();
@@ -431,7 +431,7 @@ public class XmlRpcFileManager {
public Vector<Hashtable<String, Object>> getProductReferences(
Hashtable<String, Object> productHash)
throws CatalogException {
- List<Reference> referenceList = null;
+ List<Reference> referenceList;
Product product = XmlRpcStructFactory.getProductFromXmlRpc(productHash);
try {
@@ -652,7 +652,7 @@ public class XmlRpcFileManager {
public Hashtable<String, Object> getProductTypeById(String productTypeId)
throws RepositoryManagerException {
- ProductType type = null;
+ ProductType type;
try {
type = repositoryManager.getProductTypeById(productTypeId);
@@ -716,7 +716,7 @@ public class XmlRpcFileManager {
// version the product
if (!clientTransfer || (Boolean.getBoolean("org.apache.oodt.cas.filemgr.serverside.versioning"))) {
- Versioner versioner = null;
+ Versioner versioner;
try {
versioner = GenericFileManagerObjectFactory
.getVersionerFromClassName(p.getProductType().getVersioner());
@@ -853,12 +853,10 @@ public class XmlRpcFileManager {
} catch (Exception ignore) {
}
- fOut = null;
}
}
- outFile = null;
- return success;
+ return success;
}
public boolean moveProduct(Hashtable<String, Object> productHash, String newPath)
@@ -1337,7 +1335,7 @@ public class XmlRpcFileManager {
System.getProperties().load(new FileInputStream(new File(configFile)));
}
- String metaFactory = null, dataFactory = null, transferFactory = null;
+ String metaFactory, dataFactory, transferFactory;
metaFactory = System.getProperty("filemgr.catalog.factory",
"org.apache.oodt.cas.filemgr.catalog.DataSourceCatalogFactory");
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java
index d4ea841..e766167 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java
@@ -151,7 +151,7 @@ public class CatalogSearch {
}
public static void listElements() {
- Vector products = new Vector();
+ Vector products;
try {
products = (Vector) client.getProductTypes();
for (Object product : products) {
@@ -377,7 +377,7 @@ public class CatalogSearch {
System.out.println(welcomeMessage);
- String command = "";
+ String command;
for (;;) {
System.out.print("CatalogSearch>");
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/DeleteProduct.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/DeleteProduct.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/DeleteProduct.java
index 5609799..2912688 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/DeleteProduct.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/DeleteProduct.java
@@ -121,7 +121,7 @@ public class DeleteProduct {
private static List readProdIdsFromStdin() {
List prodIds = new Vector();
- BufferedReader br = null;
+ BufferedReader br;
br = new BufferedReader(new InputStreamReader(System.in));
@@ -141,7 +141,6 @@ public class DeleteProduct {
} catch (Exception ignore) {
}
- br = null;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ExpImpCatalog.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ExpImpCatalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ExpImpCatalog.java
index b41819e..bbb764e 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ExpImpCatalog.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ExpImpCatalog.java
@@ -182,7 +182,7 @@ public class ExpImpCatalog {
}
private void exportTypeToDest(ProductType type) throws Exception {
- ProductPage page = null;
+ ProductPage page;
if (this.srcCatalog != null) {
page = srcCatalog.getFirstPage(type);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataDumper.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataDumper.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataDumper.java
index 86a0cf8..bc2c26e 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataDumper.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataDumper.java
@@ -70,7 +70,7 @@ public final class MetadataDumper {
}
private Metadata getMetadata(String productId) {
- Product product = null;
+ Product product;
try {
product = this.fmClient.getProductById(productId);
@@ -79,7 +79,7 @@ public final class MetadataDumper {
+ productId + "] by id");
}
- Metadata met = null;
+ Metadata met;
try {
met = this.fmClient.getMetadata(product);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/OptimizeLuceneCatalog.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/OptimizeLuceneCatalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/OptimizeLuceneCatalog.java
index 0b535e8..2d402fc 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/OptimizeLuceneCatalog.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/OptimizeLuceneCatalog.java
@@ -77,7 +77,6 @@ public class OptimizeLuceneCatalog {
writer.close();
} catch (Exception ignore) {
}
- writer = null;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ProductDumper.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ProductDumper.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ProductDumper.java
index 245185e..289d1b6 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ProductDumper.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ProductDumper.java
@@ -69,7 +69,7 @@ public final class ProductDumper {
}
private Product getProduct(String productId) {
- Product product = null;
+ Product product;
try {
product = this.fmClient.getProductById(productId);
@@ -99,7 +99,7 @@ public final class ProductDumper {
}
private Metadata getMetadata(Product product) {
- Metadata met = null;
+ Metadata met;
try {
met = this.fmClient.getMetadata(product);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 01ad642..80245ae 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
@@ -96,7 +96,7 @@ public final class QueryTool {
public List query(org.apache.oodt.cas.filemgr.structs.Query query) {
List prodIds = new Vector();
- List products = new Vector();
+ List products;
List productTypes = safeGetProductTypes();
[05/16] oodt git commit: fix duplicate throws
Posted by ma...@apache.org.
fix duplicate throws
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/17810605
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/17810605
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/17810605
Branch: refs/heads/master
Commit: 178106052f4090a05501d743de71743214ed8592
Parents: 82400c1
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Oct 25 15:43:01 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Oct 25 15:43:01 2015 +0000
----------------------------------------------------------------------
.../main/java/org/apache/oodt/commons/Configuration.java | 2 +-
.../java/org/apache/oodt/commons/ConfigurationTest.java | 2 +-
.../activity/DatagramLoggingActivityFactoryTest.java | 2 +-
.../oodt/cas/crawl/typedetection/MimeExtractorRepo.java | 2 +-
.../oodt/cas/curation/service/MetadataResource.java | 10 +++++-----
.../oodt/cas/curation/util/ExtractorConfigReader.java | 2 +-
.../oodt/cas/curation/util/ExtractorConfigWriter.java | 2 +-
.../filemgr/catalog/MappedDataSourceCatalogFactory.java | 4 ++--
.../apache/oodt/cas/filemgr/system/XmlRpcFileManager.java | 2 +-
.../org/apache/oodt/cas/filemgr/tools/SolrIndexer.java | 2 +-
.../java/org/apache/oodt/cas/pge/PGETaskInstance.java | 4 ++--
.../oodt/cas/pge/config/XmlFilePgeConfigBuilder.java | 2 +-
.../main/java/org/apache/oodt/cas/pge/util/XmlHelper.java | 6 +++---
.../oodt/profile/handlers/DatabaseProfileManager.java | 2 +-
.../apache/oodt/cas/protocol/http/util/TestHttpUtils.java | 6 +++---
.../java/org/apache/oodt/cas/pushpull/config/Config.java | 2 +-
.../cas/pushpull/retrievalsystem/FileRetrievalSystem.java | 4 ++--
.../oodt/cas/workflow/system/XmlRpcWorkflowManager.java | 2 +-
18 files changed, 29 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/17810605/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 e821628..740d810 100644
--- a/commons/src/main/java/org/apache/oodt/commons/Configuration.java
+++ b/commons/src/main/java/org/apache/oodt/commons/Configuration.java
@@ -72,7 +72,7 @@ public class Configuration {
* @throws MalformedURLException If the URL specification is invalid.
* @return An initialized configuration object.
*/
- public static Configuration getConfiguration() throws IOException, SAXException, MalformedURLException {
+ public static Configuration getConfiguration() throws IOException, SAXException {
// Got one? Use it.
if (configuration != null) return configuration;
http://git-wip-us.apache.org/repos/asf/oodt/blob/17810605/commons/src/test/java/org/apache/oodt/commons/ConfigurationTest.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/oodt/commons/ConfigurationTest.java b/commons/src/test/java/org/apache/oodt/commons/ConfigurationTest.java
index a90ee42..b37df44 100644
--- a/commons/src/test/java/org/apache/oodt/commons/ConfigurationTest.java
+++ b/commons/src/test/java/org/apache/oodt/commons/ConfigurationTest.java
@@ -53,7 +53,7 @@ public class ConfigurationTest extends TestCase {
}
/** Test the various property methods. */
- public void testConfiguration() throws IOException, SAXException, MalformedURLException {
+ public void testConfiguration() throws IOException, SAXException {
Configuration c = new Configuration(tmpFile.toURL());
Properties props = new Properties();
props.setProperty("globalKey1", "preset-value");
http://git-wip-us.apache.org/repos/asf/oodt/blob/17810605/commons/src/test/java/org/apache/oodt/commons/activity/DatagramLoggingActivityFactoryTest.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/oodt/commons/activity/DatagramLoggingActivityFactoryTest.java b/commons/src/test/java/org/apache/oodt/commons/activity/DatagramLoggingActivityFactoryTest.java
index c49c9eb..e172843 100755
--- a/commons/src/test/java/org/apache/oodt/commons/activity/DatagramLoggingActivityFactoryTest.java
+++ b/commons/src/test/java/org/apache/oodt/commons/activity/DatagramLoggingActivityFactoryTest.java
@@ -109,7 +109,7 @@ public class DatagramLoggingActivityFactoryTest extends TestCase {
* @throws IOException if an error occurs.
* @throws ClassNotFoundException if an error occurs.
*/
- public void testActivityReceipt() throws SocketException, IOException, ClassNotFoundException {
+ public void testActivityReceipt() throws IOException, ClassNotFoundException {
DatagramSocket socket = null;
try {
byte[] buf = new byte[512];
http://git-wip-us.apache.org/repos/asf/oodt/blob/17810605/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MimeExtractorRepo.java
----------------------------------------------------------------------
diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MimeExtractorRepo.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MimeExtractorRepo.java
index 79c27ac..068d48f 100644
--- a/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MimeExtractorRepo.java
+++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MimeExtractorRepo.java
@@ -124,7 +124,7 @@ public class MimeExtractorRepo {
}
public synchronized List<MetExtractorSpec> getExtractorSpecsForFile(
- File file) throws FileNotFoundException, IOException {
+ File file) throws IOException {
String mimeType = this.mimeRepo.getMimeType(file);
if (mimeType == null && magic)
mimeType = this.mimeRepo.getMimeTypeByMagic(MimeTypeUtils
http://git-wip-us.apache.org/repos/asf/oodt/blob/17810605/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 7889906..3d3ec1a 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
@@ -210,7 +210,7 @@ public class MetadataResource extends CurationService {
* @throws MetExtractionException
*/
protected Metadata getStagingMetadata(String id, String configId,
- Boolean overwrite) throws FileNotFoundException, InstantiationException,
+ Boolean overwrite) throws InstantiationException,
IOException, MetExtractionException {
if (configId == null || configId.trim().length() == 0) {
return this.readMetFile(id + CurationService.config.getMetExtension());
@@ -450,7 +450,7 @@ public class MetadataResource extends CurationService {
* If there is an IO problem opening the met file.
*/
public Metadata readMetFile(String file) throws InstantiationException,
- FileNotFoundException, IOException {
+ IOException {
SerializableMetadata metadata = new SerializableMetadata("UTF-8", false);
metadata.loadMetadataFromXmlStream(new FileInputStream(config
.getMetAreaPath()
@@ -489,7 +489,7 @@ public class MetadataResource extends CurationService {
* If there is an IO exception writing the {@link File}.
*/
public void writeMetFile(String id, Metadata metadata)
- throws FileNotFoundException, IOException {
+ throws IOException {
SerializableMetadata serMet = new SerializableMetadata(metadata, "UTF-8",
false);
serMet.writeMetadataToXmlStream(new FileOutputStream(new File(config
@@ -596,7 +596,7 @@ public class MetadataResource extends CurationService {
* @throws FileNotFoundException
*/
public void updateCatalogMetadata(Product product, Metadata newMetadata)
- throws CatalogException, FileNotFoundException, IOException {
+ throws CatalogException, IOException {
System.getProperties().load(
new FileInputStream(CurationService.config.getFileMgrProps()));
Catalog catalog = this.getCatalog();
@@ -672,7 +672,7 @@ public class MetadataResource extends CurationService {
* If any error occurs during this delete operation.
*/
public void deleteCatalogProduct(Product product)
- throws FileNotFoundException, IOException, CatalogException {
+ throws IOException, CatalogException {
CurationService.config.getFileManagerClient().removeProduct(product);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/17810605/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 638b61b..33f73fa 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
@@ -31,7 +31,7 @@ import java.util.Properties;
public class ExtractorConfigReader {
public static ExtractorConfig readFromDirectory(File directory,
- String configId) throws FileNotFoundException, IOException {
+ String configId) throws IOException {
File propsFileDir = new File(directory, configId);
Properties props = new Properties();
props
http://git-wip-us.apache.org/repos/asf/oodt/blob/17810605/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 5571c23..3a3a08e 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
@@ -30,7 +30,7 @@ import java.util.Iterator;
public class ExtractorConfigWriter {
public static void saveToDirectory(ExtractorConfig config, File dir)
- throws FileNotFoundException, IOException {
+ throws IOException {
Properties props = new Properties();
props.setProperty(ExtractorConfig.PROP_CLASS_NAME, config.getClassName());
File configDir = new File(dir, config.getIdentifier());
http://git-wip-us.apache.org/repos/asf/oodt/blob/17810605/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/MappedDataSourceCatalogFactory.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/MappedDataSourceCatalogFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/MappedDataSourceCatalogFactory.java
index ece146a..df3d1ff 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/MappedDataSourceCatalogFactory.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/MappedDataSourceCatalogFactory.java
@@ -47,8 +47,8 @@ public class MappedDataSourceCatalogFactory extends DataSourceCatalogFactory {
private static final String TYPE_MAP_KEY = "org.apache.oodt.cas.filemgr."
+ "catalog.mappeddatasource.mapFile";
- public MappedDataSourceCatalogFactory() throws FileNotFoundException,
- IOException {
+ public MappedDataSourceCatalogFactory() throws
+ IOException {
super();
String mapFilePath = PathUtils.replaceEnvVariables(System
.getProperty(TYPE_MAP_KEY));
http://git-wip-us.apache.org/repos/asf/oodt/blob/17810605/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
index a003828..0adb7bf 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
@@ -1326,7 +1326,7 @@ public class XmlRpcFileManager {
return pMet;
}
- private void loadConfiguration() throws FileNotFoundException, IOException {
+ private void loadConfiguration() throws IOException {
// set up the configuration, if there is any
if (System.getProperty("org.apache.oodt.cas.filemgr.properties") != null) {
String configFile = System
http://git-wip-us.apache.org/repos/asf/oodt/blob/17810605/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
index 936fb1f..609b6af 100755
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
@@ -204,7 +204,7 @@ public class SolrIndexer {
* When an error occurs communicating with the Solr server instance.
*/
public void indexMetFile(File file, boolean delete)
- throws InstantiationException, FileNotFoundException, IOException,
+ throws InstantiationException, IOException,
SolrServerException {
LOG.info("Attempting to index product from metadata file.");
try {
http://git-wip-us.apache.org/repos/asf/oodt/blob/17810605/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java b/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java
index da410a6..108892c 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java
@@ -447,7 +447,7 @@ public class PGETaskInstance implements WorkflowTaskInstance {
return returnCode == 0;
}
- protected void processOutput() throws FileNotFoundException, IOException {
+ protected void processOutput() throws IOException {
for (final OutputDir outputDir : this.pgeConfig.getOuputDirs()) {
File[] createdFiles = new File(outputDir.getPath()).listFiles();
for (File createdFile : createdFiles) {
@@ -493,7 +493,7 @@ public class PGETaskInstance implements WorkflowTaskInstance {
}
protected void writeFromMetadata(Metadata metadata, String toMetFilePath)
- throws FileNotFoundException, IOException {
+ throws IOException {
new SerializableMetadata(metadata, "UTF-8", false)
.writeMetadataToXmlStream(new FileOutputStream(toMetFilePath));
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/17810605/pge/src/main/java/org/apache/oodt/cas/pge/config/XmlFilePgeConfigBuilder.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/config/XmlFilePgeConfigBuilder.java b/pge/src/main/java/org/apache/oodt/cas/pge/config/XmlFilePgeConfigBuilder.java
index cd518e3..bcf1be2 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/config/XmlFilePgeConfigBuilder.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/config/XmlFilePgeConfigBuilder.java
@@ -148,7 +148,7 @@ public class XmlFilePgeConfigBuilder implements PgeConfigBuilder {
}
private void loadCustomMetadata(Element root, PgeMetadata pgeMetadata)
- throws MalformedURLException, Exception {
+ throws Exception {
// Check if there is a 'customMetadata' elem and load it.
Element customMetadataElem = getCustomMetadataElement(root);
http://git-wip-us.apache.org/repos/asf/oodt/blob/17810605/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java b/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java
index eb52905..532e607 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java
@@ -333,17 +333,17 @@ public class XmlHelper {
}
public static String getDir(Element elem, Metadata metadata)
- throws MalformedURLException, Exception {
+ throws Exception {
return fillIn(elem.getAttribute(DIR_ATTR), metadata);
}
public static String getShellType(Element elem, Metadata metadata)
- throws MalformedURLException, Exception {
+ throws Exception {
return fillIn(elem.getAttribute(SHELL_TYPE_ATTR), metadata);
}
public static List<String> getExeCmds(Element elem, Metadata metadata)
- throws MalformedURLException, DOMException, Exception {
+ throws Exception {
List<String> exeCmds = Lists.newArrayList();
NodeList nodeList = elem.getElementsByTagName(CMD_TAG);
for (int i = 0; i < nodeList.getLength(); i++) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/17810605/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java b/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java
index af95a44..f2b1eb4 100755
--- a/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java
+++ b/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java
@@ -77,7 +77,7 @@ public abstract class DatabaseProfileManager implements ProfileManager
**
***********************************************************************/
- public DatabaseProfileManager(Properties props) throws SQLException, Exception {
+ public DatabaseProfileManager(Properties props) throws Exception {
this(props, openConnection(props));
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/17810605/protocol/http/src/test/java/org/apache/oodt/cas/protocol/http/util/TestHttpUtils.java
----------------------------------------------------------------------
diff --git a/protocol/http/src/test/java/org/apache/oodt/cas/protocol/http/util/TestHttpUtils.java b/protocol/http/src/test/java/org/apache/oodt/cas/protocol/http/util/TestHttpUtils.java
index 67903ec..a6a16dc 100644
--- a/protocol/http/src/test/java/org/apache/oodt/cas/protocol/http/util/TestHttpUtils.java
+++ b/protocol/http/src/test/java/org/apache/oodt/cas/protocol/http/util/TestHttpUtils.java
@@ -62,7 +62,7 @@ public class TestHttpUtils extends TestCase {
assertEquals("http://localhost/base/directory/path/to/file", resolvedRelativeUri.toString());
}
- public void testConnectUrl() throws MalformedURLException, IOException {
+ public void testConnectUrl() throws IOException {
HttpURLConnection conn = HttpUtils.connect(new URL(APACHE_SVN_SITE + URL_OF_THIS_TEST));
assertNotSame(0, conn.getDate());
String urlText = HttpUtils.readUrl(conn);
@@ -150,7 +150,7 @@ public class TestHttpUtils extends TestCase {
assertFalse(matcher.find());
}
- public void testFindLinks() throws MalformedURLException, IOException, URISyntaxException {
+ public void testFindLinks() throws IOException, URISyntaxException {
URL url = new URL(APACHE_SVN_SITE + PARENT_URL_OF_THIS_TEST);
HttpFile parent = new HttpFile(PARENT_URL_OF_THIS_TEST, true, url);
HttpURLConnection conn = HttpUtils.connect(url);
@@ -165,7 +165,7 @@ public class TestHttpUtils extends TestCase {
assertTrue(foundThisTest);
}
- public void testIsDirectory() throws MalformedURLException, IOException {
+ public void testIsDirectory() throws IOException {
assertTrue(HttpUtils.isDirectory(new URL(APACHE_SVN_SITE + PARENT_URL_OF_THIS_TEST), ""));
assertFalse(HttpUtils.isDirectory(new URL(APACHE_SVN_SITE + URL_OF_THIS_TEST), ""));
assertTrue(HttpUtils.isDirectory(new URL(APACHE_SVN_SITE), ""));
http://git-wip-us.apache.org/repos/asf/oodt/blob/17810605/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/Config.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/Config.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/Config.java
index a83a3ce..ddf35de 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/Config.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/Config.java
@@ -174,7 +174,7 @@ public class Config implements ConfigMetKeys {
* @throws ClassNotFoundException
*/
void loadProperties() throws ConfigException, InstantiationException,
- FileNotFoundException, IOException, ClassNotFoundException {
+ IOException, ClassNotFoundException {
this.loadExternalConfigFiles();
this.loadProtocolTypes();
this.loadParserInfo();
http://git-wip-us.apache.org/repos/asf/oodt/blob/17810605/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 8c7bf65..4dcaf97 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
@@ -276,8 +276,8 @@ public class FileRetrievalSystem {
+ dir);
}
- public void changeToRoot(RemoteSite remoteSite) throws ProtocolException,
- MalformedURLException, org.apache.oodt.cas.protocol.exceptions.ProtocolException {
+ public void changeToRoot(RemoteSite remoteSite) throws
+ MalformedURLException, org.apache.oodt.cas.protocol.exceptions.ProtocolException {
if (validate(remoteSite))
protocolHandler.cdToROOT(protocolHandler
.getAppropriateProtocolBySite(remoteSite, true));
http://git-wip-us.apache.org/repos/asf/oodt/blob/17810605/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 7e7d732..8945059 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
@@ -624,7 +624,7 @@ public class XmlRpcWorkflowManager {
}
}
- public static void loadProperties() throws FileNotFoundException, IOException {
+ public static void loadProperties() throws IOException {
String configFile = System.getProperty(PROPERTIES_FILE_PROPERTY);
if (configFile != null) {
LOG.log(Level.INFO,
[02/16] oodt git commit: OODT-902 tidy up fix enums
Posted by ma...@apache.org.
OODT-902 tidy up fix enums
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/39306ff3
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/39306ff3
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/39306ff3
Branch: refs/heads/master
Commit: 39306ff369ae6714cda845e6d3549dee155c8dec
Parents: 73d960e
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Oct 25 15:32:31 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Oct 25 15:32:31 2015 +0000
----------------------------------------------------------------------
.../cas/workflow/gui/perspective/view/View.java | 2 +-
.../cas/catalog/query/parser/QueryParser.java | 20 ----------------
.../org/apache/oodt/cas/catalog/term/Term.java | 6 ++---
.../validator/CmdLineOptionValidator.java | 2 +-
.../org/apache/oodt/cas/cli/util/ParsedArg.java | 2 +-
.../handler/TestApplyToActionHandler.java | 3 ++-
.../org/apache/oodt/commons/date/DateUtils.java | 2 +-
.../oodt/cas/crawl/status/IngestStatus.java | 2 +-
.../oodt/cas/filemgr/tools/QueryTool.java | 4 ++--
.../cli/action/TestGetPrevPageCliAction.java | 2 +-
.../oodt/cas/pge/metadata/PgeMetadata.java | 2 +-
.../oodt/profile/ProfileAttributesTest.java | 4 ++--
.../oodt/profile/ProfileElementTestCase.java | 2 +-
.../oodt/profile/ResourceAttributesTest.java | 24 ++++++++++----------
14 files changed, 29 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/39306ff3/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/View.java
----------------------------------------------------------------------
diff --git a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/View.java b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/View.java
index b669267..4f6c35d 100644
--- a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/View.java
+++ b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/View.java
@@ -36,7 +36,7 @@ public abstract class View extends JPanel {
private static final long serialVersionUID = -708692459667309413L;
public enum Mode {
- DELETE, EDIT, MOVE, ZOOM_IN, ZOOM_OUT;
+ DELETE, EDIT, MOVE, ZOOM_IN, ZOOM_OUT
}
private Vector<ViewListener> listeners;
http://git-wip-us.apache.org/repos/asf/oodt/blob/39306ff3/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 229d3f8..8150c10 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
@@ -64,7 +64,6 @@ import java.util.Vector;
label_1:
while (true) {
if (jj_2_1(2147483647)) {
- ;
} else {
break label_1;
}
@@ -172,7 +171,6 @@ import java.util.Vector;
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SPACE:
- ;
break;
default:
jj_la1[1] = jj_gen;
@@ -185,7 +183,6 @@ import java.util.Vector;
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SPACE:
- ;
break;
default:
jj_la1[2] = jj_gen;
@@ -198,7 +195,6 @@ import java.util.Vector;
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SPACE:
- ;
break;
default:
jj_la1[3] = jj_gen;
@@ -211,7 +207,6 @@ import java.util.Vector;
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SPACE:
- ;
break;
default:
jj_la1[4] = jj_gen;
@@ -226,7 +221,6 @@ import java.util.Vector;
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SPACE:
- ;
break;
default:
jj_la1[5] = jj_gen;
@@ -238,13 +232,11 @@ import java.util.Vector;
break;
default:
jj_la1[6] = jj_gen;
- ;
}
label_7:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SPACE:
- ;
break;
default:
jj_la1[7] = jj_gen;
@@ -295,7 +287,6 @@ import java.util.Vector;
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SPACE:
- ;
break;
default:
jj_la1[8] = jj_gen;
@@ -328,7 +319,6 @@ import java.util.Vector;
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SPACE:
- ;
break;
default:
jj_la1[10] = jj_gen;
@@ -415,7 +405,6 @@ import java.util.Vector;
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SPACE:
- ;
break;
default:
jj_la1[11] = jj_gen;
@@ -428,7 +417,6 @@ import java.util.Vector;
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SPACE:
- ;
break;
default:
jj_la1[12] = jj_gen;
@@ -441,7 +429,6 @@ import java.util.Vector;
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SPACE:
- ;
break;
default:
jj_la1[13] = jj_gen;
@@ -457,7 +444,6 @@ import java.util.Vector;
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SPACE:
- ;
break;
default:
jj_la1[14] = jj_gen;
@@ -468,13 +454,11 @@ import java.util.Vector;
jj_consume_token(SEMI_COLON);
getProperties(p);
} else {
- ;
}
label_14:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SPACE:
- ;
break;
default:
jj_la1[15] = jj_gen;
@@ -521,7 +505,6 @@ import java.util.Vector;
label_15:
while (true) {
if (jj_2_7(2147483647)) {
- ;
} else {
break label_15;
}
@@ -564,7 +547,6 @@ import java.util.Vector;
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SPACE:
- ;
break;
default:
jj_la1[16] = jj_gen;
@@ -577,7 +559,6 @@ import java.util.Vector;
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SPACE:
- ;
break;
default:
jj_la1[17] = jj_gen;
@@ -589,7 +570,6 @@ import java.util.Vector;
label_18:
while (true) {
if (jj_2_8(2147483647)) {
- ;
} else {
break label_18;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/39306ff3/catalog/src/main/java/org/apache/oodt/cas/catalog/term/Term.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/term/Term.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/term/Term.java
index 653a9ca..eb89e49 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/term/Term.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/term/Term.java
@@ -81,9 +81,9 @@ public class Term implements Cloneable {
xml_NMTOKENS,
xml_anyType,
xml_anySimpleType
- };
-
- public Term() {
+ }
+
+ public Term() {
this.type = Type.xml_string;
this.values = Collections.emptyList();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/39306ff3/cli/src/main/java/org/apache/oodt/cas/cli/option/validator/CmdLineOptionValidator.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/option/validator/CmdLineOptionValidator.java b/cli/src/main/java/org/apache/oodt/cas/cli/option/validator/CmdLineOptionValidator.java
index 2e4faa6..e49524c 100755
--- a/cli/src/main/java/org/apache/oodt/cas/cli/option/validator/CmdLineOptionValidator.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/option/validator/CmdLineOptionValidator.java
@@ -28,7 +28,7 @@ public interface CmdLineOptionValidator {
class Result {
public enum Grade {
- PASS, FAIL;
+ PASS, FAIL
}
private String message;
http://git-wip-us.apache.org/repos/asf/oodt/blob/39306ff3/cli/src/main/java/org/apache/oodt/cas/cli/util/ParsedArg.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/util/ParsedArg.java b/cli/src/main/java/org/apache/oodt/cas/cli/util/ParsedArg.java
index 03f9acd..dbb1477 100644
--- a/cli/src/main/java/org/apache/oodt/cas/cli/util/ParsedArg.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/util/ParsedArg.java
@@ -24,7 +24,7 @@ package org.apache.oodt.cas.cli.util;
public class ParsedArg {
public enum Type {
- OPTION, VALUE;
+ OPTION, VALUE
}
private String name;
http://git-wip-us.apache.org/repos/asf/oodt/blob/39306ff3/cli/src/test/java/org/apache/oodt/cas/cli/option/handler/TestApplyToActionHandler.java
----------------------------------------------------------------------
diff --git a/cli/src/test/java/org/apache/oodt/cas/cli/option/handler/TestApplyToActionHandler.java b/cli/src/test/java/org/apache/oodt/cas/cli/option/handler/TestApplyToActionHandler.java
index 1b8a0a3..83b6917 100644
--- a/cli/src/test/java/org/apache/oodt/cas/cli/option/handler/TestApplyToActionHandler.java
+++ b/cli/src/test/java/org/apache/oodt/cas/cli/option/handler/TestApplyToActionHandler.java
@@ -90,7 +90,8 @@ public class TestApplyToActionHandler extends TestCase {
}
public static class TestCmdLineAction extends CmdLineAction {
- public enum CallType { ADD, SET };
+ public enum CallType { ADD, SET }
+
private CallType callType;
@Override
http://git-wip-us.apache.org/repos/asf/oodt/blob/39306ff3/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java b/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java
index 83b823d..4f31a67 100644
--- a/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java
+++ b/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java
@@ -35,7 +35,7 @@ import java.util.TimeZone;
*/
public class DateUtils {
- public enum FormatType { UTC_FORMAT, LOCAL_FORMAT, TAI_FORMAT };
+ public enum FormatType { UTC_FORMAT, LOCAL_FORMAT, TAI_FORMAT }
public static Calendar tai93epoch = new GregorianCalendar(1993, GregorianCalendar.JANUARY, 1);
http://git-wip-us.apache.org/repos/asf/oodt/blob/39306ff3/crawler/src/main/java/org/apache/oodt/cas/crawl/status/IngestStatus.java
----------------------------------------------------------------------
diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/status/IngestStatus.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/status/IngestStatus.java
index ac9958f..f815075 100644
--- a/crawler/src/main/java/org/apache/oodt/cas/crawl/status/IngestStatus.java
+++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/status/IngestStatus.java
@@ -31,7 +31,7 @@ import java.io.File;
public interface IngestStatus {
enum Result {
- SUCCESS, FAILURE, SKIPPED, PRECONDS_FAILED;
+ SUCCESS, FAILURE, SKIPPED, PRECONDS_FAILED
}
File getProduct();
http://git-wip-us.apache.org/repos/asf/oodt/blob/39306ff3/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 ba77bb8..c150025 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
@@ -67,8 +67,8 @@ public final class QueryTool {
private XmlRpcFileManagerClient client = null;
- private enum QueryType { LUCENE, SQL };
-
+ private enum QueryType { LUCENE, SQL }
+
/* our log stream */
private static final Logger LOG = Logger.getLogger(QueryTool.class.getName());
http://git-wip-us.apache.org/repos/asf/oodt/blob/39306ff3/filemgr/src/test/java/org/apache/oodt/cas/filemgr/cli/action/TestGetPrevPageCliAction.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/cli/action/TestGetPrevPageCliAction.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/cli/action/TestGetPrevPageCliAction.java
index 7248870..12abeb3 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/cli/action/TestGetPrevPageCliAction.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/cli/action/TestGetPrevPageCliAction.java
@@ -208,5 +208,5 @@ public class TestGetPrevPageCliAction extends TestCase {
pp.setPageProducts(Lists.newArrayList(p4));
return pp;
}
- };
+ }
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/39306ff3/pge/src/main/java/org/apache/oodt/cas/pge/metadata/PgeMetadata.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/metadata/PgeMetadata.java b/pge/src/main/java/org/apache/oodt/cas/pge/metadata/PgeMetadata.java
index a56c8c4..34e0c24 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/metadata/PgeMetadata.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/metadata/PgeMetadata.java
@@ -51,7 +51,7 @@ import com.google.common.collect.Sets;
public class PgeMetadata {
public enum Type {
- STATIC, DYNAMIC, LOCAL;
+ STATIC, DYNAMIC, LOCAL
}
public static final List<Type> DEFAULT_COMBINE_ORDER = Lists
.newArrayList(Type.LOCAL, Type.DYNAMIC, Type.STATIC);
http://git-wip-us.apache.org/repos/asf/oodt/blob/39306ff3/profile/src/test/java/org/apache/oodt/profile/ProfileAttributesTest.java
----------------------------------------------------------------------
diff --git a/profile/src/test/java/org/apache/oodt/profile/ProfileAttributesTest.java b/profile/src/test/java/org/apache/oodt/profile/ProfileAttributesTest.java
index 223a86f..04792f0 100644
--- a/profile/src/test/java/org/apache/oodt/profile/ProfileAttributesTest.java
+++ b/profile/src/test/java/org/apache/oodt/profile/ProfileAttributesTest.java
@@ -129,11 +129,11 @@ public class ProfileAttributesTest extends TestCase {
} else if ("profParentId".equals(name)) {
assertEquals("parent", XML.text(child));
} else if ("profChildId".equals(name)) {
- ; // ignore, list serialization tested in XMLTest
+ // ignore, list serialization tested in XMLTest
} else if ("profRegAuthority".equals(name)) {
assertEquals("regAuthority", XML.text(child));
} else if ("profRevisionNote".equals(name)) {
- ; // ignore, list serialization tested in XMLTest
+ // ignore, list serialization tested in XMLTest
} else fail("Unknown node \"" + name + "\" in XML result");
}
ProfileAttributes p = new ProfileAttributes(root);
http://git-wip-us.apache.org/repos/asf/oodt/blob/39306ff3/profile/src/test/java/org/apache/oodt/profile/ProfileElementTestCase.java
----------------------------------------------------------------------
diff --git a/profile/src/test/java/org/apache/oodt/profile/ProfileElementTestCase.java b/profile/src/test/java/org/apache/oodt/profile/ProfileElementTestCase.java
index 617c69c..6a54635 100644
--- a/profile/src/test/java/org/apache/oodt/profile/ProfileElementTestCase.java
+++ b/profile/src/test/java/org/apache/oodt/profile/ProfileElementTestCase.java
@@ -172,7 +172,7 @@ public abstract class ProfileElementTestCase extends TestCase {
} else if ("elemMaxValue".equals(name)) {
checkMaxValue(text);
} else if ("elemSynonym".equals(name)) {
- ; // ignore
+ // ignore
} else if ("elemObligation".equals(name)) {
assertEquals("Optional", text);
} else if ("elemMaxOccurrence".equals(name)) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/39306ff3/profile/src/test/java/org/apache/oodt/profile/ResourceAttributesTest.java
----------------------------------------------------------------------
diff --git a/profile/src/test/java/org/apache/oodt/profile/ResourceAttributesTest.java b/profile/src/test/java/org/apache/oodt/profile/ResourceAttributesTest.java
index 96faa54..ac216e7 100644
--- a/profile/src/test/java/org/apache/oodt/profile/ResourceAttributesTest.java
+++ b/profile/src/test/java/org/apache/oodt/profile/ResourceAttributesTest.java
@@ -117,29 +117,29 @@ public class ResourceAttributesTest extends TestCase {
} else if ("Title".equals(name)) {
assertEquals("title", XML.text(child));
} else if ("Format".equals(name)) {
- ; // ignore
+ // ignore
} else if ("Description".equals(name)) {
assertEquals("desc", XML.text(child));
} else if ("Creator".equals(name)) {
- ; // ignore
+ // ignore
} else if ("Subject".equals(name)) {
- ; // ignore
+ // ignore
} else if ("Publisher".equals(name)) {
- ; // ignore
+ // ignore
} else if ("Contributor".equals(name)) {
- ; // ignore
+ // ignore
} else if ("Date".equals(name)) {
- ; // ignore
+ // ignore
} else if ("Type".equals(name)) {
- ; // ignore
+ // ignore
} else if ("Source".equals(name)) {
- ; // ignore
+ // ignore
} else if ("Language".equals(name)) {
- ; // ignore
+ // ignore
} else if ("Coverage".equals(name)) {
- ; // ignore
+ // ignore
} else if ("Rights".equals(name)) {
- ; // ignore
+ // ignore
} else if ("resContext".equals(name)) {
assertEquals("context", XML.text(child));
} else if ("resAggregation".equals(name)) {
@@ -147,7 +147,7 @@ public class ResourceAttributesTest extends TestCase {
} else if ("resClass".equals(name)) {
assertEquals("class", XML.text(child));
} else if ("resLocation".equals(name)) {
- ; // ignore
+ // ignore
} else fail("Unknown node \"" + name + "\" in XML result");
}
ResourceAttributes q = new ResourceAttributes(null, root);
[12/16] oodt git commit: OODT-905 swap for for foreach...
Posted by ma...@apache.org.
OODT-905 swap for for foreach...
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/82cc2da5
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/82cc2da5
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/82cc2da5
Branch: refs/heads/master
Commit: 82cc2da5eee08070ddd05d17ad7f6745341930bd
Parents: d3ee12a
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Oct 25 15:47:42 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Oct 25 15:47:42 2015 +0000
----------------------------------------------------------------------
.../oodt/cas/filemgr/browser/model/CasDB.java | 10 +-
.../cas/filemgr/browser/model/QueryBuilder.java | 12 +-
.../gui/perspective/view/impl/GraphView.java | 6 +-
.../catalog/query/parser/ParseException.java | 12 +-
.../cas/catalog/query/parser/QueryParser.java | 8 +-
.../cas/catalog/query/parser/SimpleNode.java | 4 +-
.../system/impl/CatalogServiceLocal.java | 45 +--
.../org/apache/oodt/commons/Configuration.java | 61 ++--
.../org/apache/oodt/commons/ExecServer.java | 14 +-
.../apache/oodt/commons/ExecServerConfig.java | 8 +-
.../org/apache/oodt/commons/MultiServer.java | 19 +-
.../apache/oodt/commons/activity/Activity.java | 5 +-
.../oodt/commons/activity/ActivityTracker.java | 40 +--
.../commons/activity/CompositeActivity.java | 45 +--
.../commons/activity/SQLDatabaseRetrieval.java | 12 +-
.../commons/activity/SQLDatabaseStorage.java | 18 +-
.../oodt/commons/activity/XMLStorage.java | 14 +-
.../apache/oodt/commons/database/SqlScript.java | 8 +-
.../org/apache/oodt/commons/io/LogFilter.java | 5 +-
.../org/apache/oodt/commons/util/CacheMap.java | 8 +-
.../commons/util/EnterpriseEntityResolver.java | 8 +-
.../oodt/commons/util/LogEventMultiplexer.java | 32 +-
.../apache/oodt/commons/util/PropertyMgr.java | 8 +-
.../org/apache/oodt/commons/util/Utility.java | 8 +-
.../java/org/apache/oodt/commons/util/XML.java | 13 +-
.../apache/oodt/commons/ConfigurationTest.java | 42 ++-
.../cas/crawl/AutoDetectProductCrawler.java | 14 +-
.../apache/oodt/cas/crawl/ProductCrawler.java | 8 +-
.../cas/curation/service/CurationService.java | 10 +-
.../cas/curation/service/DirectoryResource.java | 14 +-
.../cas/curation/service/MetadataResource.java | 8 +-
.../curation/util/ExtractorConfigReader.java | 2 +-
.../cas/filemgr/catalog/DataSourceCatalog.java | 45 ++-
.../oodt/cas/filemgr/catalog/LuceneCatalog.java | 24 +-
.../cli/action/LuceneQueryCliAction.java | 12 +-
.../datatransfer/RemoteDataTransferer.java | 58 ++-
.../datatransfer/TransferStatusTracker.java | 14 +-
.../oodt/cas/filemgr/ingest/StdIngester.java | 39 +-
.../repository/XMLRepositoryManager.java | 188 +++++-----
.../filemgr/structs/FreeTextQueryCriteria.java | 15 +-
.../oodt/cas/filemgr/structs/Product.java | 12 +-
.../filemgr/system/auth/SecureWebServer.java | 9 +-
.../oodt/cas/filemgr/tools/CatalogSearch.java | 41 +--
.../oodt/cas/filemgr/tools/DeleteProduct.java | 26 +-
.../tools/MetadataBasedProductMover.java | 25 +-
.../oodt/cas/filemgr/tools/QueryTool.java | 25 +-
.../cas/filemgr/tools/RangeQueryTester.java | 4 +-
.../oodt/cas/filemgr/util/XmlStructFactory.java | 57 ++-
.../filemgr/validation/XMLValidationLayer.java | 355 +++++++++----------
.../filemgr/versioning/DateTimeVersioner.java | 81 ++---
.../cas/filemgr/versioning/VersioningUtils.java | 67 ++--
.../filemgr/catalog/TestDataSourceCatalog.java | 4 +-
.../cas/filemgr/ingest/TestCachedIngester.java | 4 +-
.../oodt/cas/filemgr/ingest/TestLocalCache.java | 4 +-
.../oodt/cas/filemgr/ingest/TestRmiCache.java | 4 +-
.../cas/filemgr/ingest/TestStdIngester.java | 4 +-
.../repository/TestXMLRepositoryManager.java | 4 +-
.../filemgr/structs/type/TestTypeHandler.java | 148 ++++----
.../filemgr/system/TestXmlRpcFileManager.java | 4 +-
.../system/TestXmlRpcFileManagerClient.java | 4 +-
.../cas/filemgr/tools/TestExpImpCatalog.java | 12 +-
.../tools/TestMetadataBasedProductMover.java | 14 +-
.../validation/TestXMLValidationLayer.java | 14 +-
.../org/apache/oodt/grid/ConfigServlet.java | 6 +-
.../org/apache/oodt/grid/Configuration.java | 17 +-
.../apache/oodt/grid/ProductQueryServlet.java | 23 +-
.../apache/oodt/grid/ProfileQueryServlet.java | 55 +--
.../java/org/apache/oodt/grid/QueryServlet.java | 35 +-
.../oodt/grid/RestfulProductQueryServlet.java | 8 +-
.../oodt/cas/install/CASInstallDistMojo.java | 24 +-
.../apache/oodt/opendapps/DatasetCrawler.java | 8 +-
.../oodt/pcs/health/CrawlPropertiesFile.java | 4 +-
.../apache/oodt/pcs/tools/PCSHealthMonitor.java | 34 +-
.../apache/oodt/pcs/tools/PCSLongLister.java | 11 +-
.../org/apache/oodt/pcs/tools/PCSTrace.java | 11 +-
.../apache/oodt/pcs/util/FileManagerUtils.java | 16 +-
.../oodt/pcs/input/PGEConfigFileReader.java | 28 +-
.../oodt/pcs/input/PGEConfigFileWriter.java | 48 ++-
.../handlers/ofsn/AbstractCrawlLister.java | 9 +-
.../product/handlers/ofsn/URLGetHandler.java | 10 +-
.../oodt/profile/EnumeratedProfileElement.java | 10 +-
.../java/org/apache/oodt/profile/Profile.java | 13 +-
.../org/apache/oodt/profile/ProfileElement.java | 17 +-
.../java/org/apache/oodt/profile/Utility.java | 15 +-
.../gui/pstructs/ProfileAttributesPrinter.java | 20 +-
.../gui/pstructs/ProfileElementPrinter.java | 10 +-
.../profile/gui/pstructs/ProfilePrinter.java | 14 +-
.../gui/pstructs/ResourceAttributesPrinter.java | 115 +++---
.../profile/handlers/cas/CASProfileHandler.java | 10 +-
.../profile/handlers/cas/util/ProfileUtils.java | 7 +-
.../lightweight/LightweightProfileServer.java | 92 ++---
.../SearchableResourceAttributes.java | 10 +-
.../LightweightProfileServerTest.java | 20 +-
.../cas/protocol/ftp/CommonsNetFtpProtocol.java | 32 +-
.../cas/resource/batchmgr/XmlRpcBatchMgr.java | 12 +-
.../resource/noderepo/XmlNodeRepository.java | 40 ++-
.../resource/queuerepo/XmlQueueRepository.java | 141 ++++----
.../cas/resource/structs/NameValueJobInput.java | 8 +-
.../oodt/cas/resource/tools/JobSubmitter.java | 6 +-
.../cas/resource/util/XmlRpcStructFactory.java | 32 +-
.../resource/monitor/TestAssignmentMonitor.java | 6 +-
.../system/TestXmlRpcResourceManager.java | 4 +-
.../workflow/model/WorkflowViewer.java | 3 +-
.../apache/oodt/cas/product/data/DataUtils.java | 29 +-
.../oodt/cas/product/rdf/RDFDatasetServlet.java | 20 +-
.../oodt/cas/product/rdf/RDFProductServlet.java | 33 +-
.../apache/oodt/cas/product/rdf/RDFUtils.java | 4 +-
.../oodt/cas/product/rss/RSSProductServlet.java | 14 +-
.../product/rss/RSSProductTransferServlet.java | 98 ++---
.../cli/action/GetTaskByIdCliAction.java | 10 +-
.../AbstractPaginatibleInstanceRepository.java | 4 +-
.../LuceneWorkflowInstanceRepository.java | 74 ++--
.../MemoryWorkflowInstanceRepository.java | 13 +-
.../instrepo/WorkflowInstanceMetMap.java | 4 +-
.../workflow/lifecycle/WorkflowLifecycle.java | 8 +-
.../lifecycle/WorkflowLifecycleManager.java | 12 +-
.../repository/XMLWorkflowRepository.java | 30 +-
.../workflow/system/XmlRpcWorkflowManager.java | 182 +++++-----
.../system/XmlRpcWorkflowManagerClient.java | 48 +--
.../util/GenericWorkflowObjectFactory.java | 30 +-
.../oodt/cas/workflow/util/ScriptFile.java | 4 +-
.../cas/workflow/util/XmlRpcStructFactory.java | 40 +--
.../TestAsynchronousLocalEngineRunner.java | 4 +-
.../cas/workflow/engine/TestTaskRunner.java | 4 +-
.../TestLuceneWorkflowInstanceRepository.java | 5 +-
.../system/TestXmlRpcWorkflowManagerClient.java | 6 +-
.../oodt/xmlps/mapping/DatabaseTableGroup.java | 4 +-
.../apache/oodt/xmlps/profile/DBMSExecutor.java | 10 +-
.../oodt/xmlps/profile/XMLPSProfileHandler.java | 8 +-
.../xmlps/queryparser/HandlerQueryParser.java | 4 +-
.../org/apache/oodt/xmlps/structs/CDERow.java | 3 +-
.../xmlps/product/TestXMLPSProductHandler.java | 3 +-
.../org/apache/oodt/xmlquery/QueryResult.java | 24 +-
.../java/org/apache/oodt/xmlquery/Result.java | 24 +-
.../java/org/apache/oodt/xmlquery/XMLQuery.java | 43 ++-
135 files changed, 1801 insertions(+), 1820 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java
----------------------------------------------------------------------
diff --git a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java
index 2677254..01a9631 100644
--- a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java
+++ b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java
@@ -70,8 +70,9 @@ public class CasDB {
Vector<String> names = new Vector<String>();
types = new String[v.size()];
- for (int i = 0; i < v.size(); i++)
- names.add(v.get(i).getName());
+ for (ProductType aV : v) {
+ names.add(aV.getName());
+ }
Collections.sort(names);
names.toArray(types);
@@ -98,8 +99,9 @@ public class CasDB {
Vector<String> names = new Vector<String>();
elements = new String[v.size()];
- for (int i = 0; i < v.size(); i++)
- names.add(v.get(i).getElementName());
+ for (Element aV : v) {
+ names.add(aV.getElementName());
+ }
Collections.sort(names);
names.toArray(elements);
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/QueryBuilder.java
----------------------------------------------------------------------
diff --git a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/QueryBuilder.java b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/QueryBuilder.java
index 47ab4e4..ec8f58d 100644
--- a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/QueryBuilder.java
+++ b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/QueryBuilder.java
@@ -81,10 +81,10 @@ public class QueryBuilder {
// for(int i=0;i<t.length;i++)
// ((FreeTextQueryCriteria)casQuery.getCriteria().get(0)).addValue(t[i].text());
} else {
- for (int i = 0; i < t.length; i++) {
- String element = database.getElementID(t[i].field());
- if (!element.equals("") && !t[i].text().equals("")) {
- casQ.addCriterion(new TermQueryCriteria(element, t[i].text()));
+ for (Term aT : t) {
+ String element = database.getElementID(aT.field());
+ if (!element.equals("") && !aT.text().equals("")) {
+ casQ.addCriterion(new TermQueryCriteria(element, aT.text()));
}
}
}
@@ -99,8 +99,8 @@ public class QueryBuilder {
}
} else if (luceneQ instanceof BooleanQuery) {
BooleanClause[] clauses = ((BooleanQuery) luceneQ).getClauses();
- for (int i = 0; i < clauses.length; i++) {
- GenerateCASQuery(casQ, (clauses[i]).getQuery());
+ for (BooleanClause clause : clauses) {
+ GenerateCASQuery(casQ, (clause).getQuery());
}
} else {
System.out.println("Error Parsing Query");
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/GraphView.java
----------------------------------------------------------------------
diff --git a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/GraphView.java b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/GraphView.java
index 0fb1a68..d2061e0 100644
--- a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/GraphView.java
+++ b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/GraphView.java
@@ -675,15 +675,15 @@ public class GraphView extends DefaultTreeView {
}
private void shift(List<ModelGraph> graphs, Map nested, double x, double y) {
- for (int i = 0; i < graphs.size(); i++) {
- ModelGraph graph = graphs.get(i);
+ for (ModelGraph graph : graphs) {
DefaultGraphCell cell = this.m_jgAdapter.getVertexCell(graph.getModel());
Rectangle2D bounds = (Rectangle2D) ((Map) nested.get(cell))
.get(GraphConstants.BOUNDS);
((Map) nested.get(cell)).put(
GraphConstants.BOUNDS,
new AttributeMap.SerializableRectangle2D(bounds.getX() + x, bounds
- .getY() + y, bounds.getWidth(), bounds.getHeight()));
+ .getY() + y, bounds.getWidth(),
+ bounds.getHeight()));
this.shift(graph.getChildren(), nested, x, y);
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/ParseException.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/ParseException.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/ParseException.java
index 50401fb..c523e8a 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/ParseException.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/ParseException.java
@@ -91,14 +91,14 @@ public class ParseException extends Exception {
String eol = System.getProperty("line.separator", "\n");
StringBuilder expected = new StringBuilder();
int maxSize = 0;
- for (int i = 0; i < expectedTokenSequences.length; i++) {
- if (maxSize < expectedTokenSequences[i].length) {
- maxSize = expectedTokenSequences[i].length;
+ for (int[] expectedTokenSequence : expectedTokenSequences) {
+ if (maxSize < expectedTokenSequence.length) {
+ maxSize = expectedTokenSequence.length;
}
- for (int j = 0; j < expectedTokenSequences[i].length; j++) {
- expected.append(tokenImage[expectedTokenSequences[i][j]]).append(' ');
+ for (int j = 0; j < expectedTokenSequence.length; j++) {
+ expected.append(tokenImage[expectedTokenSequence[j]]).append(' ');
}
- if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) {
+ if (expectedTokenSequence[expectedTokenSequence.length - 1] != 0) {
expected.append("...");
}
expected.append(eol).append(" ");
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 8150c10..f095c93 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
@@ -815,10 +815,12 @@ import java.util.Vector;
jj_gen++;
if (++jj_gc > 100) {
jj_gc = 0;
- for (int i = 0; i < jj_2_rtns.length; i++) {
- JJCalls c = jj_2_rtns[i];
+ for (JJCalls jj_2_rtn : jj_2_rtns) {
+ JJCalls c = jj_2_rtn;
while (c != null) {
- if (c.gen < jj_gen) c.first = null;
+ if (c.gen < jj_gen) {
+ c.first = null;
+ }
c = c.next;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleNode.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleNode.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleNode.java
index 7af2bcf..31cdb29 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleNode.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleNode.java
@@ -66,8 +66,8 @@ class SimpleNode implements Node {
public void dump(String prefix) {
System.out.println(toString(prefix));
if (children != null) {
- for (int i = 0; i < children.length; ++i) {
- SimpleNode n = (SimpleNode)children[i];
+ for (Node aChildren : children) {
+ SimpleNode n = (SimpleNode) aChildren;
if (n != null) {
n.dump(prefix + " ");
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
index b67447b..79fb47c 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
@@ -1023,28 +1023,33 @@ public class CatalogServiceLocal implements CatalogService {
// if (QueryLogicalGroup's operator is AND and is unbalanced or a child contains query results)
if ((((QueryLogicalGroup) queryExpression).getOperator().equals(QueryLogicalGroup.Operator.AND) && containsUnbalancedCatalogInterest(childrenQueryResults)) || containsTranactionReceipts(childrenQueryResults)) {
-
- for (int i = 0; i < childrenQueryResults.size(); i++) {
- QueryResult childQueryResult = childrenQueryResults.get(i);
-
- // if childQueryResult has not been used, use it
- if (childQueryResult.getCatalogReceipts() == null) {
- List<CatalogReceipt> catalogReceipts = new Vector<CatalogReceipt>();
- for (Catalog catalog : this.getCurrentCatalogList()) {
- try {
- if (childQueryResult.getInterestedCatalogs().contains(catalog.getId()))
- catalogReceipts.addAll(catalog.query(this.reduceToUnderstoodExpressions(catalog, childQueryResult.getQueryExpression())));
- }catch (Exception e) {
- if (this.oneCatalogFailsAllFail)
- throw new CatalogServiceException("Failed to query catalog '" + catalog.getId() + "' for query '" + queryExpression + "' : " + e.getMessage(), e);
- else
- LOG.log(Level.WARNING, "Failed to query catalog '" + catalog.getId() + "' for query '" + queryExpression + "' : " + e.getMessage(), e);
- }
- }
- childQueryResult.setCatalogReceipts(catalogReceipts);
+
+ for (QueryResult childQueryResult : childrenQueryResults) {
+ // if childQueryResult has not been used, use it
+ if (childQueryResult.getCatalogReceipts() == null) {
+ List<CatalogReceipt> catalogReceipts = new Vector<CatalogReceipt>();
+ for (Catalog catalog : this.getCurrentCatalogList()) {
+ try {
+ if (childQueryResult.getInterestedCatalogs().contains(catalog.getId())) {
+ catalogReceipts.addAll(catalog
+ .query(this.reduceToUnderstoodExpressions(catalog, childQueryResult.getQueryExpression())));
+ }
+ } catch (Exception e) {
+ if (this.oneCatalogFailsAllFail) {
+ throw new CatalogServiceException(
+ "Failed to query catalog '" + catalog.getId() + "' for query '" + queryExpression + "' : "
+ + e.getMessage(), e);
+ } else {
+ LOG.log(Level.WARNING,
+ "Failed to query catalog '" + catalog.getId() + "' for query '" + queryExpression + "' : "
+ + e.getMessage(), e);
+ }
}
-
+ }
+ childQueryResult.setCatalogReceipts(catalogReceipts);
}
+
+ }
// get intersection of results
QueryResult queryResult = new QueryResult(queryExpression);
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 e142165..f805256 100644
--- a/commons/src/main/java/org/apache/oodt/commons/Configuration.java
+++ b/commons/src/main/java/org/apache/oodt/commons/Configuration.java
@@ -117,13 +117,13 @@ public class Configuration {
// Now find one.
boolean found = false;
- for (Iterator i = candidates.iterator(); i.hasNext();) {
- file = (File) i.next();
- if (file.exists()) {
- found = true;
- break;
- }
+ for (Object candidate : candidates) {
+ file = (File) candidate;
+ if (file.exists()) {
+ found = true;
+ break;
}
+ }
if (found && file == alt)
System.err.println("WARNING: Using older config file " + alt + "; rename to "
+ homedirfile + " as soon as possible.");
@@ -416,16 +416,17 @@ public class Configuration {
Element programsNode = document.createElement("programs");
configurationNode.appendChild(programsNode);
- for (Iterator i = execServers.iterator(); i.hasNext();) {
- ExecServerConfig esc = (ExecServerConfig) i.next();
- Element execServerNode = document.createElement("execServer");
- programsNode.appendChild(execServerNode);
- XML.add(execServerNode, "class", esc.getClassName());
- XML.add(execServerNode, "objectKey", esc.getObjectKey());
- XML.add(execServerNode, "host", esc.getPreferredHost().toString());
- if (esc.getProperties().size() > 0)
- dumpProperties(esc.getProperties(), execServerNode);
+ for (Object execServer : execServers) {
+ ExecServerConfig esc = (ExecServerConfig) execServer;
+ Element execServerNode = document.createElement("execServer");
+ programsNode.appendChild(execServerNode);
+ XML.add(execServerNode, "class", esc.getClassName());
+ XML.add(execServerNode, "objectKey", esc.getObjectKey());
+ XML.add(execServerNode, "host", esc.getPreferredHost().toString());
+ if (esc.getProperties().size() > 0) {
+ dumpProperties(esc.getProperties(), execServerNode);
}
+ }
}
return configurationNode;
@@ -439,11 +440,12 @@ public class Configuration {
* @param targetProps The target properties.
*/
public void mergeProperties(Properties targetProps) {
- for (Iterator i = properties.entrySet().iterator(); i.hasNext();) {
- Map.Entry entry = (Map.Entry) i.next();
- if (!targetProps.containsKey(entry.getKey()))
- targetProps.put(entry.getKey(), entry.getValue());
+ for (Map.Entry<Object, Object> objectObjectEntry : properties.entrySet()) {
+ Map.Entry entry = (Map.Entry) objectObjectEntry;
+ if (!targetProps.containsKey(entry.getKey())) {
+ targetProps.put(entry.getKey(), entry.getValue());
}
+ }
}
/** Get the exec-server configurations.
@@ -462,11 +464,12 @@ public class Configuration {
public Collection getExecServerConfigs(Class clazz) {
String className = clazz.getName();
Collection execServerConfigs = new ArrayList();
- for (Iterator i = execServers.iterator(); i.hasNext();) {
- ExecServerConfig exec = (ExecServerConfig) i.next();
- if (className.equals(exec.getClassName()))
- execServerConfigs.add(exec);
- }
+ for (Object execServer : execServers) {
+ ExecServerConfig exec = (ExecServerConfig) execServer;
+ if (className.equals(exec.getClassName())) {
+ execServerConfigs.add(exec);
+ }
+ }
return execServerConfigs;
}
@@ -611,11 +614,11 @@ public class Configuration {
static void dumpProperties(Properties props, Node node) {
Element propertiesElement = node.getOwnerDocument().createElement("properties");
node.appendChild(propertiesElement);
- for (Iterator i = props.entrySet().iterator(); i.hasNext();) {
- Map.Entry entry = (Map.Entry) i.next();
- XML.add(propertiesElement, "key", (String) entry.getKey());
- XML.add(propertiesElement, "value", (String) entry.getValue());
- }
+ for (Map.Entry<Object, Object> objectObjectEntry : props.entrySet()) {
+ Map.Entry entry = (Map.Entry) objectObjectEntry;
+ XML.add(propertiesElement, "key", (String) entry.getKey());
+ XML.add(propertiesElement, "value", (String) entry.getValue());
+ }
}
/** Create a new XML document with the configuration DTD.
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 6a61f3c..0d12531 100644
--- a/commons/src/main/java/org/apache/oodt/commons/ExecServer.java
+++ b/commons/src/main/java/org/apache/oodt/commons/ExecServer.java
@@ -267,13 +267,13 @@ public class ExecServer {
*/
public String getServerStatus() {
// Update the status document with the current log.
- for (Iterator i = LogInit.MEMORY_LOGGER.getMessages().iterator(); i.hasNext();) {
- String message = (String) i.next();
- Element messageElement = statusDocument.createElement("message");
- messageElement.setAttribute("xml:space", "preserve");
- messageElement.appendChild(statusDocument.createTextNode(message));
- logElement.appendChild(messageElement);
- }
+ for (Object o : LogInit.MEMORY_LOGGER.getMessages()) {
+ String message = (String) o;
+ Element messageElement = statusDocument.createElement("message");
+ messageElement.setAttribute("xml:space", "preserve");
+ messageElement.appendChild(statusDocument.createTextNode(message));
+ logElement.appendChild(messageElement);
+ }
// Serialize the document.
String rc = XML.serialize(statusDocument);
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/commons/src/main/java/org/apache/oodt/commons/ExecServerConfig.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/ExecServerConfig.java b/commons/src/main/java/org/apache/oodt/commons/ExecServerConfig.java
index c037cdf..53085c8 100644
--- a/commons/src/main/java/org/apache/oodt/commons/ExecServerConfig.java
+++ b/commons/src/main/java/org/apache/oodt/commons/ExecServerConfig.java
@@ -86,10 +86,10 @@ public class ExecServerConfig extends Executable implements Documentable {
commandLine[1] = "-Xms" + initialHeap;
commandLine[2] = "-Xmx" + maxHeap;
int index = 3;
- for (Iterator i = properties.entrySet().iterator(); i.hasNext();) {
- Map.Entry entry = (Map.Entry) i.next();
- commandLine[index++] = "-D" + entry.getKey() + "=" + entry.getValue();
- }
+ for (Map.Entry<Object, Object> objectObjectEntry : properties.entrySet()) {
+ Map.Entry entry = (Map.Entry) objectObjectEntry;
+ commandLine[index++] = "-D" + entry.getKey() + "=" + entry.getValue();
+ }
commandLine[index++] = "org.apache.oodt.commons.ExecServer";
commandLine[index++] = className;
commandLine[index++] = objectKey;
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 185aea9..ba8af6f 100644
--- a/commons/src/main/java/org/apache/oodt/commons/MultiServer.java
+++ b/commons/src/main/java/org/apache/oodt/commons/MultiServer.java
@@ -265,20 +265,23 @@ public class MultiServer {
* @throws NamingException if an error occurs.
*/
static void startup() throws NamingException {
- for (Iterator i = servers.values().iterator(); i.hasNext();) {
- Server s = (Server) i.next();
- s.start();
- }
+ for (Object o : servers.values()) {
+ Server s = (Server) o;
+ s.start();
+ }
}
/**
* Stop each server.
*/
static void shutdown() {
- for (Iterator i = servers.values().iterator(); i.hasNext();) try {
- Server s = (Server) i.next();
- s.stop();
- } catch (NamingException ignore) {}
+ for (Object o : servers.values()) {
+ try {
+ Server s = (Server) o;
+ s.stop();
+ } catch (NamingException ignore) {
+ }
+ }
TIMER.cancel();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 4a01a6d..2a36a0f 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
@@ -104,8 +104,9 @@ public abstract class Activity {
messageDigest.update((String.valueOf(addr) + nextNum + date).getBytes()); // Add the 1st 3 components
byte[] sig = messageDigest.digest(bytes); // And add the random bytes
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
+ for (byte aSig : sig) {
+ output.append(Integer.toHexString(((int) aSig) & 0xff));// Store it as a hex value
+ }
return output.toString(); // And return the string
} catch (NoSuchAlgorithmException ex) {
throw new IllegalStateException("MD5 algorithm not available");
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/commons/src/main/java/org/apache/oodt/commons/activity/ActivityTracker.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/activity/ActivityTracker.java b/commons/src/main/java/org/apache/oodt/commons/activity/ActivityTracker.java
index 70e52b0..a126790 100644
--- a/commons/src/main/java/org/apache/oodt/commons/activity/ActivityTracker.java
+++ b/commons/src/main/java/org/apache/oodt/commons/activity/ActivityTracker.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;
@@ -125,10 +125,10 @@ public class ActivityTracker {
*/
public Activity createActivity() {
List activities = new ArrayList();
- for (Iterator i = factories.iterator(); i.hasNext();) {
- ActivityFactory factory = (ActivityFactory) i.next();
- activities.add(factory.createActivity());
- }
+ for (Object factory1 : factories) {
+ ActivityFactory factory = (ActivityFactory) factory1;
+ activities.add(factory.createActivity());
+ }
return new CompositeActivity(activities);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/commons/src/main/java/org/apache/oodt/commons/activity/CompositeActivity.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/activity/CompositeActivity.java b/commons/src/main/java/org/apache/oodt/commons/activity/CompositeActivity.java
index 56fb788..fd021eb 100644
--- a/commons/src/main/java/org/apache/oodt/commons/activity/CompositeActivity.java
+++ b/commons/src/main/java/org/apache/oodt/commons/activity/CompositeActivity.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;
@@ -35,9 +35,11 @@ public class CompositeActivity extends Activity {
public CompositeActivity(Collection activities) {
if (activities == null)
throw new IllegalArgumentException("Activities collection required");
- for (Iterator i = activities.iterator(); i.hasNext();)
- if (!(i.next() instanceof Activity))
- throw new IllegalArgumentException("Non-Activity in activities collection");
+ for (Object activity : activities) {
+ if (!(activity instanceof Activity)) {
+ throw new IllegalArgumentException("Non-Activity in activities collection");
+ }
+ }
this.activities = activities;
}
@@ -47,8 +49,9 @@ public class CompositeActivity extends Activity {
* @param incident The {@link Incident} to record.
*/
public void recordIncident(Incident incident) {
- for (Iterator i = activities.iterator(); i.hasNext();)
- ((Activity) i.next()).recordIncident(incident);
+ for (Object activity : activities) {
+ ((Activity) activity).recordIncident(incident);
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseRetrieval.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseRetrieval.java b/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseRetrieval.java
index 005cb40..4879620 100644
--- a/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseRetrieval.java
+++ b/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseRetrieval.java
@@ -192,13 +192,15 @@ public class SQLDatabaseRetrieval implements Retrieval {
try {
SQLDatabaseRetrieval retrieval = new SQLDatabaseRetrieval();
List activities = retrieval.retrieve();
- for (Iterator i = activities.iterator(); i.hasNext();) {
- StoredActivity activity = (StoredActivity) i.next();
+ for (Object activity1 : activities) {
+ StoredActivity activity = (StoredActivity) activity1;
System.out.println("Activity: " + activity.getActivityID());
List incidents = activity.getIncidents();
- for (Iterator j = incidents.iterator(); j.hasNext();) {
- StoredIncident incident = (StoredIncident) j.next();
- System.out.println(" Incident: " + incident.getClassName() + ", " + incident.getOccurTime() + ", " + incident.getDetail());
+ for (Object incident1 : incidents) {
+ StoredIncident incident = (StoredIncident) incident1;
+ System.out.println(
+ " Incident: " + incident.getClassName() + ", " + incident.getOccurTime() + ", " + incident
+ .getDetail());
}
}
System.exit(0);
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseStorage.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseStorage.java b/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseStorage.java
index 0aa6f2a..c1d1b06 100644
--- a/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseStorage.java
+++ b/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseStorage.java
@@ -135,17 +135,17 @@ public class SQLDatabaseStorage implements Storage {
try {
conn = this.ds.getConnection();
statement = conn.createStatement();
- for (Iterator i = incidents.iterator(); i.hasNext();) {
- Incident incident = (Incident) i.next();
+ for (Object incident1 : incidents) {
+ Incident incident = (Incident) incident1;
statement
.executeUpdate("insert into incidents (activityID, className, occurTime, detail) values ('"
- + id
- + "', '"
- + incident.getClass().getName()
- + "', "
- + incident.getTime().getTime()
- + ", '"
- + escapeSingleQuote(incident.toString()) + "')");
+ + id
+ + "', '"
+ + incident.getClass().getName()
+ + "', "
+ + incident.getTime().getTime()
+ + ", '"
+ + escapeSingleQuote(incident.toString()) + "')");
}
} catch (SQLException e) {
System.err
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.java b/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.java
index 9d0c189..6d77e51 100644
--- a/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.java
+++ b/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.java
@@ -48,13 +48,13 @@ public abstract class XMLStorage implements Storage {
root.setAttribute("id", id);
doc.appendChild(root);
- for (Iterator i = incidents.iterator(); i.hasNext();) {
- Incident incident = (Incident) i.next();
- Element e = doc.createElement(incident.getClass().getName());
- e.setAttribute("time", String.valueOf(incident.getTime().getTime()));
- e.appendChild(doc.createTextNode(incident.toString()));
- root.appendChild(e);
- }
+ for (Object incident1 : incidents) {
+ Incident incident = (Incident) incident1;
+ Element e = doc.createElement(incident.getClass().getName());
+ e.setAttribute("time", String.valueOf(incident.getTime().getTime()));
+ e.appendChild(doc.createTextNode(incident.toString()));
+ root.appendChild(e);
+ }
saveDocument(doc);
} catch (ParserConfigurationException ex) {
throw new IllegalStateException("Unexpected ParserConfigurationException: " + ex.getMessage());
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 3a856be..09deb6e 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
@@ -137,8 +137,8 @@ public class SqlScript {
doExecuteBatch();
} else {
if (statementList != null && statementList.size() > 0) {
- for (Iterator i = statementList.iterator(); i.hasNext();) {
- String sqlStatement = (String) i.next();
+ for (Object aStatementList : statementList) {
+ String sqlStatement = (String) aStatementList;
doExecuteIndividual(sqlStatement);
}
@@ -218,8 +218,8 @@ public class SqlScript {
conn = ds.getConnection();
statement = conn.createStatement();
- for (Iterator i = statementList.iterator(); i.hasNext();) {
- String sqlStatement = (String) i.next();
+ for (Object aStatementList : statementList) {
+ String sqlStatement = (String) aStatementList;
statement.addBatch(sqlStatement);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/commons/src/main/java/org/apache/oodt/commons/io/LogFilter.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/io/LogFilter.java b/commons/src/main/java/org/apache/oodt/commons/io/LogFilter.java
index 714a186..9e5d085 100644
--- a/commons/src/main/java/org/apache/oodt/commons/io/LogFilter.java
+++ b/commons/src/main/java/org/apache/oodt/commons/io/LogFilter.java
@@ -55,8 +55,9 @@ public class LogFilter implements LogListener {
this.listener = listener;
this.passThrough = passThrough;
if (categories == null) return;
- for (int i = 0; i < categories.length; ++i)
- this.categories.put(categories[i], DUMMY);
+ for (Object category : categories) {
+ this.categories.put(category, DUMMY);
+ }
}
/** Create a log filter.
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/commons/src/main/java/org/apache/oodt/commons/util/CacheMap.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/util/CacheMap.java b/commons/src/main/java/org/apache/oodt/commons/util/CacheMap.java
index 523d92f..6ed5e5d 100644
--- a/commons/src/main/java/org/apache/oodt/commons/util/CacheMap.java
+++ b/commons/src/main/java/org/apache/oodt/commons/util/CacheMap.java
@@ -167,10 +167,10 @@ public class CacheMap implements Map {
public void putAll(Map t) {
// FXN: [ C, M := (keys(t) || C)[0..(c-1)], { (k_i, v_i) | k_i elem of (keys(t) || C)[0..(c-1)]} ]
- for (Iterator i = t.entrySet().iterator(); i.hasNext();) {
- Map.Entry entry = (Map.Entry) i.next();
- put(entry.getKey(), entry.getValue());
- }
+ for (Object o : t.entrySet()) {
+ Entry entry = (Entry) o;
+ put(entry.getKey(), entry.getValue());
+ }
}
public void clear() {
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/commons/src/main/java/org/apache/oodt/commons/util/EnterpriseEntityResolver.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/util/EnterpriseEntityResolver.java b/commons/src/main/java/org/apache/oodt/commons/util/EnterpriseEntityResolver.java
index 8bbd907..bc91a10 100644
--- a/commons/src/main/java/org/apache/oodt/commons/util/EnterpriseEntityResolver.java
+++ b/commons/src/main/java/org/apache/oodt/commons/util/EnterpriseEntityResolver.java
@@ -138,10 +138,12 @@ public class EnterpriseEntityResolver implements EntityResolver {
* or null if no directory in <var>dirs</var> contains a file named <var>filename</var>.
*/
static File findFile(List dirs, String filename) {
- for (Iterator i = dirs.iterator(); i.hasNext();) {
- File potentialFile = new File((String) i.next(), filename);
- if (potentialFile.isFile()) return potentialFile;
+ for (Object dir : dirs) {
+ File potentialFile = new File((String) dir, filename);
+ if (potentialFile.isFile()) {
+ return potentialFile;
}
+ }
return null;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/commons/src/main/java/org/apache/oodt/commons/util/LogEventMultiplexer.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/util/LogEventMultiplexer.java b/commons/src/main/java/org/apache/oodt/commons/util/LogEventMultiplexer.java
index af83375..7d519e9 100644
--- a/commons/src/main/java/org/apache/oodt/commons/util/LogEventMultiplexer.java
+++ b/commons/src/main/java/org/apache/oodt/commons/util/LogEventMultiplexer.java
@@ -44,31 +44,31 @@ public class LogEventMultiplexer implements LogListener {
}
public void messageLogged(LogEvent event) {
- for (Iterator i = listeners.iterator(); i.hasNext();) {
- LogListener listener = (LogListener) i.next();
- listener.messageLogged(event);
- }
+ for (Object listener1 : listeners) {
+ LogListener listener = (LogListener) listener1;
+ listener.messageLogged(event);
+ }
}
public void streamStarted(LogEvent event) {
- for (Iterator i = listeners.iterator(); i.hasNext();) {
- LogListener listener = (LogListener) i.next();
- listener.streamStarted(event);
- }
+ for (Object listener1 : listeners) {
+ LogListener listener = (LogListener) listener1;
+ listener.streamStarted(event);
+ }
}
public void streamStopped(LogEvent event) {
- for (Iterator i = listeners.iterator(); i.hasNext();) {
- LogListener listener = (LogListener) i.next();
- listener.streamStopped(event);
- }
+ for (Object listener1 : listeners) {
+ LogListener listener = (LogListener) listener1;
+ listener.streamStopped(event);
+ }
}
public void propertyChange(PropertyChangeEvent event) {
- for (Iterator i = listeners.iterator(); i.hasNext();) {
- LogListener listener = (LogListener) i.next();
- listener.propertyChange(event);
- }
+ for (Object listener1 : listeners) {
+ LogListener listener = (LogListener) listener1;
+ listener.propertyChange(event);
+ }
}
/** List of listeners to which I multiplex events. */
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/commons/src/main/java/org/apache/oodt/commons/util/PropertyMgr.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/util/PropertyMgr.java b/commons/src/main/java/org/apache/oodt/commons/util/PropertyMgr.java
index 55b6ab7..582fbda 100644
--- a/commons/src/main/java/org/apache/oodt/commons/util/PropertyMgr.java
+++ b/commons/src/main/java/org/apache/oodt/commons/util/PropertyMgr.java
@@ -49,10 +49,10 @@ public class PropertyMgr {
System.setProperty(key, value);
if (!listeners.isEmpty()) {
PropertyChangeEvent event = new PropertyChangeEvent(System.getProperties(), key, oldValue, value);
- for (Iterator i = listeners.iterator(); i.hasNext();) {
- PropertyChangeListener listener = (PropertyChangeListener) i.next();
- listener.propertyChange(event);
- }
+ for (Object listener1 : listeners) {
+ PropertyChangeListener listener = (PropertyChangeListener) listener1;
+ listener.propertyChange(event);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/commons/src/main/java/org/apache/oodt/commons/util/Utility.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/util/Utility.java b/commons/src/main/java/org/apache/oodt/commons/util/Utility.java
index 12b257f..60a7f6e 100644
--- a/commons/src/main/java/org/apache/oodt/commons/util/Utility.java
+++ b/commons/src/main/java/org/apache/oodt/commons/util/Utility.java
@@ -162,9 +162,11 @@ public class Utility {
public static boolean delete(File file) {
if (file.isDirectory()) {
File[] entries = file.listFiles();
- for (int i = 0; i < entries.length; ++i)
- if (!delete(entries[i]))
- return false;
+ for (File entry : entries) {
+ if (!delete(entry)) {
+ return false;
+ }
+ }
}
return file.delete();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 e49c967..65439e3 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
@@ -353,8 +353,9 @@ public class XML {
* @throws DOMException If a DOM error occurs.
*/
public static void add(Node node, String name, Collection values) throws DOMException {
- for (Iterator i = values.iterator(); i.hasNext();)
- add(node, name, i.next());
+ for (Object value : values) {
+ add(node, name, value);
+ }
}
/** Add a child element with the given text to the given element.
@@ -513,10 +514,10 @@ public class XML {
public static void removeComments(Node node) {
List commentNodes = new ArrayList();
findCommentNodes(commentNodes, node);
- for (Iterator i = commentNodes.iterator(); i.hasNext();) {
- Node commentNode = (Node) i.next();
- commentNode.getParentNode().removeChild(commentNode);
- }
+ for (Object commentNode1 : commentNodes) {
+ Node commentNode = (Node) commentNode1;
+ commentNode.getParentNode().removeChild(commentNode);
+ }
}
/** The resolver for entities for the JPL enterprise. */
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/commons/src/test/java/org/apache/oodt/commons/ConfigurationTest.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/oodt/commons/ConfigurationTest.java b/commons/src/test/java/org/apache/oodt/commons/ConfigurationTest.java
index 839116c..fce3d9d 100644
--- a/commons/src/test/java/org/apache/oodt/commons/ConfigurationTest.java
+++ b/commons/src/test/java/org/apache/oodt/commons/ConfigurationTest.java
@@ -71,26 +71,30 @@ public class ConfigurationTest extends TestCase {
assertEquals("/dir/1,/dir/2,/dir/one,/dir/two", System.getProperty(Configuration.ENTITY_DIRS_PROP));
Collection servers = c.getExecServerConfigs();
assertEquals(2, servers.size());
- for (Iterator each = servers.iterator(); each.hasNext();) {
- ExecServerConfig esc = (ExecServerConfig) each.next();
- if (esc.getClassName().equals("test.Class1")) {
- assertEquals("Name1", esc.getObjectKey());
- assertEquals(1, esc.getProperties().size());
- } else if (esc.getClassName().equals("test.Class2")) {
- assertEquals("Name2", esc.getObjectKey());
- assertEquals(3, esc.getProperties().size());
- for (Iterator i = esc.getProperties().entrySet().iterator(); i.hasNext();) {
- Map.Entry entry = (Map.Entry) i.next();
- if (entry.getKey().equals("localKey1"))
- assertEquals("localKey2", entry.getValue());
- else if (entry.getKey().equals("globalKey2"))
- assertEquals("local-override", entry.getValue());
- else if (entry.getKey().equals("org.apache.oodt.commons.Configuration.url"))
- ; // This one's OK.
- else fail("Unknown local property \"" + entry.getKey() + "\" in exec server");
- }
- } else fail("Unknown ExecServerConfig \"" + esc.getClassName() + "\" in servers from Configuration");
+ for (Object server : servers) {
+ ExecServerConfig esc = (ExecServerConfig) server;
+ if (esc.getClassName().equals("test.Class1")) {
+ assertEquals("Name1", esc.getObjectKey());
+ assertEquals(1, esc.getProperties().size());
+ } else if (esc.getClassName().equals("test.Class2")) {
+ assertEquals("Name2", esc.getObjectKey());
+ assertEquals(3, esc.getProperties().size());
+ for (Map.Entry<Object, Object> objectObjectEntry : esc.getProperties().entrySet()) {
+ Map.Entry entry = (Map.Entry) objectObjectEntry;
+ if (entry.getKey().equals("localKey1")) {
+ assertEquals("localKey2", entry.getValue());
+ } else if (entry.getKey().equals("globalKey2")) {
+ assertEquals("local-override", entry.getValue());
+ } else if (entry.getKey().equals("org.apache.oodt.commons.Configuration.url")) {
+ ; // This one's OK.
+ } else {
+ fail("Unknown local property \"" + entry.getKey() + "\" in exec server");
+ }
+ }
+ } else {
+ fail("Unknown ExecServerConfig \"" + esc.getClassName() + "\" in servers from Configuration");
}
+ }
}
/** The temporary test configuration file. */
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/crawler/src/main/java/org/apache/oodt/cas/crawl/AutoDetectProductCrawler.java
----------------------------------------------------------------------
diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/AutoDetectProductCrawler.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/AutoDetectProductCrawler.java
index d8c0a20..232a63d 100644
--- a/crawler/src/main/java/org/apache/oodt/cas/crawl/AutoDetectProductCrawler.java
+++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/AutoDetectProductCrawler.java
@@ -75,9 +75,9 @@ public class AutoDetectProductCrawler extends ProductCrawler implements
Metadata metadata = new Metadata();
metadata.addMetadata(MIME_TYPES_HIERARCHY,
mimeExtractorRepo.getMimeTypes(product));
- for (int i = 0; i < specs.size(); i++) {
- Metadata m = specs.get(i).getMetExtractor()
- .extractMetadata(product);
+ for (MetExtractorSpec spec : specs) {
+ Metadata m = spec.getMetExtractor()
+ .extractMetadata(product);
if (m != null) {
metadata.addMetadata(m.getHashtable(), true);
}
@@ -94,11 +94,11 @@ public class AutoDetectProductCrawler extends ProductCrawler implements
if (this.getApplicationContext() != null) {
PreCondEvalUtils evalUtils = new PreCondEvalUtils(
this.getApplicationContext());
- for (int i = 0; i < specs.size(); i++) {
- List<String> preCondComparatorIds = specs
- .get(i).getPreCondComparatorIds();
- if (!evalUtils.eval(preCondComparatorIds, product))
+ for (MetExtractorSpec spec : specs) {
+ List<String> preCondComparatorIds = spec.getPreCondComparatorIds();
+ if (!evalUtils.eval(preCondComparatorIds, product)) {
return false;
+ }
}
}
return true;
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 e9f4878..17d1eaa 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
@@ -103,15 +103,15 @@ public abstract class ProductCrawler extends ProductCrawlerBean {
productFiles = dir.listFiles(FILE_FILTER);
}
- for (int j = 0; j < productFiles.length; j++) {
- ingestStatus.add(handleFile(productFiles[j]));
+ for (File productFile : productFiles) {
+ ingestStatus.add(handleFile(productFile));
}
if (!isNoRecur()) {
File[] subdirs = dir.listFiles(DIR_FILTER);
if (subdirs != null) {
- for (int j = 0; j < subdirs.length; j++) {
- stack.push(subdirs[j]);
+ for (File subdir : subdirs) {
+ stack.push(subdir);
}
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java
----------------------------------------------------------------------
diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java
index dc84ce8..44c84af 100644
--- a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java
+++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java
@@ -106,15 +106,15 @@ public class CurationService extends HttpServlet implements CuratorConfMetKeys {
String f[] = getFilesInDirectory(startingPath, showFiles);
List<Map<String, Object>> items = new ArrayList<Map<String, Object>>();
- for (int i = 0; i < f.length; i++) {
+ for (String aF : f) {
Map<String, Object> entry = new HashMap<String, Object>();
- String children[] = getFilesInDirectory(startingPath + "/" + f[i],
+ String children[] = getFilesInDirectory(startingPath + "/" + aF,
showFiles);
- entry.put("text", f[i]);
- entry.put("id", path + "/" + f[i]);
+ entry.put("text", aF);
+ entry.put("id", path + "/" + aF);
entry.put("expanded", false);
entry.put("hasChildren", children != null && (children.length > 0));
- entry.put("isFile", new File(startingPath + "/" + f[i]).isFile());
+ entry.put("isFile", new File(startingPath + "/" + aF).isFile());
items.add(entry);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 e469fb4..db3c449 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
@@ -105,24 +105,24 @@ public class DirectoryResource extends CurationService {
// Loop through and list directories first. Nicer for UI to get these first
if (f != null) {
- for (int i = 0; i < f.length; i++) {
- if (new File(startingPath + "/" + f[i]).isDirectory()) {
+ for (String aF1 : f) {
+ if (new File(startingPath + "/" + aF1).isDirectory()) {
html.append(" <li class=\"directory collapsed\">");
html.append("<a href=\"#\" rel=\"").append(relativePath).append("/")
- .append(f[i]).append("\">").append(f[i]).append("</a>");
+ .append(aF1).append("\">").append(aF1).append("</a>");
html.append("</li>\r\n");
}
}
// If we are showing files now loop through and show files
if (showFiles) {
- for (int i = 0; i < f.length; i++) {
- if (new File(startingPath + "/" + f[i]).isFile()) {
- String filename = new File(startingPath + "/" + f[i]).getName();
+ for (String aF : f) {
+ if (new File(startingPath + "/" + aF).isFile()) {
+ String filename = new File(startingPath + "/" + aF).getName();
String ext = filename.substring(filename.lastIndexOf('.') + 1);
html.append(" <li class=\"file draggy ext_").append(ext)
.append("\">");
html.append("<a href=\"#\" rel=\"").append(relativePath)
- .append("/").append(f[i]).append("\">").append(f[i])
+ .append("/").append(aF).append("\">").append(aF)
.append("</a>");
html.append("</li>\r\n");
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 9e3a2c6..e092ed2 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
@@ -171,15 +171,15 @@ public class MetadataResource extends CurationService {
protected String getExtractorConfigIdsAsHTML(String[] configIds,
String current) {
StringBuilder html = new StringBuilder();
- for (int i = 0; i < configIds.length; i++) {
+ for (String configId : configIds) {
html.append("<option ");
- if (configIds[i].equals(current)) {
+ if (configId.equals(current)) {
html.append("selected ");
}
html.append("value=\"");
- html.append(configIds[i]);
+ html.append(configId);
html.append("\">");
- html.append(configIds[i]);
+ html.append(configId);
html.append("</option>\r\n");
}
return html.toString();
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 33f73fa..2a711e7 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
@@ -42,7 +42,7 @@ public class ExtractorConfigReader {
List<File> files = new ArrayList<File>();
String[] fileList = props.getProperty(ExtractorConfig.PROP_CONFIG_FILES)
.split(",");
- for (int i = 0; i < fileList.length; i++) {
+ for (String aFileList : fileList) {
files.add(new File(PathUtils.replaceEnvVariables(fileList[0])));
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
index 44fd309..f72cb8d 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
@@ -585,30 +585,27 @@ public class DataSourceCatalog implements Catalog {
conn.setAutoCommit(false);
statement = conn.createStatement();
- for (Iterator<Reference> i = product.getProductReferences().iterator(); i
- .hasNext();) {
- Reference r = i.next();
-
- String addRefSql = "INSERT INTO "
- + productRefTable
- + " "
- + "(product_id, product_orig_reference, product_datastore_reference, product_reference_filesize, product_reference_mimetype) "
- + "VALUES ("
- + quoteIt(product.getProductId())
- + ", '"
- + r.getOrigReference()
- + "', '"
- + r.getDataStoreReference()
- + "', "
- + r.getFileSize()
- + ",'"
- + ((r.getMimeType() == null) ? "" : r.getMimeType()
- .getName()) + "')";
-
- LOG.log(Level.FINE, "addProductReferences: Executing: "
- + addRefSql);
- statement.execute(addRefSql);
- }
+ for (Reference r : product.getProductReferences()) {
+ String addRefSql = "INSERT INTO "
+ + productRefTable
+ + " "
+ + "(product_id, product_orig_reference, product_datastore_reference, product_reference_filesize, product_reference_mimetype) "
+ + "VALUES ("
+ + quoteIt(product.getProductId())
+ + ", '"
+ + r.getOrigReference()
+ + "', '"
+ + r.getDataStoreReference()
+ + "', "
+ + r.getFileSize()
+ + ",'"
+ + ((r.getMimeType() == null) ? "" : r.getMimeType()
+ .getName()) + "')";
+
+ LOG.log(Level.FINE, "addProductReferences: Executing: "
+ + addRefSql);
+ statement.execute(addRefSql);
+ }
conn.commit();
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 89b8f1b..86d4a59 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
@@ -1049,9 +1049,9 @@ public class LuceneCatalog implements Catalog {
String[] elemValues = doc.getValues(name);
if (elemValues != null && elemValues.length > 0) {
- for (int j = 0; j < elemValues.length; j++) {
- metadata.addMetadata(name, elemValues[j]);
- }
+ for (String elemValue : elemValues) {
+ metadata.addMetadata(name, elemValue);
+ }
}
}
}
@@ -1169,20 +1169,18 @@ public class LuceneCatalog implements Catalog {
}
// add the product references
- for (Iterator<Reference> i = product.getProductReferences().iterator(); i
- .hasNext();) {
- Reference r = i.next();
+ for (Reference r : product.getProductReferences()) {
doc.add(new Field("reference_orig", r.getOrigReference(),
- Field.Store.YES, Field.Index.NO));
+ Field.Store.YES, Field.Index.NO));
doc
- .add(new Field("reference_data_store", r
- .getDataStoreReference(), Field.Store.YES,
- Field.Index.NO));
+ .add(new Field("reference_data_store", r
+ .getDataStoreReference(), Field.Store.YES,
+ Field.Index.NO));
doc.add(new Field("reference_fileSize", String.valueOf(r
- .getFileSize()), Field.Store.YES, Field.Index.NO));
+ .getFileSize()), Field.Store.YES, Field.Index.NO));
doc.add(new Field("reference_mimeType", r.getMimeType() != null ? r
- .getMimeType().getName() : "", Field.Store.YES,
- Field.Index.UN_TOKENIZED));
+ .getMimeType().getName() : "", Field.Store.YES,
+ Field.Index.UN_TOKENIZED));
}
// add special field for all products
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/LuceneQueryCliAction.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/LuceneQueryCliAction.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/LuceneQueryCliAction.java
index cf1f1b7..6e87d28 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/LuceneQueryCliAction.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/LuceneQueryCliAction.java
@@ -105,9 +105,9 @@ public class LuceneQueryCliAction extends AbstractQueryCliAction {
} else {
BooleanQueryCriteria bqc = new BooleanQueryCriteria();
bqc.setOperator(BooleanQueryCriteria.AND);
- for (int i = 0; i < t.length; i++) {
- bqc.addTerm(new TermQueryCriteria(t[i].field(), t[i]
- .text()));
+ for (Term aT : t) {
+ bqc.addTerm(new TermQueryCriteria(aT.field(), aT
+ .text()));
}
return bqc;
}
@@ -120,11 +120,11 @@ public class LuceneQueryCliAction extends AbstractQueryCliAction {
BooleanClause[] clauses = ((BooleanQuery) luceneQuery).getClauses();
BooleanQueryCriteria bqc = new BooleanQueryCriteria();
bqc.setOperator(BooleanQueryCriteria.AND);
- for (int i = 0; i < clauses.length; i++) {
- if (clauses[i].getOccur().equals(BooleanClause.Occur.SHOULD)) {
+ for (BooleanClause clause : clauses) {
+ if (clause.getOccur().equals(BooleanClause.Occur.SHOULD)) {
bqc.setOperator(BooleanQueryCriteria.OR);
}
- bqc.addTerm(generateCASQuery(clauses[i].getQuery()));
+ bqc.addTerm(generateCASQuery(clause.getQuery()));
}
return bqc;
} else {
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java
index de14832..0018916 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java
@@ -114,39 +114,37 @@ public class RemoteDataTransferer implements DataTransfer {
quietNotifyTransferProduct(product);
// for each file reference, transfer the file to the remote file manager
- for (Iterator<Reference> i = product.getProductReferences().iterator(); i
- .hasNext();) {
- Reference r = i.next();
- // test whether or not the reference is a directory or a file
- File refFile = null;
- try {
- refFile = new File(new URI(r.getOrigReference()));
- } catch (URISyntaxException e) {
- LOG.log(Level.WARNING,
- "Unable to test if reference: [" + r.getOrigReference()
- + "] is a directory: skipping it");
- continue;
- }
+ for (Reference r : product.getProductReferences()) {
+ // test whether or not the reference is a directory or a file
+ File refFile = null;
+ try {
+ refFile = new File(new URI(r.getOrigReference()));
+ } catch (URISyntaxException e) {
+ LOG.log(Level.WARNING,
+ "Unable to test if reference: [" + r.getOrigReference()
+ + "] is a directory: skipping it");
+ continue;
+ }
- if (!refFile.isDirectory()) {
- LOG.log(Level.FINE, "Reference: [" + r.getOrigReference()
- + "] is file: transferring it");
+ if (!refFile.isDirectory()) {
+ LOG.log(Level.FINE, "Reference: [" + r.getOrigReference()
+ + "] is file: transferring it");
- try {
- remoteTransfer(r, product);
- } catch (URISyntaxException e) {
- LOG.log(Level.WARNING,
- "Error transferring file: [" + r.getOrigReference()
- + "]: URISyntaxException: " + e.getMessage());
- }
- } else {
- LOG.log(
- Level.FINE,
- "RemoteTransfer: skipping reference: ["
- + refFile.getAbsolutePath() + "] of product: ["
- + product.getProductName() + "]: ref is a directory");
+ try {
+ remoteTransfer(r, product);
+ } catch (URISyntaxException e) {
+ LOG.log(Level.WARNING,
+ "Error transferring file: [" + r.getOrigReference()
+ + "]: URISyntaxException: " + e.getMessage());
}
- }
+ } else {
+ LOG.log(
+ Level.FINE,
+ "RemoteTransfer: skipping reference: ["
+ + refFile.getAbsolutePath() + "] of product: ["
+ + product.getProductName() + "]: ref is a directory");
+ }
+ }
quietNotifyProductTransferComplete(product);
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 b277dbd..f743c65 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
@@ -86,22 +86,18 @@ public class TransferStatusTracker {
public List<FileTransferStatus> getCurrentFileTransfers() {
List<FileTransferStatus> currTransfers = new Vector<FileTransferStatus>();
- for (Iterator<String> i = currentProductTransfers.keySet().iterator(); i
- .hasNext();) {
- String productId = i.next();
+ for (String productId : currentProductTransfers.keySet()) {
Product p = (Product) currentProductTransfers.get(productId);
// get its references
List<Reference> refs = quietGetReferences(p);
if (refs != null && refs.size() > 0) {
- for (Iterator<Reference> j = refs.iterator(); j.hasNext();) {
- Reference r = j.next();
-
+ for (Reference r : refs) {
long bytesTransferred = getBytesTransferred(r);
if (bytesTransferred > 0
- && bytesTransferred < r.getFileSize() && !isDir(r)) {
+ && bytesTransferred < r.getFileSize() && !isDir(r)) {
FileTransferStatus status = new FileTransferStatus();
status.setBytesTransferred(bytesTransferred);
status.setFileRef(r);
@@ -122,9 +118,7 @@ public class TransferStatusTracker {
long totalProductSize = 0L;
if (refs.size() > 0) {
- for (Iterator<Reference> j = refs.iterator(); j.hasNext();) {
- Reference r = (Reference) j.next();
-
+ for (Reference r : refs) {
long bytesTransferred = getBytesTransferred(r);
if (!isDir(r)) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java
index 09ffe22..1e22209 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java
@@ -118,26 +118,25 @@ public class StdIngester implements Ingester, CoreMetKeys {
public void ingest(URL fmUrl, List<String> prodFiles,
MetExtractor extractor, File metConfFile) {
if (prodFiles != null && prodFiles.size() > 0) {
- for (Iterator<String> i = prodFiles.iterator(); i.hasNext();) {
- String prodFilePath = i.next();
- String productID = null;
-
- try {
- productID = ingest(fmUrl, new File(prodFilePath),
- extractor, metConfFile);
- LOG.log(Level.INFO, "Product: [" + prodFilePath
- + "] ingested successfully! ID: [" + productID
- + "]");
- } catch (IngestException e) {
- LOG.log(Level.WARNING,
- "IngestException handling product: ["
- + prodFilePath
- + "]: Exception: ["
- + e.getMessage()
- + "]: Continuing ingest of remainder of products.");
- }
-
- }
+ for (String prodFilePath : prodFiles) {
+ String productID = null;
+
+ try {
+ productID = ingest(fmUrl, new File(prodFilePath),
+ extractor, metConfFile);
+ LOG.log(Level.INFO, "Product: [" + prodFilePath
+ + "] ingested successfully! ID: [" + productID
+ + "]");
+ } catch (IngestException e) {
+ LOG.log(Level.WARNING,
+ "IngestException handling product: ["
+ + prodFilePath
+ + "]: Exception: ["
+ + e.getMessage()
+ + "]: Continuing ingest of remainder of products.");
+ }
+
+ }
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManager.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManager.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManager.java
index 023e9ca..2894f6b 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManager.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManager.java
@@ -131,13 +131,12 @@ public class XMLRepositoryManager implements RepositoryManager {
*/
public ProductType getProductTypeByName(String productTypeName)
throws RepositoryManagerException {
- for (Iterator<String> i = productTypeMap.keySet().iterator(); i.hasNext();) {
- String typeId = (String) i.next();
- ProductType type = (ProductType) productTypeMap.get(typeId);
- if (type.getName().equals(productTypeName)) {
- return type;
- }
+ for (String typeId : productTypeMap.keySet()) {
+ ProductType type = (ProductType) productTypeMap.get(typeId);
+ if (type.getName().equals(productTypeName)) {
+ return type;
}
+ }
LOG.log(Level.WARNING,
"XMLRepositoryManager: Unable to find product type: ["
@@ -156,103 +155,102 @@ public class XMLRepositoryManager implements RepositoryManager {
}
private void saveProductTypes() {
- for (Iterator<String> i = productTypeHomeUris.iterator(); i.hasNext();) {
- String dirUri = i.next();
- File productTypeDir = null;
-
- try {
- productTypeDir = new File(new URI(dirUri));
-
- if (!productTypeDir.isDirectory()) {
- LOG
- .log(
- Level.WARNING,
- "Product type directory: "
- + dirUri
- + " is not "
- + "a directory: skipping product type saving to it.");
- continue;
- }
-
- String productTypeDirStr = productTypeDir.getAbsolutePath();
- if (!productTypeDirStr.endsWith("/")) {
- productTypeDirStr += "/";
- }
-
- String productTypeXmlFile = productTypeDirStr
- + "product-types.xml";
- XmlStructFactory.writeProductTypeXmlDocument(Arrays
- .asList(productTypeMap.values().toArray(new ProductType[productTypeMap.values().size()])),
- productTypeXmlFile);
- } catch (URISyntaxException e) {
- LOG.log(Level.WARNING,
- "URISyntaxException when saving product "
- + "type directory URI: " + dirUri
- + ": Skipping Product Type saving"
- + "for it: Message: " + e.getMessage());
- }
+ for (String dirUri : productTypeHomeUris) {
+ File productTypeDir = null;
+ try {
+ productTypeDir = new File(new URI(dirUri));
+
+ if (!productTypeDir.isDirectory()) {
+ LOG
+ .log(
+ Level.WARNING,
+ "Product type directory: "
+ + dirUri
+ + " is not "
+ + "a directory: skipping product type saving to it.");
+ continue;
+ }
+
+ String productTypeDirStr = productTypeDir.getAbsolutePath();
+ if (!productTypeDirStr.endsWith("/")) {
+ productTypeDirStr += "/";
+ }
+
+ String productTypeXmlFile = productTypeDirStr
+ + "product-types.xml";
+ XmlStructFactory.writeProductTypeXmlDocument(Arrays
+ .asList(productTypeMap.values().toArray(new ProductType[productTypeMap.values().size()])),
+ productTypeXmlFile);
+ } catch (URISyntaxException e) {
+ LOG.log(Level.WARNING,
+ "URISyntaxException when saving product "
+ + "type directory URI: " + dirUri
+ + ": Skipping Product Type saving"
+ + "for it: Message: " + e.getMessage());
}
+ }
+
}
private void loadProductTypes(List<String> dirUris) {
- for (Iterator<String> i = dirUris.iterator(); i.hasNext();) {
- File productTypeDir = null;
- String dirUri = i.next();
-
- try {
- productTypeDir = new File(new URI(dirUri));
-
- if (!productTypeDir.isDirectory()) {
- LOG
- .log(
- Level.WARNING,
- "Product type directory: "
- + dirUri
- + " is not "
- + "a directory: skipping product type loading from it.");
- continue;
- }
-
- String productTypeDirStr = productTypeDir.getAbsolutePath();
- if (!productTypeDirStr.endsWith("/")) {
- productTypeDirStr += "/";
- }
-
- String productTypeXmlFile = productTypeDirStr
- + "product-types.xml";
- Document productTypeDoc = getDocumentRoot(productTypeXmlFile);
-
- // now load the product types from it
- if (productTypeDoc != null) {
- Element productTypeRoot = productTypeDoc
- .getDocumentElement();
-
- NodeList productTypeNodeList = productTypeRoot
- .getElementsByTagName("type");
-
- if (productTypeNodeList != null
- && productTypeNodeList.getLength() > 0) {
- for (int j = 0; j < productTypeNodeList.getLength(); j++) {
- Node productTypeNode = productTypeNodeList.item(j);
- ProductType type = XmlStructFactory
- .getProductType(productTypeNode);
- LOG.log(Level.FINE,
- "XMLRepositoryManager: found product type: ["
- + type.getName() + "]");
- productTypeMap.put(type.getProductTypeId(), type);
- }
- }
- }
- } catch (URISyntaxException e) {
- LOG.log(Level.WARNING,
- "URISyntaxException when loading product "
- + "type directory URI: " + dirUri
- + ": Skipping Product Type loading"
- + "for it: Message: " + e.getMessage());
+ for (String dirUri1 : dirUris) {
+ File productTypeDir = null;
+ String dirUri = dirUri1;
+
+ try {
+ productTypeDir = new File(new URI(dirUri));
+
+ if (!productTypeDir.isDirectory()) {
+ LOG
+ .log(
+ Level.WARNING,
+ "Product type directory: "
+ + dirUri
+ + " is not "
+ + "a directory: skipping product type loading from it.");
+ continue;
+ }
+
+ String productTypeDirStr = productTypeDir.getAbsolutePath();
+ if (!productTypeDirStr.endsWith("/")) {
+ productTypeDirStr += "/";
+ }
+
+ String productTypeXmlFile = productTypeDirStr
+ + "product-types.xml";
+ Document productTypeDoc = getDocumentRoot(productTypeXmlFile);
+
+ // now load the product types from it
+ if (productTypeDoc != null) {
+ Element productTypeRoot = productTypeDoc
+ .getDocumentElement();
+
+ NodeList productTypeNodeList = productTypeRoot
+ .getElementsByTagName("type");
+
+ if (productTypeNodeList != null
+ && productTypeNodeList.getLength() > 0) {
+ for (int j = 0; j < productTypeNodeList.getLength(); j++) {
+ Node productTypeNode = productTypeNodeList.item(j);
+ ProductType type = XmlStructFactory
+ .getProductType(productTypeNode);
+ LOG.log(Level.FINE,
+ "XMLRepositoryManager: found product type: ["
+ + type.getName() + "]");
+ productTypeMap.put(type.getProductTypeId(), type);
+ }
}
+ }
+ } catch (URISyntaxException e) {
+ LOG.log(Level.WARNING,
+ "URISyntaxException when loading product "
+ + "type directory URI: " + dirUri
+ + ": Skipping Product Type loading"
+ + "for it: Message: " + e.getMessage());
}
+ }
}
private Document getDocumentRoot(String xmlFile) {
[10/16] oodt git commit: OODT-905 swap for for foreach...
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/test/java/org/apache/oodt/cas/filemgr/validation/TestXMLValidationLayer.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/validation/TestXMLValidationLayer.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/validation/TestXMLValidationLayer.java
index 096dc35..921bc72 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/validation/TestXMLValidationLayer.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/validation/TestXMLValidationLayer.java
@@ -191,12 +191,12 @@ public class TestXMLValidationLayer extends TestCase {
// try and find one of them
// find produuct received time
boolean hasReceivedTime = false;
- for (Iterator i = elementList.iterator(); i.hasNext();) {
- Element element = (Element) i.next();
- if (element.getElementName().equals("CAS.ProductReceivedTime")) {
- hasReceivedTime = true;
- }
+ for (Object anElementList : elementList) {
+ Element element = (Element) anElementList;
+ if (element.getElementName().equals("CAS.ProductReceivedTime")) {
+ hasReceivedTime = true;
}
+ }
if (!hasReceivedTime) {
fail("Didn't load the CAS.ProductReceivedTime element!");
@@ -272,8 +272,8 @@ public class TestXMLValidationLayer extends TestCase {
File[] delFiles = startDirFile.listFiles();
if (delFiles != null && delFiles.length > 0) {
- for (int i = 0; i < delFiles.length; i++) {
- delFiles[i].delete();
+ for (File delFile : delFiles) {
+ delFile.delete();
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/grid/src/main/java/org/apache/oodt/grid/ConfigServlet.java
----------------------------------------------------------------------
diff --git a/grid/src/main/java/org/apache/oodt/grid/ConfigServlet.java b/grid/src/main/java/org/apache/oodt/grid/ConfigServlet.java
index 65d30f0..9494fda 100755
--- a/grid/src/main/java/org/apache/oodt/grid/ConfigServlet.java
+++ b/grid/src/main/java/org/apache/oodt/grid/ConfigServlet.java
@@ -158,9 +158,9 @@ public class ConfigServlet extends GridServlet {
List codeBases = config.getCodeBases(); // Get the current code bases
List toRemove = new ArrayList(); // Hold indexes of code bases to remove
- for (Iterator i = params.entrySet().iterator(); i.hasNext();) { // For each
- // parameter
- Map.Entry entry = (Map.Entry) i.next(); // Get its entry
+ for (Object o : params.entrySet()) { // For each
+ // parameter
+ Map.Entry entry = (Map.Entry) o; // Get its entry
String key = (String) entry.getKey(); // And its name
String value = ((String[]) entry.getValue())[0]; // And its zeroth value
if (key.startsWith("delcb-") && "on".equals(value)) { // If it's checked
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/grid/src/main/java/org/apache/oodt/grid/Configuration.java
----------------------------------------------------------------------
diff --git a/grid/src/main/java/org/apache/oodt/grid/Configuration.java b/grid/src/main/java/org/apache/oodt/grid/Configuration.java
index 8ea5375..c894052 100755
--- a/grid/src/main/java/org/apache/oodt/grid/Configuration.java
+++ b/grid/src/main/java/org/apache/oodt/grid/Configuration.java
@@ -83,21 +83,21 @@ public class Configuration implements Serializable {
if (password != null && password.length > 0) // If we have a password
elem.setAttribute("password", encode(password)); // Add passowrd attribute
- for (Iterator i = productServers.iterator(); i.hasNext();) { // For each product server
- ProductServer ps = (ProductServer) i.next(); // Get the product server
+ for (Object productServer : productServers) { // For each product server
+ ProductServer ps = (ProductServer) productServer; // Get the product server
elem.appendChild(ps.toXML(owner)); // And add it under <configuration>
}
- for (Iterator i = profileServers.iterator(); i.hasNext();) { // For each profile server
- ProfileServer ps = (ProfileServer) i.next(); // Get the profile server
+ for (Object profileServer : profileServers) { // For each profile server
+ ProfileServer ps = (ProfileServer) profileServer; // Get the profile server
elem.appendChild(ps.toXML(owner)); // And add it under the <configuration>
}
if (!codeBases.isEmpty()) { // Got any code bases?
Element cbs = owner.createElement("codeBases"); // Boo yah. Make a parent for 'em
elem.appendChild(cbs); // Add parent
- for (Iterator i = codeBases.iterator(); i.hasNext();) { // Then, for each code base
- URL url = (URL) i.next(); // Get the URL to it
+ for (Object codeBase : codeBases) { // Then, for each code base
+ URL url = (URL) codeBase; // Get the URL to it
Element cb = owner.createElement("codeBase"); // And make a <codeBase> for it
cb.setAttribute("url", url.toString()); // And an "url" attribute
cbs.appendChild(cb); // Add it
@@ -108,8 +108,9 @@ public class Configuration implements Serializable {
Element props = owner.createElement("properties"); // Add <properties> under <configuration>
props.setAttribute("xml:space", "preserve"); // And make sure space is properly preserved
elem.appendChild(props); // Add the space attribute
- for (Iterator i = properties.entrySet().iterator(); i.hasNext();) { // For each property
- Map.Entry entry = (Map.Entry) i.next(); // Get the property key/value pair
+ for (Map.Entry<Object, Object> objectObjectEntry : properties.entrySet()) { // For each property
+ Map.Entry entry =
+ (Map.Entry) objectObjectEntry; // Get the property key/value pair
String key = (String) entry.getKey(); // Key is always a String
String value = (String) entry.getValue(); // So is the value
Element prop = owner.createElement("property"); // Create a <property> element
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/grid/src/main/java/org/apache/oodt/grid/ProductQueryServlet.java
----------------------------------------------------------------------
diff --git a/grid/src/main/java/org/apache/oodt/grid/ProductQueryServlet.java b/grid/src/main/java/org/apache/oodt/grid/ProductQueryServlet.java
index 8229e75..4f1df63 100755
--- a/grid/src/main/java/org/apache/oodt/grid/ProductQueryServlet.java
+++ b/grid/src/main/java/org/apache/oodt/grid/ProductQueryServlet.java
@@ -56,15 +56,15 @@ public class ProductQueryServlet extends QueryServlet {
}
try { // OK, let's try
- for (Iterator i = handlers.iterator(); i.hasNext();) { // Try each query handler
- QueryHandler handler = (QueryHandler) i.next(); // Get the query handler
- query = handler.query(query); // Give it the query
- if (!query.getResults().isEmpty()) { // Did it give any result?
- Result result = (Result) query.getResults().get(0); // Yes, get the result
- deliverResult(handler, result, res); // And deliver it
- return; // Done!
- }
+ for (Object handler1 : handlers) { // Try each query handler
+ QueryHandler handler = (QueryHandler) handler1; // Get the query handler
+ query = handler.query(query); // Give it the query
+ if (!query.getResults().isEmpty()) { // Did it give any result?
+ Result result = (Result) query.getResults().get(0); // Yes, get the result
+ deliverResult(handler, result, res); // And deliver it
+ return; // Done!
}
+ }
} catch (ProductException ex) {
if (ex instanceof HttpRedirectException) {
HttpRedirectException hre = (HttpRedirectException) ex;
@@ -133,8 +133,11 @@ public class ProductQueryServlet extends QueryServlet {
* @return a <code>boolean</code> value.
*/
protected static boolean displayable(String contentType) {
- for (int i = 0; i < DISPLAYABLE_TYPES.length; ++i) // For each displayable type
- if (DISPLAYABLE_TYPES[i].equals(contentType)) return true; // Does it match?
+ for (String DISPLAYABLE_TYPE : DISPLAYABLE_TYPES) {
+ if (DISPLAYABLE_TYPE.equals(contentType)) {
+ return true; // Does it match?
+ }
+ }
return false; // None of 'em do, it's not displayable
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java
----------------------------------------------------------------------
diff --git a/grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java b/grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java
index 80b1592..4fa9a17 100755
--- a/grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java
+++ b/grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java
@@ -56,11 +56,12 @@ public class ProfileQueryServlet extends QueryServlet {
// Find if the query should be targeted to specific handlers.
Set ids = new HashSet();
if (query.getFromElementSet() != null) {
- for (Iterator i = query.getFromElementSet().iterator(); i.hasNext();) {
- QueryElement qe = (QueryElement) i.next();
- if ("handler".equals(qe.getRole()) && qe.getValue() != null)
- ids.add(qe.getValue());
+ for (Object o : query.getFromElementSet()) {
+ QueryElement qe = (QueryElement) o;
+ if ("handler".equals(qe.getRole()) && qe.getValue() != null) {
+ ids.add(qe.getValue());
}
+ }
}
res.setContentType("text/xml"); // XML, comin' at ya
@@ -73,27 +74,33 @@ public class ProfileQueryServlet extends QueryServlet {
Document doc = null; // Don't make 'em if we don't need 'em
boolean sentAtLeastOne = false; // Track if we send any profiles at all
Exception exception = null; // And save any exception
- for (Iterator i = handlers.iterator(); i.hasNext();) try { // To iterate over each handler
- ProfileHandler handler = (ProfileHandler) i.next(); // Get the handler
- String id = handler.getID(); // Get the ID, and if targeting to IDs
- if (!ids.isEmpty() && !ids.contains(id)) continue; // ... and it's not one we want, skip it.
- List results = handler.findProfiles(query); // Have it find profiles
- if (results == null) results = Collections.EMPTY_LIST; // Assume nothing
- for (Iterator j = results.iterator(); j.hasNext();) { // For each matching profile
- Profile profile = (Profile) j.next(); // Get the profile
- if (transformer == null) { // No transformer/doc yet?
- transformer = createTransformer(); // Then make the transformer
- doc = Profile.createProfileDocument(); // And the doc
- } // And use the doc ...
- Node profileNode = profile.toXML(doc); // To render the profile into XML
- DOMSource source = new DOMSource(profileNode); // And the XML becomes is source
- StreamResult result = new StreamResult(res.getWriter()); // And the response is a result
- transformer.transform(source, result); // And serialize into glorious text
- sentAtLeastOne = true; // OK, we got at least one out the doo
- }
- } catch (Exception ex) { // Uh oh
- exception = ex; // OK, just hold onto it for now
+ for (Object handler1 : handlers) {
+ try { // To iterate over each handler
+ ProfileHandler handler = (ProfileHandler) handler1; // Get the handler
+ String id = handler.getID(); // Get the ID, and if targeting to IDs
+ if (!ids.isEmpty() && !ids.contains(id)) {
+ continue; // ... and it's not one we want, skip it.
+ }
+ List results = handler.findProfiles(query); // Have it find profiles
+ if (results == null) {
+ results = Collections.EMPTY_LIST; // Assume nothing
+ }
+ for (Iterator j = results.iterator(); j.hasNext(); ) { // For each matching profile
+ Profile profile = (Profile) j.next(); // Get the profile
+ if (transformer == null) { // No transformer/doc yet?
+ transformer = createTransformer(); // Then make the transformer
+ doc = Profile.createProfileDocument(); // And the doc
+ } // And use the doc ...
+ Node profileNode = profile.toXML(doc); // To render the profile into XML
+ DOMSource source = new DOMSource(profileNode); // And the XML becomes is source
+ StreamResult result = new StreamResult(res.getWriter()); // And the response is a result
+ transformer.transform(source, result); // And serialize into glorious text
+ sentAtLeastOne = true; // OK, we got at least one out the doo
+ }
+ } catch (Exception ex) { // Uh oh
+ exception = ex; // OK, just hold onto it for now
}
+ }
if (!sentAtLeastOne && exception != null) { // Got none out the door and had an error?
res.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, // Then we can report it.
exception.getMessage());
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/grid/src/main/java/org/apache/oodt/grid/QueryServlet.java
----------------------------------------------------------------------
diff --git a/grid/src/main/java/org/apache/oodt/grid/QueryServlet.java b/grid/src/main/java/org/apache/oodt/grid/QueryServlet.java
index f22c6a9..22c58d0 100755
--- a/grid/src/main/java/org/apache/oodt/grid/QueryServlet.java
+++ b/grid/src/main/java/org/apache/oodt/grid/QueryServlet.java
@@ -93,10 +93,10 @@ public abstract class QueryServlet extends GridServlet {
updateHandlers(getServers(config)); // And any servers.
List handlerObjects = new ArrayList(handlers.size()); // Start with no handlers.
- for (Iterator i = handlers.iterator(); i.hasNext();) { // For each server
- InstantiedHandler ih = (InstantiedHandler) i.next(); // Get its handler
- handlerObjects.add(ih.getHandler()); // Add its handler
- }
+ for (Object handler : handlers) { // For each server
+ InstantiedHandler ih = (InstantiedHandler) handler; // Get its handler
+ handlerObjects.add(ih.getHandler()); // Add its handler
+ }
handleQuery(query, handlerObjects, req, res); // Handlers: handle query, please
} catch (RuntimeException ex) {
throw ex;
@@ -165,17 +165,19 @@ public abstract class QueryServlet extends GridServlet {
private synchronized void updateHandlers(List servers) throws ClassNotFoundException, InstantiationException,
IllegalAccessException {
eachServer:
- for (Iterator i = servers.iterator(); i.hasNext();) { // For each server
- Server server = (Server) i.next(); // Grab the server
- for (Iterator j = handlers.iterator(); j.hasNext();) { // For each handler
- InstantiedHandler handler = (InstantiedHandler) j.next(); // Grab the handler
- if (handler.getServer().equals(server)) // Have we already instantiated?
- continue eachServer; // Yes, try the next server
- }
- InstantiedHandler handler // No. Create ...
- = new InstantiedHandler(server, server.createHandler()); // ... a fresh handler
- handlers.add(handler); // Save it
+ for (Object server1 : servers) { // For each server
+ Server server = (Server) server1; // Grab the server
+ for (Object handler1 : handlers) { // For each handler
+ InstantiedHandler handler = (InstantiedHandler) handler1; // Grab the handler
+ if (handler.getServer().equals(server)) // Have we already instantiated?
+ {
+ continue eachServer; // Yes, try the next server
+ }
}
+ InstantiedHandler handler // No. Create ...
+ = new InstantiedHandler(server, server.createHandler()); // ... a fresh handler
+ handlers.add(handler); // Save it
+ }
for (Iterator i = handlers.iterator(); i.hasNext();) { // Now, for each handler
InstantiedHandler handler = (InstantiedHandler) i.next(); // Grab the handler
@@ -192,8 +194,9 @@ public abstract class QueryServlet extends GridServlet {
private synchronized void updateProperties(Configuration config) {
if (properties != null) { // Any old properties?
if (properties.equals(config.getProperties())) return; // Yes, any changes? No? Then done.
- for (Iterator i = properties.keySet().iterator(); i.hasNext();) // Yes, then grab each old setting
- System.getProperties().remove(i.next()); // and remove it.
+ for (Object o : properties.keySet()) {
+ System.getProperties().remove(o); // and remove it.
+ }
}
properties = (Properties) config.getProperties().clone(); // Now copy the new settings
System.getProperties().putAll(properties); // And set them!
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 6f9cf66..4b7068b 100644
--- a/grid/src/main/java/org/apache/oodt/grid/RestfulProductQueryServlet.java
+++ b/grid/src/main/java/org/apache/oodt/grid/RestfulProductQueryServlet.java
@@ -65,10 +65,12 @@ public class RestfulProductQueryServlet extends ProductQueryServlet {
while (parameterNames.hasMoreElements()) {
String paramName = parameterNames.nextElement();
String[] paramValues = req.getParameterValues(paramName);
- for (int i = 0; i < paramValues.length; i++) {
- if (q.length()>0) q.append(" AND ");
- q.append(paramName).append(" EQ ").append(paramValues[i]);
+ for (String paramValue : paramValues) {
+ if (q.length() > 0) {
+ q.append(" AND ");
}
+ q.append(paramName).append(" EQ ").append(paramValue);
+ }
}
// build XMLQuery object from HTTP parameters
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/mvn/plugins/cas-install/src/main/java/org/apache/oodt/cas/install/CASInstallDistMojo.java
----------------------------------------------------------------------
diff --git a/mvn/plugins/cas-install/src/main/java/org/apache/oodt/cas/install/CASInstallDistMojo.java b/mvn/plugins/cas-install/src/main/java/org/apache/oodt/cas/install/CASInstallDistMojo.java
index 6f3fdf3..1b5921a 100644
--- a/mvn/plugins/cas-install/src/main/java/org/apache/oodt/cas/install/CASInstallDistMojo.java
+++ b/mvn/plugins/cas-install/src/main/java/org/apache/oodt/cas/install/CASInstallDistMojo.java
@@ -238,19 +238,19 @@ public class CASInstallDistMojo extends AbstractMojo {
+ e.getMessage());
}
- for (int i = 0; i < customLibs.length; i++) {
- getLog().info(
- "installing [" + customLibs[i] + "] to "
- + libDir.getAbsolutePath() + "]");
- try {
- FileUtils.copyFileToDirectory(customLibs[i], libDir);
- } catch (IOException e) {
- getLog().warn(
- "IOException installing [" + customLibs[i]
- + "] to " + libDir.getAbsolutePath()
- + "]: Message: " + e.getMessage());
- }
+ for (File customLib : customLibs) {
+ getLog().info(
+ "installing [" + customLib + "] to "
+ + libDir.getAbsolutePath() + "]");
+ try {
+ FileUtils.copyFileToDirectory(customLib, libDir);
+ } catch (IOException e) {
+ getLog().warn(
+ "IOException installing [" + customLib
+ + "] to " + libDir.getAbsolutePath()
+ + "]: Message: " + e.getMessage());
}
+ }
}
if (envVarReplaceFiles != null && envVarReplaceFiles.length > 0) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/opendapps/src/main/java/org/apache/oodt/opendapps/DatasetCrawler.java
----------------------------------------------------------------------
diff --git a/opendapps/src/main/java/org/apache/oodt/opendapps/DatasetCrawler.java b/opendapps/src/main/java/org/apache/oodt/opendapps/DatasetCrawler.java
index 5b1b4a9..0758690 100644
--- a/opendapps/src/main/java/org/apache/oodt/opendapps/DatasetCrawler.java
+++ b/opendapps/src/main/java/org/apache/oodt/opendapps/DatasetCrawler.java
@@ -77,13 +77,11 @@ public class DatasetCrawler implements CatalogCrawler.Listener {
// look for an OpenDAP access URL, only extract metadata if it is found
List<InvAccess> datasets = dd.getAccess();
if (dd.getAccess() != null && dd.getAccess().size() > 0) {
- Iterator<InvAccess> sets = datasets.iterator();
- while (sets.hasNext()) {
- InvAccess single = sets.next();
+ for (InvAccess single : datasets) {
InvService service = single.getService();
// note: select the OpenDAP access URL based on THREDDS service type
- if (service.getServiceType()==ServiceType.OPENDAP) {
- LOG.log(Level.FINE, "Found OpenDAP access URL: "+ single.getUrlPath());
+ if (service.getServiceType() == ServiceType.OPENDAP) {
+ LOG.log(Level.FINE, "Found OpenDAP access URL: " + single.getUrlPath());
String opendapurl = this.datasetURL + single.getUrlPath();
// extract metadata from THREDDS catalog
MetadataExtractor extractor = new ThreddsMetadataExtractor(dd);
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlPropertiesFile.java
----------------------------------------------------------------------
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlPropertiesFile.java b/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlPropertiesFile.java
index 3b6bfa4..d887dc7 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlPropertiesFile.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlPropertiesFile.java
@@ -68,8 +68,8 @@ public class CrawlPropertiesFile implements CrawlerPropertiesMetKeys {
Map scalars = crawlInfo.getScalars();
List crawlers = new Vector(scalars.keySet().size());
- for (Iterator i = scalars.keySet().iterator(); i.hasNext();) {
- String crawlerName = (String) i.next();
+ for (Object o : scalars.keySet()) {
+ String crawlerName = (String) o;
String crawlerPort = crawlInfo.getScalar(crawlerName).getValue();
CrawlInfo info = new CrawlInfo(crawlerName, crawlerPort);
crawlers.add(info);
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 8783669..307667b 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
@@ -245,8 +245,8 @@ public final class PCSHealthMonitor implements CoreMetKeys,
List resNodes = rm.safeGetResourceNodes();
if (resNodes != null && resNodes.size() > 0) {
- for (Iterator i = resNodes.iterator(); i.hasNext();) {
- ResourceNode node = (ResourceNode) i.next();
+ for (Object resNode : resNodes) {
+ ResourceNode node = (ResourceNode) resNode;
PCSDaemonStatus batchStatus = new PCSDaemonStatus();
batchStatus.setDaemonName(BATCH_STUB_DAEMON_NAME);
batchStatus.setUrlStr(node.getIpAddr().toString());
@@ -275,10 +275,10 @@ public final class PCSHealthMonitor implements CoreMetKeys,
});
- for (Iterator i = crawlers.iterator(); i.hasNext();) {
- CrawlInfo info = (CrawlInfo) i.next();
+ for (Object crawler : crawlers) {
+ CrawlInfo info = (CrawlInfo) crawler;
String crawlerUrlStr = "http://" + crawlHost + ":"
- + info.getCrawlerPort();
+ + info.getCrawlerPort();
CrawlerStatus status = new CrawlerStatus();
status.setInfo(info);
status.setStatus(printUp(getCrawlerUp(crawlerUrlStr)));
@@ -307,8 +307,8 @@ public final class PCSHealthMonitor implements CoreMetKeys,
List states = this.statesFile.getStates();
if (states != null && states.size() > 0) {
- for (Iterator i = states.iterator(); i.hasNext();) {
- String state = (String) i.next();
+ for (Object state1 : states) {
+ String state = (String) state1;
int numPipelines = this.wm.safeGetNumWorkflowInstancesByStatus(state);
if (numPipelines == -1) {
numPipelines = 0;
@@ -382,10 +382,10 @@ public final class PCSHealthMonitor implements CoreMetKeys,
private void printJobStatusHealth(PCSHealthMonitorReport report) {
if (report.getJobHealthStatus() != null
&& report.getJobHealthStatus().size() > 0) {
- for (Iterator i = report.getJobHealthStatus().iterator(); i.hasNext();) {
- JobHealthStatus status = (JobHealthStatus) i.next();
+ for (Object o : report.getJobHealthStatus()) {
+ JobHealthStatus status = (JobHealthStatus) o;
System.out.println(status.getNumPipelines() + " pipelines "
- + status.getStatus());
+ + status.getStatus());
}
}
}
@@ -410,10 +410,10 @@ public final class PCSHealthMonitor implements CoreMetKeys,
private void printBatchStubs(PCSHealthMonitorReport report) {
if (report.getBatchStubStatus() != null
&& report.getBatchStubStatus().size() > 0) {
- for (Iterator i = report.getBatchStubStatus().iterator(); i.hasNext();) {
- PCSDaemonStatus batchStatus = (PCSDaemonStatus) i.next();
+ for (Object o : report.getBatchStubStatus()) {
+ PCSDaemonStatus batchStatus = (PCSDaemonStatus) o;
System.out.println("> " + batchStatus.getDaemonName() + ": ["
- + batchStatus.getUrlStr() + "]: " + batchStatus.getStatus());
+ + batchStatus.getUrlStr() + "]: " + batchStatus.getStatus());
}
}
@@ -533,17 +533,17 @@ public final class PCSHealthMonitor implements CoreMetKeys,
return;
}
- for (Iterator i = this.crawlProps.getCrawlers().iterator(); i.hasNext();) {
- CrawlInfo info = (CrawlInfo) i.next();
+ for (Object o : this.crawlProps.getCrawlers()) {
+ CrawlInfo info = (CrawlInfo) o;
String crawlUrlStr = "http://" + this.crawlProps.getCrawlHost() + ":"
- + info.getCrawlerPort();
+ + info.getCrawlerPort();
try {
CrawlDaemonController controller = new CrawlDaemonController(
crawlUrlStr);
System.out.println(info.getCrawlerName() + ":");
System.out.println("Number of Crawls: " + controller.getNumCrawls());
System.out.println("Average Crawl Time (seconds): "
- + (double) (controller.getAverageCrawlTime() / 1000.0));
+ + (double) (controller.getAverageCrawlTime() / 1000.0));
System.out.println("");
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSLongLister.java
----------------------------------------------------------------------
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSLongLister.java b/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSLongLister.java
index 4d7e53b..72ecaaa 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSLongLister.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSLongLister.java
@@ -64,8 +64,8 @@ public class PCSLongLister implements PCSMetadata, CoreMetKeys {
public void doList(List prodNames) {
if (prodNames != null && prodNames.size() > 0) {
System.out.println(getToolHeader());
- for (Iterator i = prodNames.iterator(); i.hasNext();) {
- String prodName = (String) i.next();
+ for (Object prodName1 : prodNames) {
+ String prodName = (String) prodName1;
// check to see if the product name has a "/" in it
// (this is true in the case of someone using */* from
// a shell): if it does, we'll consider the prodName a
@@ -181,14 +181,15 @@ public class PCSLongLister implements PCSMetadata, CoreMetKeys {
// if you find one tag, then set foundTag = true, and we
// break
if (products != null && products.size() > 0) {
- for (Iterator i = products.iterator(); i.hasNext();) {
- Product prod = (Product) i.next();
+ for (Object product : products) {
+ Product prod = (Product) product;
Metadata prodMet = fm.safeGetMetadata(prod);
if (prodMet.containsKey(tagType)) {
// got one, done
- if (!foundTag)
+ if (!foundTag) {
foundTag = true;
+ }
if (!tags.contains(prodMet.getMetadata(tagType))) {
tags.add(prodMet.getMetadata(tagType));
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java
----------------------------------------------------------------------
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java b/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java
index 76425c1..28b24f7 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java
@@ -136,8 +136,7 @@ public final class PCSTrace implements PCSMetadata, PCSConfigMetadata {
Metadata met = fm.safeGetMetadata(prod);
if (met != null && met.getHashtable() != null
&& met.getHashtable().keySet().size() > 0) {
- for (Iterator i = met.getHashtable().keySet().iterator(); i.hasNext();) {
- String key = (String) i.next();
+ for (String key : met.getHashtable().keySet()) {
List vals = met.getAllMetadata(key);
System.out.println(key + "=>" + vals);
}
@@ -159,8 +158,8 @@ public final class PCSTrace implements PCSMetadata, PCSConfigMetadata {
if (wInstProds != null && wInstProds.size() > 0) {
System.out.println("Associated products:");
System.out.println("");
- for (Iterator i = wInstProds.iterator(); i.hasNext();) {
- Product wInstProd = (Product) i.next();
+ for (Object wInstProd1 : wInstProds) {
+ Product wInstProd = (Product) wInstProd1;
System.out.println(wInstProd.getProductName());
}
}
@@ -238,8 +237,8 @@ public final class PCSTrace implements PCSMetadata, PCSConfigMetadata {
return null;
}
- for (Iterator i = insts.iterator(); i.hasNext();) {
- WorkflowInstance inst = (WorkflowInstance) i.next();
+ for (Object inst1 : insts) {
+ WorkflowInstance inst = (WorkflowInstance) inst1;
if (inst.getId().equals(id)) {
return inst;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/pcs/core/src/main/java/org/apache/oodt/pcs/util/FileManagerUtils.java
----------------------------------------------------------------------
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/util/FileManagerUtils.java b/pcs/core/src/main/java/org/apache/oodt/pcs/util/FileManagerUtils.java
index d084e7f..cb672a3 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/util/FileManagerUtils.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/util/FileManagerUtils.java
@@ -110,8 +110,8 @@ public class FileManagerUtils implements PCSConfigMetadata {
List typeList = new Vector();
if (typeNames != null && typeNames.size() > 0) {
- for (Iterator i = typeNames.iterator(); i.hasNext();) {
- String typeName = (String) i.next();
+ for (Object typeName1 : typeNames) {
+ String typeName = (String) typeName1;
ProductType type = safeGetProductTypeByName(typeName);
if (type != null) {
typeList.add(type);
@@ -126,8 +126,8 @@ public class FileManagerUtils implements PCSConfigMetadata {
List products = new Vector();
if (typeList != null && typeList.size() > 0) {
- for (Iterator i = typeList.iterator(); i.hasNext();) {
- ProductType type = (ProductType) i.next();
+ for (Object aTypeList : typeList) {
+ ProductType type = (ProductType) aTypeList;
List prods = safeIssueQuery(query, type);
if (prods != null && prods.size() > 0) {
products.addAll(prods);
@@ -161,8 +161,8 @@ public class FileManagerUtils implements PCSConfigMetadata {
List products = new Vector();
if (productTypes != null && productTypes.size() > 0) {
- for (Iterator i = productTypes.iterator(); i.hasNext();) {
- ProductType type = (ProductType) i.next();
+ for (Object productType : productTypes) {
+ ProductType type = (ProductType) productType;
if (excludeTypeList != null && excludeTypeList.contains(type.getName())) {
// System.out.println("Skipping: [" + type.getName() + "]");
continue;
@@ -428,8 +428,8 @@ public class FileManagerUtils implements PCSConfigMetadata {
public static Reference getRootReference(String productName, List refs) {
Reference r = null;
- for (Iterator i = refs.iterator(); i.hasNext();) {
- Reference ref = (Reference) i.next();
+ for (Object ref1 : refs) {
+ Reference ref = (Reference) ref1;
if (isRootDir(ref, productName)) {
r = ref;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileReader.java
----------------------------------------------------------------------
diff --git a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileReader.java b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileReader.java
index d87d983..9a04a6d 100644
--- a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileReader.java
+++ b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileReader.java
@@ -162,18 +162,18 @@ public class PGEConfigFileReader {
PGEGroup pgeGroup = new PGEGroup(group.getAttribute("name"));
- for (Iterator i = scalars.iterator(); i.hasNext();) {
- PGEScalar s = (PGEScalar) i.next();
+ for (Object scalar : scalars) {
+ PGEScalar s = (PGEScalar) scalar;
pgeGroup.addScalar(s);
}
- for (Iterator i = vectors.iterator(); i.hasNext();) {
- PGEVector v = (PGEVector) i.next();
+ for (Object vector : vectors) {
+ PGEVector v = (PGEVector) vector;
pgeGroup.addVector(v);
}
- for (Iterator i = matrixs.iterator(); i.hasNext();) {
- PGEMatrix m = (PGEMatrix) i.next();
+ for (Object matrix : matrixs) {
+ PGEMatrix m = (PGEMatrix) matrix;
pgeGroup.addMatrix(m);
}
@@ -187,8 +187,8 @@ public class PGEConfigFileReader {
List scalars = PGEXMLFileUtils.getScalars(group);
if (scalars != null && scalars.size() > 0) {
- for (Iterator i = scalars.iterator(); i.hasNext();) {
- PGEScalar scalar = (PGEScalar) i.next();
+ for (Object scalar1 : scalars) {
+ PGEScalar scalar = (PGEScalar) scalar1;
configFile.getMonitorLevelGroup().addScalar(scalar);
}
}
@@ -208,8 +208,8 @@ public class PGEConfigFileReader {
PGEScalar monPath = null, monFilenameFormat = null;
- for (Iterator i = scalars.iterator(); i.hasNext();) {
- PGEScalar scalar = (PGEScalar) i.next();
+ for (Object scalar1 : scalars) {
+ PGEScalar scalar = (PGEScalar) scalar1;
if (scalar.getName().equals("MonitorPath")) {
monPath = scalar;
@@ -297,8 +297,8 @@ public class PGEConfigFileReader {
List scalars = PGEXMLFileUtils.getScalars(group);
if (scalars != null && scalars.size() > 0) {
- for (Iterator i = scalars.iterator(); i.hasNext();) {
- PGEScalar scalar = (PGEScalar) i.next();
+ for (Object scalar1 : scalars) {
+ PGEScalar scalar = (PGEScalar) scalar1;
pgeGroup.addScalar(scalar);
}
}
@@ -310,8 +310,8 @@ public class PGEConfigFileReader {
List vectors = PGEXMLFileUtils.getVectors(group);
if (vectors != null && vectors.size() > 0) {
- for (Iterator i = vectors.iterator(); i.hasNext();) {
- PGEVector vector = (PGEVector) i.next();
+ for (Object vector1 : vectors) {
+ PGEVector vector = (PGEVector) vector1;
pgeGroup.addVector(vector);
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileWriter.java
----------------------------------------------------------------------
diff --git a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileWriter.java b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileWriter.java
index 0ae1162..165da6d 100644
--- a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileWriter.java
+++ b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileWriter.java
@@ -159,9 +159,7 @@ public final class PGEConfigFileWriter implements PGEConfigFileKeys,
}
// write the pge specific groups
- for (Iterator i = configFile.getPgeSpecificGroups().keySet().iterator(); i
- .hasNext();) {
- String pgeSpecificGroupName = (String) i.next();
+ for (String pgeSpecificGroupName : configFile.getPgeSpecificGroups().keySet()) {
PGEGroup pgeSpecificGroup = (PGEGroup) configFile
.getPgeSpecificGroups().get(pgeSpecificGroupName);
@@ -191,8 +189,7 @@ public final class PGEConfigFileWriter implements PGEConfigFileKeys,
groupElem.setAttribute(NAME_ATTR, group.getName());
if (group.getNumScalars() > 0) {
- for (Iterator i = group.getScalars().keySet().iterator(); i.hasNext();) {
- String scalarName = (String) i.next();
+ for (String scalarName : group.getScalars().keySet()) {
PGEScalar scalar = group.getScalar(scalarName);
Element scalarElem = document.createElement(SCALAR_TAG_NAME);
@@ -200,7 +197,7 @@ public final class PGEConfigFileWriter implements PGEConfigFileKeys,
if (scalar.getValue() == null) {
throw new Exception("Attempt to write null value for scalar: ["
- + scalarName + "] to PGE config file!");
+ + scalarName + "] to PGE config file!");
}
if (urlEncoding) {
@@ -210,8 +207,8 @@ public final class PGEConfigFileWriter implements PGEConfigFileKeys,
} catch (UnsupportedEncodingException e) {
LOG.log(Level.WARNING,
"Error creating text node for scalar element: "
- + scalar.getName() + " in pge group: " + group.getName()
- + " Message: " + e.getMessage());
+ + scalar.getName() + " in pge group: " + group.getName()
+ + " Message: " + e.getMessage());
}
} else {
@@ -224,19 +221,18 @@ public final class PGEConfigFileWriter implements PGEConfigFileKeys,
}
if (group.getNumVectors() > 0) {
- for (Iterator i = group.getVectors().keySet().iterator(); i.hasNext();) {
- String vectorName = (String) i.next();
+ for (String vectorName : group.getVectors().keySet()) {
PGEVector vector = group.getVector(vectorName);
Element vectorElem = document.createElement(VECTOR_TAG_NAME);
vectorElem.setAttribute(NAME_ATTR, vector.getName());
- for (Iterator j = vector.getElements().iterator(); j.hasNext();) {
- String element = (String) j.next();
+ for (Object o : vector.getElements()) {
+ String element = (String) o;
if (element == null) {
throw new Exception("Attempt to write null value for vector: ["
- + vectorName + "] to PGE config file!");
+ + vectorName + "] to PGE config file!");
}
Element elementElem = document.createElement(VECTOR_ELEMENT_TAG);
@@ -247,8 +243,8 @@ public final class PGEConfigFileWriter implements PGEConfigFileKeys,
} catch (UnsupportedEncodingException e) {
LOG.log(Level.WARNING,
"Error creating text node for vector element: "
- + vector.getName() + " in pge group: " + group.getName()
- + " Message: " + e.getMessage());
+ + vector.getName() + " in pge group: " + group.getName()
+ + " Message: " + e.getMessage());
}
} else {
elementElem.appendChild(document.createTextNode(element));
@@ -262,27 +258,26 @@ public final class PGEConfigFileWriter implements PGEConfigFileKeys,
}
if (group.getNumMatrixs() > 0) {
- for (Iterator i = group.getMatrixs().keySet().iterator(); i.hasNext();) {
- String matrixName = (String) i.next();
+ for (String matrixName : group.getMatrixs().keySet()) {
PGEMatrix matrix = group.getMatrix(matrixName);
Element matrixElem = document.createElement(MATRIX_TAG_NAME);
matrixElem.setAttribute(NAME_ATTR, matrix.getName());
int rowNum = 0;
- for (Iterator j = matrix.getRows().iterator(); j.hasNext();) {
- List rowValues = (List) j.next();
+ for (List<Object> objects : matrix.getRows()) {
+ List rowValues = (List) objects;
Element rowElem = document.createElement(MATRIX_ROW_TAG);
int colNum = 0;
- for (Iterator k = rowValues.iterator(); k.hasNext();) {
- String colValue = (String) k.next();
+ for (Object rowValue : rowValues) {
+ String colValue = (String) rowValue;
Element colElem = document.createElement(MATRIX_COL_TAG);
if (colValue == null) {
throw new Exception("Attempt to write null value for matrix: ["
- + matrixName + "]: " + "(" + rowNum + "," + colNum + ")");
+ + matrixName + "]: " + "(" + rowNum + "," + colNum + ")");
}
if (urlEncoding) {
@@ -292,9 +287,9 @@ public final class PGEConfigFileWriter implements PGEConfigFileKeys,
} catch (UnsupportedEncodingException e) {
LOG.log(Level.WARNING,
"Error creating node for matrix element: "
- + matrix.getName() + " (" + rowNum + "," + colNum
- + ") in pge group: " + group.getName() + " Message: "
- + e.getMessage());
+ + matrix.getName() + " (" + rowNum + "," + colNum
+ + ") in pge group: " + group.getName() + " Message: "
+ + e.getMessage());
}
} else {
@@ -312,8 +307,7 @@ public final class PGEConfigFileWriter implements PGEConfigFileKeys,
}
if (group.getNumGroups() > 0) {
- for (Iterator i = group.getGroups().keySet().iterator(); i.hasNext();) {
- String groupName = (String) i.next();
+ for (String groupName : group.getGroups().keySet()) {
PGEGroup subgroup = group.getGroup(groupName);
Element subgroupElem = getGroupElement(subgroup, document);
groupElem.appendChild(subgroupElem);
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java
----------------------------------------------------------------------
diff --git a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java
index e4c8581..f5c28e0 100644
--- a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java
+++ b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java
@@ -99,15 +99,16 @@ public abstract class AbstractCrawlLister implements OFSNListHandler {
productFiles = dir.listFiles(FILE_FILTER);
}
- for (int j = 0; j < productFiles.length; j++) {
- fileList.add(productFiles[j]);
+ for (File productFile : productFiles) {
+ fileList.add(productFile);
}
if (recur) {
File[] subdirs = dir.listFiles(DIR_FILTER);
if (subdirs != null)
- for (int j = 0; j < subdirs.length; j++)
- stack.push(subdirs[j]);
+ for (File subdir : subdirs) {
+ stack.push(subdir);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/product/src/main/java/org/apache/oodt/product/handlers/ofsn/URLGetHandler.java
----------------------------------------------------------------------
diff --git a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/URLGetHandler.java b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/URLGetHandler.java
index ca29c9c..bd119d6 100644
--- a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/URLGetHandler.java
+++ b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/URLGetHandler.java
@@ -171,11 +171,11 @@ public class URLGetHandler extends AbstractCrawlLister implements OFSNGetHandler
// convert each crawled file's path into an OFSN download link
StringBuilder stringBuilder = new StringBuilder();
- for (int i=0; i < fileListing.length; i++) {
- File file = (File) fileListing[i];
- stringBuilder.append(buildOFSNURL(file).toString());
- stringBuilder.append("\n");
- }
+ for (File aFileListing : fileListing) {
+ File file = (File) aFileListing;
+ stringBuilder.append(buildOFSNURL(file).toString());
+ stringBuilder.append("\n");
+ }
return stringBuilder.toString();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/profile/src/main/java/org/apache/oodt/profile/EnumeratedProfileElement.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/EnumeratedProfileElement.java b/profile/src/main/java/org/apache/oodt/profile/EnumeratedProfileElement.java
index c644f79..a0aa99c 100644
--- a/profile/src/main/java/org/apache/oodt/profile/EnumeratedProfileElement.java
+++ b/profile/src/main/java/org/apache/oodt/profile/EnumeratedProfileElement.java
@@ -76,11 +76,11 @@ public class EnumeratedProfileElement extends ProfileElement {
protected void addValues(Node node) throws DOMException {
if (values == null) return;
- for (Iterator<?> i = values.iterator(); i.hasNext();) {
- Element e = node.getOwnerDocument().createElement("elemValue");
- e.appendChild(node.getOwnerDocument().createCDATASection((String) i.next()));
- node.appendChild(e);
- }
+ for (Object value : values) {
+ Element e = node.getOwnerDocument().createElement("elemValue");
+ e.appendChild(node.getOwnerDocument().createCDATASection((String) value));
+ node.appendChild(e);
+ }
}
public String getMinValue() {
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 7fab8ec..2cb6184 100644
--- a/profile/src/main/java/org/apache/oodt/profile/Profile.java
+++ b/profile/src/main/java/org/apache/oodt/profile/Profile.java
@@ -269,10 +269,9 @@ public class Profile implements Serializable, Cloneable, Comparable<Object>, Doc
public void addToModel(Model model) {
Resource resource = model.createResource(getURI().toString());
resAttr.addToModel(model, resource, profAttr);
- for (Iterator<ProfileElement> i = elements.values().iterator(); i.hasNext();) {
- ProfileElement e = (ProfileElement) i.next();
- e.addToModel(model, resource, profAttr);
- }
+ for (ProfileElement e : elements.values()) {
+ e.addToModel(model, resource, profAttr);
+ }
}
/**
@@ -309,8 +308,10 @@ public class Profile implements Serializable, Cloneable, Comparable<Object>, Doc
Element profile = doc.createElement("profile");
profile.appendChild(profAttr.toXML(doc));
profile.appendChild(resAttr.toXML(doc));
- if (withElements) for (Iterator<ProfileElement> i = elements.values().iterator(); i.hasNext();)
- profile.appendChild(((ProfileElement) i.next()).toXML(doc));
+ if (withElements)
+ for (ProfileElement profileElement : elements.values()) {
+ profile.appendChild((profileElement).toXML(doc));
+ }
return profile;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/profile/src/main/java/org/apache/oodt/profile/ProfileElement.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/ProfileElement.java b/profile/src/main/java/org/apache/oodt/profile/ProfileElement.java
index d2c3f23..6224177 100644
--- a/profile/src/main/java/org/apache/oodt/profile/ProfileElement.java
+++ b/profile/src/main/java/org/apache/oodt/profile/ProfileElement.java
@@ -526,10 +526,10 @@ public abstract class ProfileElement implements Serializable, Cloneable, Compara
*/
public static Set<Profile> profiles(Set<?> elements) {
Set<Profile> rc = new HashSet<Profile>();
- for (Iterator<?> i = elements.iterator(); i.hasNext();) {
- ProfileElement element = (ProfileElement) i.next();
- rc.add(element.getProfile());
- }
+ for (Object element1 : elements) {
+ ProfileElement element = (ProfileElement) element1;
+ rc.add(element.getProfile());
+ }
return rc;
}
@@ -543,11 +543,12 @@ public abstract class ProfileElement implements Serializable, Cloneable, Compara
*/
public static Set<ProfileElement> elements(Set<?> profiles, Set<?> elements) {
Set<ProfileElement> rc = new HashSet<ProfileElement>();
- for (Iterator<?> i = elements.iterator(); i.hasNext();) {
- ProfileElement element = (ProfileElement) i.next();
- if (profiles.contains(element.getProfile()))
- rc.add(element);
+ for (Object element1 : elements) {
+ ProfileElement element = (ProfileElement) element1;
+ if (profiles.contains(element.getProfile())) {
+ rc.add(element);
}
+ }
return rc;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/profile/src/main/java/org/apache/oodt/profile/Utility.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/Utility.java b/profile/src/main/java/org/apache/oodt/profile/Utility.java
index 2e6517f..a5b74da 100644
--- a/profile/src/main/java/org/apache/oodt/profile/Utility.java
+++ b/profile/src/main/java/org/apache/oodt/profile/Utility.java
@@ -60,8 +60,9 @@ class Utility {
Collection<?> collection = (Collection<?>) value;
if (collection.isEmpty()) return;
Bag bag = model.createBag(uri + "_" + property.getLocalName() + "_bag");
- for (Iterator<?> i = collection.iterator(); i.hasNext();)
- bag.add(i.next());
+ for (Object aCollection : collection) {
+ bag.add(aCollection);
+ }
resource.addProperty(property, bag);
obj = bag;
} else {
@@ -87,16 +88,18 @@ class Utility {
List<?> children = profAttr.getChildren();
if (!children.isEmpty()) {
Bag bag = model.createBag(uri + "_" + property.getLocalName() + "_childrenBag");
- for (Iterator<?> i = children.iterator(); i.hasNext();)
- bag.add(i.next());
+ for (Object aChildren : children) {
+ bag.add(aChildren);
+ }
reification.addProperty(edmChild, bag);
}
List<?> revNotes = profAttr.getRevisionNotes();
if (!revNotes.isEmpty()) {
Seq seq = model.createSeq(uri + "_" + property.getLocalName() + "_revNotesSeq");
- for (Iterator<?> i = revNotes.iterator(); i.hasNext();)
- seq.add(i.next());
+ for (Object revNote : revNotes) {
+ seq.add(revNote);
+ }
reification.addProperty(edmRevNote, seq);
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfileAttributesPrinter.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfileAttributesPrinter.java b/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfileAttributesPrinter.java
index 01d57af..614d122 100755
--- a/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfileAttributesPrinter.java
+++ b/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfileAttributesPrinter.java
@@ -55,18 +55,18 @@ public class ProfileAttributesPrinter {
rStr+="\t<profStatusId>"+myProfAttributes.getStatusID()+"</profStatusId>\n";
rStr+="\t<profSecurityType>"+myProfAttributes.getSecurityType()+"</profSecurityType>\n";
rStr+="\t<profParentId>"+myProfAttributes.getParent()+"</profParentId>\n";
-
- for(Iterator i = myProfAttributes.getChildren().iterator(); i.hasNext(); ){
- String theChild = (String)i.next();
- rStr+="\t<profChildId>"+theChild+"</profChildId>\n";
- }
+
+ for (Object o1 : myProfAttributes.getChildren()) {
+ String theChild = (String) o1;
+ rStr += "\t<profChildId>" + theChild + "</profChildId>\n";
+ }
rStr+="\t<profRegAuthority>"+myProfAttributes.getRegAuthority()+"</profRegAuthority>\n";
-
- for(Iterator i = myProfAttributes.getRevisionNotes().iterator(); i.hasNext(); ){
- String theNote = (String)i.next();
- rStr+="\t<profRevisionNote>"+theNote+"</profRevisionNote>\n";
- }
+
+ for (Object o : myProfAttributes.getRevisionNotes()) {
+ String theNote = (String) o;
+ rStr += "\t<profRevisionNote>" + theNote + "</profRevisionNote>\n";
+ }
rStr+="</profAttributes>\n\n";
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfileElementPrinter.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfileElementPrinter.java b/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfileElementPrinter.java
index 55e9896..3f8c260 100755
--- a/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfileElementPrinter.java
+++ b/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfileElementPrinter.java
@@ -52,11 +52,11 @@ public class ProfileElementPrinter {
rStr+="\t<elemMaxOccurrence>"+myProfileElement.getMaxOccurrence()+"</elemMaxOccurrence>\n";
rStr+="\t<elemMaxValue>"+myProfileElement.getMaxValue()+"</elemMaxValue>\n";
rStr+="\t<elemMinValue>"+myProfileElement.getMinValue()+"</elemMinValue>\n";
-
- for(Iterator i = myProfileElement.getValues().iterator(); i.hasNext(); ){
- String theValue = (String)i.next();
- rStr+="<elemValue>"+theValue+"</elemValue>\n";
- }
+
+ for (Object o : myProfileElement.getValues()) {
+ String theValue = (String) o;
+ rStr += "<elemValue>" + theValue + "</elemValue>\n";
+ }
rStr+="\t<elemComment>"+myProfileElement.getComments()+"</elemComment>\n";
rStr+="</profElement>\n";
return rStr;
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfilePrinter.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfilePrinter.java b/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfilePrinter.java
index 22f52a9..2909ea8 100755
--- a/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfilePrinter.java
+++ b/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfilePrinter.java
@@ -64,14 +64,12 @@ public class ProfilePrinter {
ResourceAttributesPrinter rap = new ResourceAttributesPrinter(myProfile.getResourceAttributes());
rStr+=rap.toXMLString();
-
- for(Iterator i = myProfile.getProfileElements().keySet().iterator(); i.hasNext(); ){
- String profElemName = (String)i.next();
-
- ProfileElement pe = (ProfileElement)myProfile.getProfileElements().get(profElemName);
- ProfileElementPrinter pPrinter = new ProfileElementPrinter(pe);
- rStr+=pPrinter.toXMLString();
- }
+
+ for (String profElemName : myProfile.getProfileElements().keySet()) {
+ ProfileElement pe = (ProfileElement) myProfile.getProfileElements().get(profElemName);
+ ProfileElementPrinter pPrinter = new ProfileElementPrinter(pe);
+ rStr += pPrinter.toXMLString();
+ }
rStr+="</profile>\n";
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ResourceAttributesPrinter.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ResourceAttributesPrinter.java b/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ResourceAttributesPrinter.java
index 0bc1a90..81a7932 100755
--- a/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ResourceAttributesPrinter.java
+++ b/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ResourceAttributesPrinter.java
@@ -60,70 +60,57 @@ public class ResourceAttributesPrinter {
rStr+="\t<resClass>"+resAttr.getResClass()+"</resClass>\n";
rStr+="\t<resAggregation>"+resAttr.getResAggregation()+"</resAggregation>\n";
- for(Iterator i = resAttr.getRights().iterator(); i.hasNext(); ){
- String theRight = (String)i.next();
- rStr+="\t<Right>"+theRight+"</Right>\n";
- }
-
- for(Iterator i = resAttr.getSources().iterator(); i.hasNext(); ){
- String theSource = (String)i.next();
- rStr+="\t<Source>"+theSource+"</Source>\n";
- }
-
- for(Iterator i = resAttr.getSubjects().iterator(); i.hasNext(); ){
- String theSubject = (String)i.next();
- rStr+="\t<Subject>"+theSubject+"</Subject>\n";
- }
-
- for(Iterator i = resAttr.getFormats().iterator(); i.hasNext(); ){
- String theFormat = (String)i.next();
- rStr+="\t<Format>"+theFormat+"</Format>\n";
- }
-
- for(Iterator i = resAttr.getCreators().iterator(); i.hasNext(); ){
- String theCreator = (String)i.next();
- rStr+="\t<Creator>"+theCreator+"</Creator>\n";
- }
-
- for(Iterator i = resAttr.getPublishers().iterator(); i.hasNext(); ){
- String thePublisher = (String)i.next();
- rStr+="\t<Publisher>"+thePublisher+"</Publisher>\n";
- }
-
- for(Iterator i = resAttr.getTypes().iterator(); i.hasNext(); ){
- String theType = (String)i.next();
- rStr+="\t<Type>"+theType+"</Type>\n";
- }
-
- for(Iterator i = resAttr.getResContexts().iterator(); i.hasNext(); ){
- String theContext = (String)i.next();
- rStr+="\t<resContext>"+theContext+"</resContext>\n";
- }
-
- for(Iterator i = resAttr.getResLocations().iterator(); i.hasNext(); ){
- String theLocation = (String)i.next();
- rStr+="\t<resLocation>"+theLocation+"</resLocation>\n";
- }
-
- for(Iterator i = resAttr.getContributors().iterator(); i.hasNext(); ){
- String theContributor = (String)i.next();
- rStr+="\t<Contributor>"+theContributor+"</Contributor>\n";
- }
-
- for(Iterator i = resAttr.getCoverages().iterator(); i.hasNext(); ){
- String theCoverage = (String)i.next();
- rStr+="\t<Coverage>"+theCoverage+"</Coverage>\n";
- }
-
- for(Iterator i = resAttr.getLanguages().iterator(); i.hasNext(); ){
- String theLang = (String)i.next();
- rStr+="\t<Language>"+theLang+"</Language>\n";
- }
-
- for(Iterator i = resAttr.getRelations().iterator(); i.hasNext(); ){
- String theRelation = (String)i.next();
- rStr+="\t<Relation>"+theRelation+"</Relation>\n";
- }
+ for (String theRight : resAttr.getRights()) {
+ rStr += "\t<Right>" + theRight + "</Right>\n";
+ }
+
+ for (String theSource : resAttr.getSources()) {
+ rStr += "\t<Source>" + theSource + "</Source>\n";
+ }
+
+ for (String theSubject : resAttr.getSubjects()) {
+ rStr += "\t<Subject>" + theSubject + "</Subject>\n";
+ }
+
+ for (String theFormat : resAttr.getFormats()) {
+ rStr += "\t<Format>" + theFormat + "</Format>\n";
+ }
+
+ for (String theCreator : resAttr.getCreators()) {
+ rStr += "\t<Creator>" + theCreator + "</Creator>\n";
+ }
+
+ for (String thePublisher : resAttr.getPublishers()) {
+ rStr += "\t<Publisher>" + thePublisher + "</Publisher>\n";
+ }
+
+ for (String theType : resAttr.getTypes()) {
+ rStr += "\t<Type>" + theType + "</Type>\n";
+ }
+
+ for (String theContext : resAttr.getResContexts()) {
+ rStr += "\t<resContext>" + theContext + "</resContext>\n";
+ }
+
+ for (String theLocation : resAttr.getResLocations()) {
+ rStr += "\t<resLocation>" + theLocation + "</resLocation>\n";
+ }
+
+ for (String theContributor : resAttr.getContributors()) {
+ rStr += "\t<Contributor>" + theContributor + "</Contributor>\n";
+ }
+
+ for (String theCoverage : resAttr.getCoverages()) {
+ rStr += "\t<Coverage>" + theCoverage + "</Coverage>\n";
+ }
+
+ for (String theLang : resAttr.getLanguages()) {
+ rStr += "\t<Language>" + theLang + "</Language>\n";
+ }
+
+ for (String theRelation : resAttr.getRelations()) {
+ rStr += "\t<Relation>" + theRelation + "</Relation>\n";
+ }
rStr+="</resAttributes>\n";
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/profile/src/main/java/org/apache/oodt/profile/handlers/cas/CASProfileHandler.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/handlers/cas/CASProfileHandler.java b/profile/src/main/java/org/apache/oodt/profile/handlers/cas/CASProfileHandler.java
index ceb9baa..1ef17a1 100644
--- a/profile/src/main/java/org/apache/oodt/profile/handlers/cas/CASProfileHandler.java
+++ b/profile/src/main/java/org/apache/oodt/profile/handlers/cas/CASProfileHandler.java
@@ -99,8 +99,8 @@ public class CASProfileHandler implements ProfileHandler {
List profs = new Vector();
if (productTypeFilter != null && productTypeFilter.size() > 0) {
- for (Iterator i = productTypeFilter.iterator(); i.hasNext();) {
- ProductType type = (ProductType) i.next();
+ for (Object aProductTypeFilter : productTypeFilter) {
+ ProductType type = (ProductType) aProductTypeFilter;
Query cQuery = convertQuery(query);
profs.addAll(queryAndBuildProfiles(type, cQuery));
@@ -264,13 +264,13 @@ public class CASProfileHandler implements ProfileHandler {
products = fmClient.query(query, type);
if (products != null && products.size() > 0) {
- for (Iterator i = products.iterator(); i.hasNext();) {
- Product p = (Product) i.next();
+ for (Object product : products) {
+ Product p = (Product) product;
p.setProductReferences(safeGetProductReferences(p));
Metadata met = safeGetMetadata(p);
try {
profiles.add(ProfileUtils.buildProfile(p, met,
- dataDelivBaseUrlStr));
+ dataDelivBaseUrlStr));
} catch (Exception e) {
e.printStackTrace();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/profile/src/main/java/org/apache/oodt/profile/handlers/cas/util/ProfileUtils.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/handlers/cas/util/ProfileUtils.java b/profile/src/main/java/org/apache/oodt/profile/handlers/cas/util/ProfileUtils.java
index 9338c73..7a2b379 100644
--- a/profile/src/main/java/org/apache/oodt/profile/handlers/cas/util/ProfileUtils.java
+++ b/profile/src/main/java/org/apache/oodt/profile/handlers/cas/util/ProfileUtils.java
@@ -90,12 +90,11 @@ public final class ProfileUtils {
prof.setResourceAttributes(resAttrs);
// build up profile elements
- for(Iterator i = met.getHashtable().keySet().iterator(); i.hasNext(); ){
- String key = (String)i.next();
+ for (String key : met.getHashtable().keySet()) {
List vals = met.getAllMetadata(key);
-
+
EnumeratedProfileElement elem = new EnumeratedProfileElement(prof);
- System.out.println("Adding ["+key+"]=>"+vals);
+ System.out.println("Adding [" + key + "]=>" + vals);
elem.setName(key);
elem.getValues().addAll(vals);
prof.getProfileElements().put(key, elem);
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 c31db1c..8994028 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
@@ -134,16 +134,17 @@ final public class LightweightProfileServer implements ProfileHandler {
WhereExpression whereExpression = createWhereExpression(query);
// Search each profile, and add the results of the search to the set of results.
- for (Iterator i = profiles.iterator(); i.hasNext();) {
- SearchableProfile profile = (SearchableProfile) i.next();
+ for (Object profile1 : profiles) {
+ SearchableProfile profile = (SearchableProfile) profile1;
- // Search the profile with the where-expression.
- Result result = profile.search(whereExpression);
+ // Search the profile with the where-expression.
+ Result result = profile.search(whereExpression);
- // If there are any matching elements, add the profile to the set.
- if (!result.matchingElements().isEmpty())
- matchingProfiles.add(profile);
+ // If there are any matching elements, add the profile to the set.
+ if (!result.matchingElements().isEmpty()) {
+ matchingProfiles.add(profile);
}
+ }
// Convert from set to list.
return new ArrayList(matchingProfiles);
@@ -158,13 +159,13 @@ final public class LightweightProfileServer implements ProfileHandler {
public Profile get(String profID) {
if (profID == null) return null;
Profile rc = null;
- for (Iterator i = profiles.iterator(); i.hasNext();) {
- Profile p = (Profile) i.next();
- if (p.getProfileAttributes().getID().equals(profID)) {
- rc = p;
- break;
- }
+ for (Object profile : profiles) {
+ Profile p = (Profile) profile;
+ if (p.getProfileAttributes().getID().equals(profID)) {
+ rc = p;
+ break;
}
+ }
return rc;
}
@@ -186,36 +187,38 @@ final public class LightweightProfileServer implements ProfileHandler {
}
// For each item in the where-set
- for (Iterator i = allElements.iterator(); i.hasNext();) {
- QueryElement queryElement = (QueryElement) i.next();
-
- // Get the keyword and its type.
- String keyword = queryElement.getValue();
- String type = queryElement.getRole();
-
- if (type.equals("elemName")) {
- // It's an element name, so push the element name.
- stack.push(keyword);
- } else if (type.equals("LITERAL")) {
- // It's a literal value, so push the value.
- stack.push(keyword);
- } else if (type.equals("LOGOP")) {
- // It's a logical operator. Pop the operands off the
- // stack and push the appropriate operator back on.
- if (keyword.equals("AND")) {
- stack.push(new AndExpression((WhereExpression) stack.pop(), (WhereExpression)stack.pop()));
- } else if (keyword.equals("OR")) {
- stack.push(new OrExpression((WhereExpression) stack.pop(), (WhereExpression)stack.pop()));
- } else if (keyword.equals("NOT")) {
- stack.push(new NotExpression((WhereExpression) stack.pop()));
- } else throw new IllegalArgumentException("Illegal operator \"" + keyword + "\" in query");
- } else if (type.equals("RELOP")) {
- // It's a relational operator. Pop the element name and
- // literal value off the stack, and push the operator
- // expression on with the given operator.
- stack.push(new OperatorExpression((String) stack.pop(), (String) stack.pop(), keyword));
- }
+ for (Object allElement : allElements) {
+ QueryElement queryElement = (QueryElement) allElement;
+
+ // Get the keyword and its type.
+ String keyword = queryElement.getValue();
+ String type = queryElement.getRole();
+
+ if (type.equals("elemName")) {
+ // It's an element name, so push the element name.
+ stack.push(keyword);
+ } else if (type.equals("LITERAL")) {
+ // It's a literal value, so push the value.
+ stack.push(keyword);
+ } else if (type.equals("LOGOP")) {
+ // It's a logical operator. Pop the operands off the
+ // stack and push the appropriate operator back on.
+ if (keyword.equals("AND")) {
+ stack.push(new AndExpression((WhereExpression) stack.pop(), (WhereExpression) stack.pop()));
+ } else if (keyword.equals("OR")) {
+ stack.push(new OrExpression((WhereExpression) stack.pop(), (WhereExpression) stack.pop()));
+ } else if (keyword.equals("NOT")) {
+ stack.push(new NotExpression((WhereExpression) stack.pop()));
+ } else {
+ throw new IllegalArgumentException("Illegal operator \"" + keyword + "\" in query");
+ }
+ } else if (type.equals("RELOP")) {
+ // It's a relational operator. Pop the element name and
+ // literal value off the stack, and push the operator
+ // expression on with the given operator.
+ stack.push(new OperatorExpression((String) stack.pop(), (String) stack.pop(), keyword));
}
+ }
// If there's nothing on the stack, we're given nothing, so give back everything.
if (stack.size() == 0)
@@ -272,8 +275,9 @@ final public class LightweightProfileServer implements ProfileHandler {
// Gather together the command-line arguments into a single long string.
StringBuilder b = new StringBuilder();
- for (int i = 0; i < argv.length; ++i)
- b.append(argv[i]).append(' ');
+ for (String anArgv : argv) {
+ b.append(anArgv).append(' ');
+ }
// Create the query object from the expression.
XMLQuery query = new XMLQuery(b.toString().trim(), /*id*/"cli1", /*title*/"CmdLine-1",
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableResourceAttributes.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableResourceAttributes.java b/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableResourceAttributes.java
index 9ba2f98..854a63f 100644
--- a/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableResourceAttributes.java
+++ b/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableResourceAttributes.java
@@ -117,11 +117,13 @@ public class SearchableResourceAttributes extends ResourceAttributes {
else if ("NE".equals(op) || "NOTLIKE".equals(op))
if (!a.contains(b)) rc = t;
else if ("LT".equals(op) || "GT".equals(op) || "LE".equals(op) || "GE".equals(op)) {
- for (Iterator i = a.iterator(); i.hasNext();) {
- String value = (String) i.next();
+ for (Object anA : a) {
+ String value = (String) anA;
rc = computeResult(value, b, op);
- if (rc != f) break;
- }
+ if (rc != f) {
+ break;
+ }
+ }
} else throw new IllegalArgumentException("Unknown relational operator \"" + op + "\"");
return rc;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/profile/src/test/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServerTest.java
----------------------------------------------------------------------
diff --git a/profile/src/test/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServerTest.java b/profile/src/test/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServerTest.java
index 8c7c134..6c0f263 100644
--- a/profile/src/test/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServerTest.java
+++ b/profile/src/test/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServerTest.java
@@ -106,16 +106,18 @@ public class LightweightProfileServerTest extends TestCase {
// And again, but spanning profiles
profiles = doSearch("TEST2 = 48 OR TEST4 = 192");
assertEquals(2, profiles.size());
- for (Iterator i = profiles.iterator(); i.hasNext();) {
- profile = (SearchableProfile) i.next();
- elements = profile.getProfileElements();
- assertEquals(3, elements.size());
- if (profile.getProfileAttributes().getID().equals("PROFILE1")) {
- assertTrue(elements.containsKey("TEST2"));
- } else if (profile.getProfileAttributes().getID().equals("PROFILE2")) {
- assertTrue(elements.containsKey("TEST4"));
- } else fail("Profile \"" + profile.getProfileAttributes().getID() + "\" matched, but shouldn't");
+ for (Object profile1 : profiles) {
+ profile = (SearchableProfile) profile1;
+ elements = profile.getProfileElements();
+ assertEquals(3, elements.size());
+ if (profile.getProfileAttributes().getID().equals("PROFILE1")) {
+ assertTrue(elements.containsKey("TEST2"));
+ } else if (profile.getProfileAttributes().getID().equals("PROFILE2")) {
+ assertTrue(elements.containsKey("TEST4"));
+ } else {
+ fail("Profile \"" + profile.getProfileAttributes().getID() + "\" matched, but shouldn't");
}
+ }
// And again, but with a query on the "from" part.
profiles = doSearch("( TEST2 = 48 OR TEST4 = 192 ) AND Creator = Alice");
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/protocol/ftp/src/main/java/org/apache/oodt/cas/protocol/ftp/CommonsNetFtpProtocol.java
----------------------------------------------------------------------
diff --git a/protocol/ftp/src/main/java/org/apache/oodt/cas/protocol/ftp/CommonsNetFtpProtocol.java b/protocol/ftp/src/main/java/org/apache/oodt/cas/protocol/ftp/CommonsNetFtpProtocol.java
index fdc0f3c..d55b08b 100644
--- a/protocol/ftp/src/main/java/org/apache/oodt/cas/protocol/ftp/CommonsNetFtpProtocol.java
+++ b/protocol/ftp/src/main/java/org/apache/oodt/cas/protocol/ftp/CommonsNetFtpProtocol.java
@@ -105,13 +105,13 @@ public class CommonsNetFtpProtocol implements Protocol {
String path = this.pwd().getPath();
FTPFile[] files = ftp.listFiles();
List<ProtocolFile> returnFiles = new LinkedList<ProtocolFile>();
- for (int i = 0; i < files.length; i++) {
- FTPFile file = files[i];
- if (file == null)
- continue;
- returnFiles.add(new ProtocolFile(path + "/" + file.getName(), file
- .isDirectory()));
+ for (FTPFile file : files) {
+ if (file == null) {
+ continue;
}
+ returnFiles.add(new ProtocolFile(path + "/" + file.getName(), file
+ .isDirectory()));
+ }
return returnFiles;
} catch (Exception e) {
throw new ProtocolException("Failed to get file list : " + e.getMessage());
@@ -126,17 +126,17 @@ public class CommonsNetFtpProtocol implements Protocol {
try {
FTPFile[] files = ftp.listFiles();
List<ProtocolFile> returnFiles = new LinkedList<ProtocolFile>();
- for (int i = 0; i < files.length; i++) {
- FTPFile file = files[i];
- if (file == null)
- continue;
- String path = this.pwd().getPath();
- ProtocolFile pFile = new ProtocolFile(path + "/" + file.getName(), file
- .isDirectory());
- if (filter.accept(pFile)) {
- returnFiles.add(pFile);
- }
+ for (FTPFile file : files) {
+ if (file == null) {
+ continue;
+ }
+ String path = this.pwd().getPath();
+ ProtocolFile pFile = new ProtocolFile(path + "/" + file.getName(), file
+ .isDirectory());
+ if (filter.accept(pFile)) {
+ returnFiles.add(pFile);
}
+ }
return returnFiles;
} catch (Exception e) {
throw new ProtocolException("Failed to get file list : " + e.getMessage());
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 806305a..4d28cb8 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
@@ -148,12 +148,12 @@ public class XmlRpcBatchMgr implements Batchmgr {
Vector<String> jobIds = new Vector();
if(this.nodeToJobMap.size() > 0){
- for(Iterator i = this.nodeToJobMap.keySet().iterator(); i.hasNext(); ){
- String jobId = (String)i.next();
- if(nodeId.equals(this.nodeToJobMap.get(jobId))){
- jobIds.add(jobId);
- }
- }
+ for (Object o : this.nodeToJobMap.keySet()) {
+ String jobId = (String) o;
+ if (nodeId.equals(this.nodeToJobMap.get(jobId))) {
+ jobIds.add(jobId);
+ }
+ }
}
Collections.sort(jobIds); // sort the list to return as a courtesy to the user
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/resource/src/main/java/org/apache/oodt/cas/resource/noderepo/XmlNodeRepository.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/noderepo/XmlNodeRepository.java b/resource/src/main/java/org/apache/oodt/cas/resource/noderepo/XmlNodeRepository.java
index c40cbe5..6adf58f 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/noderepo/XmlNodeRepository.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/noderepo/XmlNodeRepository.java
@@ -83,26 +83,28 @@ public class XmlNodeRepository implements NodeRepository {
// get all the workflow xml files
File[] nodesFiles = nodesDir.listFiles(nodesXmlFilter);
- for (int j = 0; j < nodesFiles.length; j++) {
-
- String nodesXmlFile = nodesFiles[j].getAbsolutePath();
- Document nodesRoot = null;
- try {
- nodesRoot = XMLUtils
- .getDocumentRoot(new FileInputStream(
- nodesFiles[j]));
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- return null;
- }
-
- NodeList nodeList = nodesRoot
- .getElementsByTagName("node");
- if (nodeList != null)
- for (int k = 0; k < nodeList.getLength(); k++)
- nodes.add(XmlStructFactory
- .getNodes((Element) nodeList.item(k)));
+ for (File nodesFile : nodesFiles) {
+
+ String nodesXmlFile = nodesFile.getAbsolutePath();
+ Document nodesRoot = null;
+ try {
+ nodesRoot = XMLUtils
+ .getDocumentRoot(new FileInputStream(
+ nodesFile));
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ return null;
}
+
+ NodeList nodeList = nodesRoot
+ .getElementsByTagName("node");
+ if (nodeList != null) {
+ for (int k = 0; k < nodeList.getLength(); k++) {
+ nodes.add(XmlStructFactory
+ .getNodes((Element) nodeList.item(k)));
+ }
+ }
+ }
}
} catch (URISyntaxException e) {
LOG.log(Level.WARNING, "DirUri: " + dirUri
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/resource/src/main/java/org/apache/oodt/cas/resource/queuerepo/XmlQueueRepository.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/queuerepo/XmlQueueRepository.java b/resource/src/main/java/org/apache/oodt/cas/resource/queuerepo/XmlQueueRepository.java
index a6ac289..aad472c 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/queuerepo/XmlQueueRepository.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/queuerepo/XmlQueueRepository.java
@@ -74,87 +74,82 @@ public class XmlQueueRepository implements QueueRepository {
QueueManager queueManager = new QueueManager();
if (dirUris != null && dirUris.size() > 0) {
- for (Iterator i = dirUris.iterator(); i.hasNext();) {
- String dirUri = (String) i.next();
+ for (String dirUri : dirUris) {
+ try {
+ File nodesDir = new File(new URI(dirUri));
+ if (nodesDir.isDirectory()) {
- try {
- File nodesDir = new File(new URI(dirUri));
- if (nodesDir.isDirectory()) {
+ String nodesDirStr = nodesDir.getAbsolutePath();
- String nodesDirStr = nodesDir.getAbsolutePath();
+ if (!nodesDirStr.endsWith("/")) {
+ nodesDirStr += "/";
+ }
- if (!nodesDirStr.endsWith("/")) {
- nodesDirStr += "/";
- }
+ // get all the workflow xml files
+ File[] nodesFiles = nodesDir.listFiles(queuesXmlFilter);
+
+ for (File nodesFile : nodesFiles) {
- // get all the workflow xml files
- File[] nodesFiles = nodesDir.listFiles(queuesXmlFilter);
-
- for (int j = 0; j < nodesFiles.length; j++) {
-
- String nodesXmlFile = nodesFiles[j]
- .getAbsolutePath();
- Document nodesRoot = null;
- try {
- nodesRoot = XMLUtils
- .getDocumentRoot(new FileInputStream(
- nodesFiles[j]));
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- return null;
- }
-
- NodeList nodeList = nodesRoot
- .getElementsByTagName("node");
-
- if (nodeList != null && nodeList.getLength() > 0) {
- for (int k = 0; k < nodeList.getLength(); k++) {
-
- String nodeId = ((Element) nodeList.item(k))
- .getAttribute("id");
- Vector assignments = (Vector) XmlStructFactory
- .getQueueAssignment((Element) nodeList
- .item(k));
- for (int l = 0; l < assignments.size(); l++) {
- try {
- // make sure queue exists
- queueManager
- .addQueue((String) assignments
- .get(l));
- // add node to queue
- queueManager
- .addNodeToQueue(nodeId,
- (String) assignments
- .get(l));
- } catch (Exception e) {
- LOG
- .log(
- Level.WARNING,
- "Failed to add node '"
- + nodeId
- + "' to queue '"
- + (String) assignments
- .get(l)
- + "' : "
- + e
- .getMessage(),
- e);
- }
- }
- }
- }
+ String nodesXmlFile = nodesFile
+ .getAbsolutePath();
+ Document nodesRoot = null;
+ try {
+ nodesRoot = XMLUtils
+ .getDocumentRoot(new FileInputStream(
+ nodesFile));
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ return null;
+ }
+
+ NodeList nodeList = nodesRoot
+ .getElementsByTagName("node");
+
+ if (nodeList != null && nodeList.getLength() > 0) {
+ for (int k = 0; k < nodeList.getLength(); k++) {
+
+ String nodeId = ((Element) nodeList.item(k))
+ .getAttribute("id");
+ Vector assignments = (Vector) XmlStructFactory
+ .getQueueAssignment((Element) nodeList
+ .item(k));
+ for (Object assignment : assignments) {
+ try {
+ // make sure queue exists
+ queueManager
+ .addQueue((String) assignment);
+ // add node to queue
+ queueManager
+ .addNodeToQueue(nodeId,
+ (String) assignment);
+ } catch (Exception e) {
+ LOG
+ .log(
+ Level.WARNING,
+ "Failed to add node '"
+ + nodeId
+ + "' to queue '"
+ + (String) assignment
+ + "' : "
+ + e
+ .getMessage(),
+ e);
}
+ }
}
- } catch (URISyntaxException e) {
- e.printStackTrace();
- LOG
- .log(
- Level.WARNING,
- "DirUri: "
- + dirUri
- + " is not a directory: skipping node loading for it.");
+ }
}
+ }
+ } catch (URISyntaxException e) {
+ e.printStackTrace();
+ LOG
+ .log(
+ Level.WARNING,
+ "DirUri: "
+ + dirUri
+ + " is not a directory: skipping node loading for it.");
}
+ }
}
return queueManager;
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/resource/src/main/java/org/apache/oodt/cas/resource/structs/NameValueJobInput.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/structs/NameValueJobInput.java b/resource/src/main/java/org/apache/oodt/cas/resource/structs/NameValueJobInput.java
index a7fcb7a..c178f64 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/structs/NameValueJobInput.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/structs/NameValueJobInput.java
@@ -77,8 +77,8 @@ public class NameValueJobInput implements JobInput {
}
Hashtable readable = (Hashtable) in;
- for (Iterator i = readable.keySet().iterator(); i.hasNext();) {
- String key = (String) i.next();
+ for (Object o : readable.keySet()) {
+ String key = (String) o;
String value = (String) readable.get(key);
this.props.setProperty(key, value);
}
@@ -93,8 +93,8 @@ public class NameValueJobInput implements JobInput {
public Object write() {
Hashtable writeable = new Hashtable();
if (props != null && props.size() > 0) {
- for (Iterator i = props.keySet().iterator(); i.hasNext();) {
- String key = (String) i.next();
+ for (Object o : props.keySet()) {
+ String key = (String) o;
String val = props.getProperty(key);
writeable.put(key, val);
}
[11/16] oodt git commit: OODT-905 swap for for foreach...
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java
index e665e59..a753dd7 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java
@@ -57,8 +57,9 @@ public class FreeTextQueryCriteria extends QueryCriteria {
values = new ArrayList<String>();
noiseWordHash = new HashSet<String>();
- for (int i = 0; i < noiseWords.length; i++)
- noiseWordHash.add(noiseWords[i]);
+ for (String noiseWord : noiseWords) {
+ noiseWordHash.add(noiseWord);
+ }
}
/**
@@ -72,8 +73,9 @@ public class FreeTextQueryCriteria extends QueryCriteria {
values = v;
noiseWordHash = new HashSet<String>();
- for (int i = 0; i < noiseWords.length; i++)
- noiseWordHash.add(noiseWords[i]);
+ for (String noiseWord : noiseWords) {
+ noiseWordHash.add(noiseWord);
+ }
}
/**
@@ -159,8 +161,9 @@ public class FreeTextQueryCriteria extends QueryCriteria {
*/
public String toString() {
String serial = elementName + ":(";
- for (int i = 0; i < values.size(); i++)
- serial += "+" + (String) values.get(i);
+ for (String value : values) {
+ serial += "+" + (String) value;
+ }
serial += ")";
return serial;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 fb089db..9ae6b4f 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
@@ -300,17 +300,15 @@ public class Product {
if (this.getProductReferences() != null
&& this.getProductReferences().size() > 0) {
Element refsElem = XMLUtils.addNode(doc, root, "references");
- for (Iterator<Reference> i = this.getProductReferences().iterator(); i
- .hasNext();) {
- Reference r = i.next();
+ for (Reference r : this.getProductReferences()) {
Element refElem = XMLUtils.addNode(doc, refsElem,
- "reference");
+ "reference");
XMLUtils.addAttribute(doc, refElem, "orig", r
- .getOrigReference());
+ .getOrigReference());
XMLUtils.addAttribute(doc, refElem, "dataStore", r
- .getDataStoreReference());
+ .getDataStoreReference());
XMLUtils.addAttribute(doc, refElem, "size", String
- .valueOf(r.getFileSize()));
+ .valueOf(r.getFileSize()));
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/SecureWebServer.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/SecureWebServer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/SecureWebServer.java
index 2008c8e..bc0e087 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/SecureWebServer.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/SecureWebServer.java
@@ -62,11 +62,12 @@ public final class SecureWebServer extends org.apache.xmlrpc.WebServer
*/
public Object execute(String methodSpecifier, Vector params, String user,
String password) throws Exception {
- for (Iterator i = dispatchers.iterator(); i.hasNext();) {
- Result rc = ((Dispatcher) i.next()).handleRequest(methodSpecifier,
- params, user, password);
- if (rc != null)
+ for (Object dispatcher : dispatchers) {
+ Result rc = ((Dispatcher) dispatcher).handleRequest(methodSpecifier,
+ params, user, password);
+ if (rc != null) {
return rc.getValue();
+ }
}
throw new IllegalStateException(
"No request dispatcher was able to return a non-null value to the XML-RPC caller");
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java
index f6d8e1e..d4ea841 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java
@@ -80,9 +80,9 @@ public class CatalogSearch {
.println("Error getting available product types from the File Manager.");
e.printStackTrace();
}
- for (int i = 0; i < products.size(); i++) {
- PostQuery(((ProductType) products.get(i)).getProductTypeId(),
- casQuery);
+ for (Object product : products) {
+ PostQuery(((ProductType) product).getProductTypeId(),
+ casQuery);
}
}
@@ -110,10 +110,10 @@ public class CatalogSearch {
System.out.println("No Products Found Matching This Criteria.");
} else {
System.out.println("Products Matching Query");
- for (int i = 0; i < results.size(); i++) {
- System.out.print(((Product) results.get(i)).getProductName()
- + "\t");
- System.out.println(((Product) results.get(i)).getProductId());
+ for (Object result : results) {
+ System.out.print(((Product) result).getProductName()
+ + "\t");
+ System.out.println(((Product) result).getProductId());
}
}
}
@@ -143,10 +143,10 @@ public class CatalogSearch {
.println("Error getting available product types from the File Manager.");
e.printStackTrace();
}
- for (int i = 0; i < products.size(); i++) {
- System.out.print(((ProductType) products.get(i)).getProductTypeId()
- + "\t");
- System.out.println(((ProductType) products.get(i)).getName());
+ for (Object product : products) {
+ System.out.print(((ProductType) product).getProductTypeId()
+ + "\t");
+ System.out.println(((ProductType) product).getName());
}
}
@@ -154,8 +154,8 @@ public class CatalogSearch {
Vector products = new Vector();
try {
products = (Vector) client.getProductTypes();
- for (int i = 0; i < products.size(); i++) {
- listElements(((ProductType) products.get(i)).getProductTypeId());
+ for (Object product : products) {
+ listElements(((ProductType) product).getProductTypeId());
}
} catch (RepositoryManagerException e) {
System.out
@@ -180,8 +180,8 @@ public class CatalogSearch {
e.printStackTrace();
}
- for (int i = 0; i < elements.size(); i++) {
- Element e = (Element) elements.get(i);
+ for (Object element : elements) {
+ Element e = (Element) element;
System.out.print(e.getElementId() + "\t");
System.out.println(e.getElementName());
}
@@ -260,9 +260,10 @@ public class CatalogSearch {
// for(int i=0;i<t.length;i++)
// ((FreeTextQueryCriteria)casQuery.getCriteria().get(0)).addValue(t[i].text());
} else {
- for (int i = 0; i < t.length; i++)
- casQuery.addCriterion(new TermQueryCriteria(t[i].field(),
- t[i].text()));
+ for (Term aT : t) {
+ casQuery.addCriterion(new TermQueryCriteria(aT.field(),
+ aT.text()));
+ }
}
} else if (luceneQuery instanceof RangeQuery) {
Term startT = ((RangeQuery) luceneQuery).getLowerTerm();
@@ -271,8 +272,8 @@ public class CatalogSearch {
.text(), endT.text()));
} else if (luceneQuery instanceof BooleanQuery) {
BooleanClause[] clauses = ((BooleanQuery) luceneQuery).getClauses();
- for (int i = 0; i < clauses.length; i++) {
- GenerateCASQuery(casQuery, (clauses[i]).getQuery());
+ for (BooleanClause clause : clauses) {
+ GenerateCASQuery(casQuery, (clause).getQuery());
}
} else {
System.out.println("Error Parsing Query");
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/DeleteProduct.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/DeleteProduct.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/DeleteProduct.java
index 16bb237..5609799 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/DeleteProduct.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/DeleteProduct.java
@@ -110,8 +110,8 @@ public class DeleteProduct {
DeleteProduct remover = new DeleteProduct(fileManagerUrl, commitChanges);
if (readFromStdIn) {
List prodIds = readProdIdsFromStdin();
- for (Iterator i = prodIds.iterator(); i.hasNext();) {
- String prodId = (String) i.next();
+ for (Object prodId1 : prodIds) {
+ String prodId = (String) prodId1;
remover.remove(prodId);
}
} else
@@ -177,28 +177,28 @@ public class DeleteProduct {
+ e.getMessage());
}
- for (int i = 0; i < refs.size(); i++) {
- Reference ref = (Reference) refs.get(i);
+ for (Object ref1 : refs) {
+ Reference ref = (Reference) ref1;
if (commit) {
try {
client.removeFile(new File(new URI(ref
- .getDataStoreReference())).getAbsolutePath());
+ .getDataStoreReference())).getAbsolutePath());
} catch (DataTransferException e) {
LOG.log(Level.WARNING, "Unable to delete reference : ["
- + ref.getDataStoreReference() + "] for product : ["
- + productId + "] from file manager : ["
- + client.getFileManagerUrl() + "]: Message: "
- + e.getMessage());
+ + ref.getDataStoreReference() + "] for product : ["
+ + productId + "] from file manager : ["
+ + client.getFileManagerUrl() + "]: Message: "
+ + e.getMessage());
} catch (URISyntaxException e) {
LOG.log(Level.WARNING,
- "uri syntax exception getting file absolute path from URI: ["
- + ref.getDataStoreReference()
- + "]: Message: " + e.getMessage());
+ "uri syntax exception getting file absolute path from URI: ["
+ + ref.getDataStoreReference()
+ + "]: Message: " + e.getMessage());
}
} else {
LOG.log(Level.INFO, "Delete file: ["
- + ref.getDataStoreReference() + "]");
+ + ref.getDataStoreReference() + "]");
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataBasedProductMover.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataBasedProductMover.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataBasedProductMover.java
index db9b669..ac647e0 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataBasedProductMover.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataBasedProductMover.java
@@ -92,31 +92,30 @@ public class MetadataBasedProductMover {
for (int i = 0; i < page.getTotalPages(); i++) {
if (page.getPageProducts() != null
&& page.getPageProducts().size() > 0) {
- for (Iterator j = page.getPageProducts().iterator(); j
- .hasNext();) {
- Product p = (Product) j.next();
+ for (Product p : page.getPageProducts()) {
p.setProductReferences(fmgrClient.getProductReferences(p));
Metadata met = fmgrClient.getMetadata(p);
Reference r = ((Reference) p.getProductReferences().get(0));
String newLocPath = PathUtils.replaceEnvVariables(
- this.pathSpec, met);
-
+ this.pathSpec, met);
+
if (locationsMatch(r.getDataStoreReference(), newLocPath)) {
- LOG.log(Level.INFO, "Current and New locations match. "+p.getProductName()+" was not moved.");
- continue;
+ LOG.log(Level.INFO,
+ "Current and New locations match. " + p.getProductName() + " was not moved.");
+ continue;
}
-
+
LOG.log(Level.INFO, "Moving product: ["
- + p.getProductName() + "] from: ["
- + new File(new URI(r.getDataStoreReference()))
- + "] to: [" + newLocPath + "]");
+ + p.getProductName() + "] from: ["
+ + new File(new URI(r.getDataStoreReference()))
+ + "] to: [" + newLocPath + "]");
long timeBefore = System.currentTimeMillis();
fmgrClient.moveProduct(p, newLocPath);
long timeAfter = System.currentTimeMillis();
double seconds = ((timeAfter - timeBefore) * 1.0) / (1000.0);
LOG.log(Level.INFO, "Product: [" + p.getProductName()
- + "] move successful: took: [" + seconds
- + "] seconds");
+ + "] move successful: took: [" + seconds
+ + "] seconds");
}
if (!page.isLastPage()) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 c150025..01ad642 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
@@ -101,20 +101,20 @@ public final class QueryTool {
List productTypes = safeGetProductTypes();
if (productTypes != null && productTypes.size() > 0) {
- for (Iterator i = productTypes.iterator(); i.hasNext();) {
- ProductType type = (ProductType) i.next();
+ for (Object productType : productTypes) {
+ ProductType type = (ProductType) productType;
try {
products = client.query(query, type);
if (products != null && products.size() > 0) {
- for (Iterator j = products.iterator(); j.hasNext();) {
- Product product = (Product) j.next();
+ for (Object product1 : products) {
+ Product product = (Product) product1;
prodIds.add(product.getProductId());
}
}
} catch (CatalogException e) {
LOG.log(Level.WARNING, "Exception querying for: ["
- + type.getName() + "] products: Message: "
- + e.getMessage());
+ + type.getName() + "] products: Message: "
+ + e.getMessage());
}
}
@@ -141,9 +141,10 @@ public final class QueryTool {
if (t[0].field().equals(freeTextBlock)) {
// nothing for now
} else {
- for (int i = 0; i < t.length; i++)
+ for (Term aT : t) {
casQuery.addCriterion(new TermQueryCriteria(
- t[i].field(), t[i].text()));
+ aT.field(), aT.text()));
+ }
}
} else if (luceneQuery instanceof RangeQuery) {
Term startT = ((RangeQuery) luceneQuery).getLowerTerm();
@@ -152,8 +153,8 @@ public final class QueryTool {
.field(), startT.text(), endT.text()));
} else if (luceneQuery instanceof BooleanQuery) {
BooleanClause[] clauses = ((BooleanQuery) luceneQuery).getClauses();
- for (int i = 0; i < clauses.length; i++) {
- generateCASQuery(casQuery, (clauses[i]).getQuery());
+ for (BooleanClause clause : clauses) {
+ generateCASQuery(casQuery, (clause).getQuery());
}
} else {
throw new RuntimeException(
@@ -233,8 +234,8 @@ public final class QueryTool {
List prodIds = queryTool.query(casQuery);
if (prodIds != null && prodIds.size() > 0) {
- for (Iterator i = prodIds.iterator(); i.hasNext();) {
- String prodId = (String) i.next();
+ for (Object prodId1 : prodIds) {
+ String prodId = (String) prodId1;
System.out.println(prodId);
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/RangeQueryTester.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/RangeQueryTester.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/RangeQueryTester.java
index 86d6029..7572a40 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/RangeQueryTester.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/RangeQueryTester.java
@@ -213,8 +213,8 @@ public final class RangeQueryTester {
List productFiles = queryTester.doRangeQuery(productTypeId);
if (productFiles != null && productFiles.size() > 0) {
- for (Iterator i = productFiles.iterator(); i.hasNext();) {
- String productFile = (String) i.next();
+ for (Object productFile1 : productFiles) {
+ String productFile = (String) productFile1;
System.out.println(productFile);
}
} else
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 bb3496a..284898b 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
@@ -251,28 +251,26 @@ public final class XmlStructFactory {
if(!allTypes.contains(type))
allTypes.add(type);
}
-
- for (Iterator<String> i = allTypes.iterator(); i.hasNext();) {
- String typeId = i.next();
+ for (String typeId : allTypes) {
Element typeElem = document.createElement("type");
typeElem.setAttribute("id", typeId);
boolean hasParent = false;
if (subToSuperMap.containsKey(typeId)) {
typeElem.setAttribute("parent", subToSuperMap
- .get(typeId));
+ .get(typeId));
hasParent = true;
}
List<org.apache.oodt.cas.filemgr.structs.Element> elementIds = productTypeMap.get(typeId);
- if(!hasParent && (elementIds == null || elementIds.size() == 0)) {
+ if (!hasParent && (elementIds == null || elementIds.size() == 0)) {
// If no parent, and no elements, don't add this type to the xml
continue;
}
- if(elementIds != null) {
- for (Iterator<org.apache.oodt.cas.filemgr.structs.Element> j = elementIds.iterator(); j.hasNext();) {
- String elementId = j.next().getElementId();
+ if (elementIds != null) {
+ for (org.apache.oodt.cas.filemgr.structs.Element elementId1 : elementIds) {
+ String elementId = elementId1.getElementId();
Element elementElem = document.createElement("element");
elementElem.setAttribute("id", elementId);
@@ -307,22 +305,21 @@ public final class XmlStructFactory {
root.setAttribute("xmlns:cas", "http://oodt.jpl.nasa.gov/1.0/cas");
document.appendChild(root);
- for (Iterator<org.apache.oodt.cas.filemgr.structs.Element> i = elements.iterator(); i.hasNext();) {
- org.apache.oodt.cas.filemgr.structs.Element element = i.next();
+ for (org.apache.oodt.cas.filemgr.structs.Element element : elements) {
Element elementElem = document.createElement("element");
elementElem.setAttribute("id", friendlyXml(element.getElementId()));
elementElem.setAttribute("name", friendlyXml(element.getElementName()));
Element descriptionElem = document.createElement("description");
descriptionElem.appendChild(document.createTextNode(friendlyXml(element
- .getDescription())));
+ .getDescription())));
elementElem.appendChild(descriptionElem);
Element dcElementElem = document.createElement("dcElement");
dcElementElem.appendChild(document.createTextNode(friendlyXml(element
- .getDCElement())));
+ .getDCElement())));
elementElem.appendChild(dcElementElem);
-
+
root.appendChild(elementElem);
}
@@ -350,28 +347,26 @@ public final class XmlStructFactory {
document.appendChild(root);
// now add the set of metadata elements in the properties object
- for (Iterator<ProductType> i = productTypes.iterator(); i.hasNext();) {
- ProductType type = i.next();
-
+ for (ProductType type : productTypes) {
Element typeElem = document.createElement("type");
typeElem.setAttribute("id", type.getProductTypeId());
typeElem.setAttribute("name", type.getName());
Element descriptionElem = document.createElement("description");
descriptionElem.appendChild(document.createTextNode(type
- .getDescription()));
+ .getDescription()));
typeElem.appendChild(descriptionElem);
Element repositoryPathElem = document
- .createElement("repository");
+ .createElement("repository");
repositoryPathElem.setAttribute("path", type
- .getProductRepositoryPath());
+ .getProductRepositoryPath());
typeElem.appendChild(repositoryPathElem);
Element versionerClassPathElem = document
- .createElement("versioner");
+ .createElement("versioner");
versionerClassPathElem.setAttribute("class", type
- .getVersioner());
+ .getVersioner());
typeElem.appendChild(versionerClassPathElem);
// add extractor info
@@ -380,41 +375,41 @@ public final class XmlStructFactory {
ExtractorSpec spec = (ExtractorSpec) specObject;
Element extractorElem = document.createElement("extractor");
extractorElem.setAttribute("class", spec.getClassName());
-
+
if (spec.getConfiguration() != null) {
Element extractorConfigElem = document.createElement("configuration");
Enumeration e = spec.getConfiguration().propertyNames();
-
+
while (e.hasMoreElements()) {
String key = (String) e.nextElement();
-
+
Element propertyElem = document.createElement("property");
propertyElem.setAttribute("name", key);
propertyElem.setAttribute("value", spec.getConfiguration().getProperty(key));
-
+
extractorConfigElem.appendChild(propertyElem);
}
-
+
extractorElem.appendChild(extractorConfigElem);
}
-
+
metExtractorsElem.appendChild(extractorElem);
}
typeElem.appendChild(metExtractorsElem);
-
+
// add type metadata
Element metElem = document.createElement("metadata");
for (String key : type.getTypeMetadata().getAllKeys()) {
Element keyValElem = document.createElement("keyval");
Element keyElem = document.createElement("key");
Element valElem = document.createElement("val");
-
+
keyElem.appendChild(document.createTextNode(key));
valElem.appendChild(document.createTextNode(
- type.getTypeMetadata().getMetadata(key)));
+ type.getTypeMetadata().getMetadata(key)));
keyValElem.appendChild(keyElem);
keyValElem.appendChild(valElem);
-
+
metElem.appendChild(keyValElem);
}
typeElem.appendChild(metElem);
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java
index 8627952..b87c0b5 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java
@@ -153,14 +153,13 @@ public class XMLValidationLayer implements ValidationLayer {
List<Element> elements = productTypeElementMap.get(type
.getProductTypeId());
- for (Iterator<Element> i = elements.iterator(); i.hasNext();) {
- Element elementObj = i.next();
- if (elementObj.getElementId().equals(element.getElementId())) {
- elements.remove(elementObj);
- saveElementsAndMappings();
- break;
- }
+ for (Element elementObj : elements) {
+ if (elementObj.getElementId().equals(element.getElementId())) {
+ elements.remove(elementObj);
+ saveElementsAndMappings();
+ break;
}
+ }
}
@@ -201,13 +200,12 @@ public class XMLValidationLayer implements ValidationLayer {
*/
public Element getElementByName(String elementName)
throws ValidationLayerException {
- for (Iterator<String> i = elementMap.keySet().iterator(); i.hasNext();) {
- String elementId = i.next();
- Element element = (Element) elementMap.get(elementId);
- if (element.getElementName().equals(elementName)) {
- return element;
- }
+ for (String elementId : elementMap.keySet()) {
+ Element element = (Element) elementMap.get(elementId);
+ if (element.getElementName().equals(elementName)) {
+ return element;
}
+ }
return null;
@@ -274,189 +272,188 @@ public class XMLValidationLayer implements ValidationLayer {
private void saveElementsAndMappings() {
- for (Iterator<String> i = xmlFileDirUris.iterator(); i.hasNext();) {
- String dirUri = i.next();
- File elementDir = null;
-
- try {
- elementDir = new File(new URI(dirUri));
-
- if (!elementDir.isDirectory()) {
- LOG
- .log(
- Level.WARNING,
- "Element directory: "
- + dirUri
- + " is not "
- + "a directory: skipping element and product type map saving to it.");
- continue;
- }
-
- String elementDirStr = elementDir.getAbsolutePath();
- if (!elementDirStr.endsWith("/")) {
- elementDirStr += "/";
- }
-
- String elementXmlFile = elementDirStr + "elements.xml";
-
- String productTypeMapXmlFile = elementDirStr
- + "product-type-element-map.xml";
-
- XmlStructFactory.writeElementXmlDocument(Arrays
- .asList(elementMap.values().toArray(
- new Element[elementMap.size()])),
- elementXmlFile);
-
- XmlStructFactory.writeProductTypeMapXmLDocument(
- productTypeElementMap, subToSuperMap,
- productTypeMapXmlFile);
-
- } catch (URISyntaxException e) {
- LOG
- .log(
- Level.WARNING,
- "URISyntaxException when saving element "
- + "directory URI: "
- + dirUri
- + ": Skipping Element and Product Type map saving"
- + "for it: Message: " + e.getMessage());
- }
+ for (String dirUri : xmlFileDirUris) {
+ File elementDir = null;
+ try {
+ elementDir = new File(new URI(dirUri));
+
+ if (!elementDir.isDirectory()) {
+ LOG
+ .log(
+ Level.WARNING,
+ "Element directory: "
+ + dirUri
+ + " is not "
+ + "a directory: skipping element and product type map saving to it.");
+ continue;
+ }
+
+ String elementDirStr = elementDir.getAbsolutePath();
+ if (!elementDirStr.endsWith("/")) {
+ elementDirStr += "/";
+ }
+
+ String elementXmlFile = elementDirStr + "elements.xml";
+
+ String productTypeMapXmlFile = elementDirStr
+ + "product-type-element-map.xml";
+
+ XmlStructFactory.writeElementXmlDocument(Arrays
+ .asList(elementMap.values().toArray(
+ new Element[elementMap.size()])),
+ elementXmlFile);
+
+ XmlStructFactory.writeProductTypeMapXmLDocument(
+ productTypeElementMap, subToSuperMap,
+ productTypeMapXmlFile);
+
+ } catch (URISyntaxException e) {
+ LOG
+ .log(
+ Level.WARNING,
+ "URISyntaxException when saving element "
+ + "directory URI: "
+ + dirUri
+ + ": Skipping Element and Product Type map saving"
+ + "for it: Message: " + e.getMessage());
}
+ }
+
}
private void loadElements(List<String> dirUris) {
- for (Iterator<String> i = dirUris.iterator(); i.hasNext();) {
- File elementDir = null;
- String dirUri = i.next();
-
- try {
- elementDir = new File(new URI(dirUri));
-
- if (!elementDir.isDirectory()) {
- LOG.log(Level.WARNING, "Element directory: " + dirUri
- + " is not "
- + "a directory: skipping element loading from it.");
- continue;
- }
-
- String elementDirStr = elementDir.getAbsolutePath();
- if (!elementDirStr.endsWith("/")) {
- elementDirStr += "/";
- }
-
- String elementXmlFile = elementDirStr + "elements.xml";
- Document elementDoc = getDocumentRoot(elementXmlFile);
-
- org.w3c.dom.Element elementRootElem = elementDoc
- .getDocumentElement();
-
- NodeList elementNodeList = elementRootElem
- .getElementsByTagName("element");
-
- if (elementNodeList != null && elementNodeList.getLength() > 0) {
- for (int j = 0; j < elementNodeList.getLength(); j++) {
- Node elementNode = elementNodeList.item(j);
- Element element = XmlStructFactory
- .getElement(elementNode);
- elementMap.put(element.getElementId(), element);
- }
- }
+ for (String dirUri1 : dirUris) {
+ File elementDir = null;
+ String dirUri = dirUri1;
- } catch (URISyntaxException e) {
- LOG.log(Level.WARNING,
- "URISyntaxException when loading element "
- + "directory URI: " + dirUri
- + ": Skipping element loading"
- + "for it: Message: " + e.getMessage());
+ try {
+ elementDir = new File(new URI(dirUri));
+
+ if (!elementDir.isDirectory()) {
+ LOG.log(Level.WARNING, "Element directory: " + dirUri
+ + " is not "
+ + "a directory: skipping element loading from it.");
+ continue;
+ }
+
+ String elementDirStr = elementDir.getAbsolutePath();
+ if (!elementDirStr.endsWith("/")) {
+ elementDirStr += "/";
+ }
+
+ String elementXmlFile = elementDirStr + "elements.xml";
+ Document elementDoc = getDocumentRoot(elementXmlFile);
+
+ org.w3c.dom.Element elementRootElem = elementDoc
+ .getDocumentElement();
+
+ NodeList elementNodeList = elementRootElem
+ .getElementsByTagName("element");
+
+ if (elementNodeList != null && elementNodeList.getLength() > 0) {
+ for (int j = 0; j < elementNodeList.getLength(); j++) {
+ Node elementNode = elementNodeList.item(j);
+ Element element = XmlStructFactory
+ .getElement(elementNode);
+ elementMap.put(element.getElementId(), element);
}
+ }
+
+ } catch (URISyntaxException e) {
+ LOG.log(Level.WARNING,
+ "URISyntaxException when loading element "
+ + "directory URI: " + dirUri
+ + ": Skipping element loading"
+ + "for it: Message: " + e.getMessage());
}
+ }
}
private void loadProductTypeMap(List<String> dirUris) {
- for (Iterator<String> i = dirUris.iterator(); i.hasNext();) {
- File elementDir = null;
- String dirUri = i.next();
-
- try {
- elementDir = new File(new URI(dirUri));
-
- if (!elementDir.isDirectory()) {
- LOG
- .log(
- Level.WARNING,
- "Element directory: "
- + dirUri
- + " is not "
- + "a directory: skipping product type element map loading from it.");
- continue;
- }
+ for (String dirUri1 : dirUris) {
+ File elementDir = null;
+ String dirUri = dirUri1;
- String elementDirStr = elementDir.getAbsolutePath();
- if (!elementDirStr.endsWith("/")) {
- elementDirStr += "/";
- }
-
- String productTypeMapXmlFile = elementDirStr
- + "product-type-element-map.xml";
- Document productTypeMapDoc = getDocumentRoot(productTypeMapXmlFile);
-
- org.w3c.dom.Element mapRootElem = productTypeMapDoc
- .getDocumentElement();
-
- NodeList typeNodeList = mapRootElem
- .getElementsByTagName("type");
-
- if (typeNodeList != null && typeNodeList.getLength() > 0) {
- for (int j = 0; j < typeNodeList.getLength(); j++) {
- org.w3c.dom.Element typeElement = (org.w3c.dom.Element) typeNodeList
- .item(j);
- String typeId = typeElement.getAttribute("id");
-
- // get inheritance info
- String typeParent = typeElement.getAttribute("parent");
- if (typeParent != null) {
- subToSuperMap.put(typeId, typeParent);
- }
-
- // get its element list
- NodeList elementIdNodeList = typeElement
- .getElementsByTagName("element");
-
- // allow for 0 sized element list
- List<Element> productTypeElementList = new Vector<Element>();
-
- if (elementIdNodeList != null
- && elementIdNodeList.getLength() > 0) {
- productTypeElementList = new Vector<Element>(
- elementIdNodeList.getLength());
- for (int k = 0; k < elementIdNodeList.getLength(); k++) {
- org.w3c.dom.Element elementIdElement = (org.w3c.dom.Element) elementIdNodeList
- .item(k);
- String elementId = elementIdElement
- .getAttribute("id");
-
- if (elementMap.get(elementId) != null) {
- productTypeElementList.add(elementMap
- .get(elementId));
- }
- }
- }
-
- productTypeElementMap.put(typeId,
- productTypeElementList);
- }
+ try {
+ elementDir = new File(new URI(dirUri));
+
+ if (!elementDir.isDirectory()) {
+ LOG
+ .log(
+ Level.WARNING,
+ "Element directory: "
+ + dirUri
+ + " is not "
+ + "a directory: skipping product type element map loading from it.");
+ continue;
+ }
+
+ String elementDirStr = elementDir.getAbsolutePath();
+ if (!elementDirStr.endsWith("/")) {
+ elementDirStr += "/";
+ }
+
+ String productTypeMapXmlFile = elementDirStr
+ + "product-type-element-map.xml";
+ Document productTypeMapDoc = getDocumentRoot(productTypeMapXmlFile);
+
+ org.w3c.dom.Element mapRootElem = productTypeMapDoc
+ .getDocumentElement();
+
+ NodeList typeNodeList = mapRootElem
+ .getElementsByTagName("type");
+
+ if (typeNodeList != null && typeNodeList.getLength() > 0) {
+ for (int j = 0; j < typeNodeList.getLength(); j++) {
+ org.w3c.dom.Element typeElement = (org.w3c.dom.Element) typeNodeList
+ .item(j);
+ String typeId = typeElement.getAttribute("id");
+
+ // get inheritance info
+ String typeParent = typeElement.getAttribute("parent");
+ if (typeParent != null) {
+ subToSuperMap.put(typeId, typeParent);
+ }
+
+ // get its element list
+ NodeList elementIdNodeList = typeElement
+ .getElementsByTagName("element");
+
+ // allow for 0 sized element list
+ List<Element> productTypeElementList = new Vector<Element>();
+
+ if (elementIdNodeList != null
+ && elementIdNodeList.getLength() > 0) {
+ productTypeElementList = new Vector<Element>(
+ elementIdNodeList.getLength());
+ for (int k = 0; k < elementIdNodeList.getLength(); k++) {
+ org.w3c.dom.Element elementIdElement = (org.w3c.dom.Element) elementIdNodeList
+ .item(k);
+ String elementId = elementIdElement
+ .getAttribute("id");
+
+ if (elementMap.get(elementId) != null) {
+ productTypeElementList.add(elementMap
+ .get(elementId));
+ }
}
+ }
- } catch (URISyntaxException e) {
- LOG.log(Level.WARNING,
- "URISyntaxException when loading element "
- + "directory URI: " + dirUri
- + ": Skipping product type map loading"
- + "for it: Message: " + e.getMessage());
+ productTypeElementMap.put(typeId,
+ productTypeElementList);
}
+ }
+
+ } catch (URISyntaxException e) {
+ LOG.log(Level.WARNING,
+ "URISyntaxException when loading element "
+ + "directory URI: " + dirUri
+ + ": Skipping product type map loading"
+ + "for it: Message: " + e.getMessage());
}
+ }
}
private Document getDocumentRoot(String xmlFile) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java
index b07bfab..21bbe4b 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java
@@ -105,44 +105,42 @@ public class DateTimeVersioner implements Versioner {
// productTypeRepo/productName/fileName.productionDateTime
// we'll use the format: yyyy.dd.MM.HH.mm.ss
- for (Iterator<Reference> i = product.getProductReferences().iterator(); i
- .hasNext();) {
- Reference r = i.next();
- String dataStoreRef = null;
-
- try {
- dataStoreRef = new File(new URI(product.getProductType()
- .getProductRepositoryPath())).toURL()
- .toExternalForm()
- + "/"
- + product.getProductName()
- + "/"
- + new File(new URI(r.getOrigReference())).getName()
- + "." + productionDateTime;
- LOG.log(Level.FINER,
- "DateTimeVersioner: Generated dataStoreRef: "
- + dataStoreRef + " from original ref: "
- + r.getOrigReference());
- r.setDataStoreReference(dataStoreRef);
- } catch (URISyntaxException e) {
- LOG
- .log(
- Level.WARNING,
- "DateTimeVersioner: Error generating URI to get name "
- + "of original ref while generating data store ref for orig ref: "
- + r.getOrigReference()
- + ": Message: " + e.getMessage());
- // try and keep generating
- } catch (MalformedURLException e) {
- LOG.log(Level.WARNING,
- "DateTimeVersioner: Error getting URL for product repository path "
- + product.getProductType()
- .getProductRepositoryPath()
- + ": Message: " + e.getMessage());
- // try and keep generating
- }
+ for (Reference r : product.getProductReferences()) {
+ String dataStoreRef = null;
+ try {
+ dataStoreRef = new File(new URI(product.getProductType()
+ .getProductRepositoryPath())).toURL()
+ .toExternalForm()
+ + "/"
+ + product.getProductName()
+ + "/"
+ + new File(new URI(r.getOrigReference())).getName()
+ + "." + productionDateTime;
+ LOG.log(Level.FINER,
+ "DateTimeVersioner: Generated dataStoreRef: "
+ + dataStoreRef + " from original ref: "
+ + r.getOrigReference());
+ r.setDataStoreReference(dataStoreRef);
+ } catch (URISyntaxException e) {
+ LOG
+ .log(
+ Level.WARNING,
+ "DateTimeVersioner: Error generating URI to get name "
+ + "of original ref while generating data store ref for orig ref: "
+ + r.getOrigReference()
+ + ": Message: " + e.getMessage());
+ // try and keep generating
+ } catch (MalformedURLException e) {
+ LOG.log(Level.WARNING,
+ "DateTimeVersioner: Error getting URL for product repository path "
+ + product.getProductType()
+ .getProductRepositoryPath()
+ + ": Message: " + e.getMessage());
+ // try and keep generating
}
+
+ }
} else if (product.getProductStructure().equals(Product.STRUCTURE_STREAM)) {
VersioningUtils.createBasicDataStoreRefsStream(product.getProductName(), product.getProductType().getProductRepositoryPath(),
product.getProductReferences(), productionDateTime);
@@ -201,13 +199,12 @@ public class DateTimeVersioner implements Versioner {
private void addProductDateTimeToReferences(List<Reference> references,
String productionDateTime) {
- for (Iterator<Reference> i = references.iterator(); i.hasNext();) {
- Reference r = i.next();
- if (!r.getOrigReference().endsWith("/")) {
- r.setDataStoreReference(r.getDataStoreReference() + "."
- + productionDateTime);
- }
+ for (Reference r : references) {
+ if (!r.getOrigReference().endsWith("/")) {
+ r.setDataStoreReference(r.getDataStoreReference() + "."
+ + productionDateTime);
}
+ }
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/VersioningUtils.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/VersioningUtils.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/VersioningUtils.java
index 08f1b72..6334d0d 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/VersioningUtils.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/VersioningUtils.java
@@ -100,25 +100,25 @@ public final class VersioningUtils {
File[] files = dir.listFiles(FILE_FILTER);
- for (int i = 0; i < files.length; i++) {
+ for (File file : files) {
// add the file references
try {
Reference r = new Reference();
- r.setOrigReference(files[i].toURL().toExternalForm());
- r.setFileSize(files[i].length());
+ r.setOrigReference(file.toURL().toExternalForm());
+ r.setFileSize(file.length());
references.add(r);
} catch (MalformedURLException e) {
e.printStackTrace();
LOG.log(Level.WARNING,
- "MalformedURLException when generating reference for file: "
- + files[i]);
+ "MalformedURLException when generating reference for file: "
+ + file);
}
}
File[] subdirs = dir.listFiles(DIR_FILTER);
if (subdirs != null)
- for (int i = 0; i < subdirs.length; i++) {
- stack.push(subdirs[i]);
+ for (File subdir : subdirs) {
+ stack.push(subdir);
}
}
@@ -147,15 +147,15 @@ public final class VersioningUtils {
File[] files = dir.listFiles(FILE_FILTER);
- for (int i = 0; i < files.length; i++) {
+ for (File file : files) {
// add the file references
- uris.add(files[i].toURI().toString());
+ uris.add(file.toURI().toString());
}
File[] subdirs = dir.listFiles(DIR_FILTER);
if (subdirs != null)
- for (int i = 0; i < subdirs.length; i++) {
- stack.push(subdirs[i]);
+ for (File subdir : subdirs) {
+ stack.push(subdir);
}
}
@@ -177,9 +177,7 @@ public final class VersioningUtils {
String origDirRef = references.get(0).getOrigReference();
String origDirRefName = new File(origDirRef).getName();
- for (Iterator<Reference> i = references.iterator(); i.hasNext();) {
- Reference r = i.next();
-
+ for (Reference r : references) {
// don't bother with the first one, because it's already set
// correctly
if (r.getOrigReference().equals(origDirRef)) {
@@ -193,15 +191,15 @@ public final class VersioningUtils {
String dataStoreRef = toDirRef;
int firstOccurenceOfOrigDir = r.getOrigReference().indexOf(
- origDirRefName);
+ origDirRefName);
String tmpRef = r.getOrigReference().substring(
- firstOccurenceOfOrigDir);
+ firstOccurenceOfOrigDir);
LOG.log(Level.FINER, "tmpRef: " + tmpRef);
int firstOccurenceSlash = tmpRef.indexOf("/");
dataStoreRef += tmpRef.substring(firstOccurenceSlash + 1);
LOG.log(Level.FINE, "VersioningUtils: Generated data store ref: "
- + dataStoreRef + " from origRef: " + r.getOrigReference());
+ + dataStoreRef + " from origRef: " + r.getOrigReference());
r.setDataStoreReference(dataStoreRef);
}
@@ -209,46 +207,43 @@ public final class VersioningUtils {
public static void createBasicDataStoreRefsFlat(String productName,
String productRepoPath, List<Reference> references) {
- for (Iterator<Reference> i = references.iterator(); i.hasNext();) {
- Reference r = i.next();
-
+ for (Reference r : references) {
String dataStoreRef = null;
String productRepoPathRef = null;
try {
productRepoPathRef = new File(new URI(productRepoPath)).toURL()
- .toExternalForm();
+ .toExternalForm();
if (!productRepoPathRef.endsWith("/")) {
productRepoPathRef += "/";
}
dataStoreRef = productRepoPathRef
- + URLEncoder.encode(productName, "UTF-8") + "/"
- + new File(new URI(r.getOrigReference())).getName();
+ + URLEncoder.encode(productName, "UTF-8") + "/"
+ + new File(new URI(r.getOrigReference())).getName();
} catch (IOException e) {
LOG.log(Level.WARNING,
- "VersioningUtils: Error generating dataStoreRef for "
- + r.getOrigReference() + ": Message: "
- + e.getMessage());
+ "VersioningUtils: Error generating dataStoreRef for "
+ + r.getOrigReference() + ": Message: "
+ + e.getMessage());
} catch (URISyntaxException e) {
LOG.log(Level.WARNING,
- "VersioningUtils: Error generating dataStoreRef for "
- + r.getOrigReference() + ": Message: "
- + e.getMessage());
+ "VersioningUtils: Error generating dataStoreRef for "
+ + r.getOrigReference() + ": Message: "
+ + e.getMessage());
}
LOG.log(Level.FINE, "VersioningUtils: Generated data store ref: "
- + dataStoreRef + " from origRef: " + r.getOrigReference());
+ + dataStoreRef + " from origRef: " + r.getOrigReference());
r.setDataStoreReference(dataStoreRef);
}
}
public static void createBasicDataStoreRefsStream(String productName,
String productRepoPath, List<Reference> references,String postfix) {
- for (Iterator<Reference> i = references.iterator(); i.hasNext();) {
- Reference r = i.next();
- createDataStoreRefStream(productName,productRepoPath,r,postfix);
+ for (Reference r : references) {
+ createDataStoreRefStream(productName, productRepoPath, r, postfix);
}
}
@@ -259,9 +254,9 @@ public final class VersioningUtils {
}
public static void addRefsFromUris(Product p, List<String> uris) {
// add the refs to the Product
- for (Iterator<String> i = uris.iterator(); i.hasNext();) {
- String ref = i.next();
- Reference r = new Reference(ref, null, (p.getProductStructure().equals(Product.STRUCTURE_STREAM)?-1:quietGetFileSizeFromUri(ref)));
+ for (String ref : uris) {
+ Reference r = new Reference(ref, null,
+ (p.getProductStructure().equals(Product.STRUCTURE_STREAM) ? -1 : quietGetFileSizeFromUri(ref)));
p.getProductReferences().add(r);
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java
index 04c5516..368bf94 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java
@@ -169,8 +169,8 @@ public class TestDataSourceCatalog extends TestCase {
File[] tmpFiles = tmpDir.listFiles();
if (tmpFiles != null && tmpFiles.length > 0) {
- for (int i = 0; i < tmpFiles.length; i++) {
- tmpFiles[i].delete();
+ for (File tmpFile : tmpFiles) {
+ tmpFile.delete();
}
tmpDir.delete();
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java
index d7c122a..78115bf 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java
@@ -208,8 +208,8 @@ public class TestCachedIngester extends TestCase {
File[] delFiles = startDirFile.listFiles();
if (delFiles != null && delFiles.length > 0) {
- for (int i = 0; i < delFiles.length; i++) {
- delFiles[i].delete();
+ for (File delFile : delFiles) {
+ delFile.delete();
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java
index 92703b1..7e54081 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java
@@ -220,8 +220,8 @@ public class TestLocalCache extends TestCase {
File[] delFiles = startDirFile.listFiles();
if (delFiles != null && delFiles.length > 0) {
- for (int i = 0; i < delFiles.length; i++) {
- delFiles[i].delete();
+ for (File delFile : delFiles) {
+ delFile.delete();
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java
index 5b4f71a..63978b7 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java
@@ -236,8 +236,8 @@ public class TestRmiCache extends TestCase {
File[] delFiles = startDirFile.listFiles();
if (delFiles != null && delFiles.length > 0) {
- for (int i = 0; i < delFiles.length; i++) {
- delFiles[i].delete();
+ for (File delFile : delFiles) {
+ delFile.delete();
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestStdIngester.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestStdIngester.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestStdIngester.java
index d1f4cfa..48d93ac 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestStdIngester.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestStdIngester.java
@@ -128,8 +128,8 @@ public class TestStdIngester extends TestCase {
File[] delFiles = startDirFile.listFiles();
if (delFiles != null && delFiles.length > 0) {
- for (int i = 0; i < delFiles.length; i++) {
- delFiles[i].delete();
+ for (File delFile : delFiles) {
+ delFile.delete();
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/test/java/org/apache/oodt/cas/filemgr/repository/TestXMLRepositoryManager.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/repository/TestXMLRepositoryManager.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/repository/TestXMLRepositoryManager.java
index 1a589f5..9954473 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/repository/TestXMLRepositoryManager.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/repository/TestXMLRepositoryManager.java
@@ -206,8 +206,8 @@ public class TestXMLRepositoryManager extends TestCase {
List creatorValues = type.getTypeMetadata().getAllMetadata("Creator");
boolean hasFirstCreator = false, hasSecondCreator = false;
- for (Iterator i = creatorValues.iterator(); i.hasNext();) {
- String val = (String) i.next();
+ for (Object creatorValue : creatorValues) {
+ String val = (String) creatorValue;
if (val.equals("Chris Mattmann")) {
hasFirstCreator = true;
} else if (val.equals("Paul Ramirez")) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 c4dfa38..6b5f6aa 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
@@ -260,8 +260,8 @@ public class TestTypeHandler extends TestCase {
File[] tmpFiles = tmpDir.listFiles();
if (tmpFiles != null && tmpFiles.length > 0) {
- for (int i = 0; i < tmpFiles.length; i++) {
- tmpFiles[i].delete();
+ for (File tmpFile : tmpFiles) {
+ tmpFile.delete();
}
tmpDir.delete();
@@ -366,8 +366,8 @@ public class TestTypeHandler extends TestCase {
if (productIds != null && productIds.size() > 0) {
List products = new Vector(productIds.size());
- for (Iterator i = productIds.iterator(); i.hasNext();) {
- String productId = (String) i.next();
+ for (Object productId1 : productIds) {
+ String productId = (String) productId1;
Product p = getProductById(productId);
products.add(p);
}
@@ -460,64 +460,67 @@ public class TestTypeHandler extends TestCase {
if (query.getCriteria() != null
&& query.getCriteria().size() > 0) {
- for (Iterator i = query.getCriteria().iterator(); i
- .hasNext();) {
- QueryCriteria criteria = (QueryCriteria) i.next();
+ for (QueryCriteria criteria : query.getCriteria()) {
clauseNum++;
String elementIdStr = null;
if (fieldIdStringFlag) {
- elementIdStr = "'" + this.getValidationLayer().getElementByName(criteria.getElementName()).getElementId() + "'";
+ elementIdStr = "'" + this.getValidationLayer().getElementByName(criteria.getElementName())
+ .getElementId() + "'";
} else {
- elementIdStr = this.getValidationLayer().getElementByName(criteria.getElementName()).getElementId();
+ elementIdStr =
+ this.getValidationLayer().getElementByName(criteria.getElementName()).getElementId();
}
String clause = null;
if (!gotFirstClause) {
clause = "(p.element_id = " + elementIdStr
- + " AND ";
+ + " AND ";
if (criteria instanceof TermQueryCriteria) {
clause += " metadata_value LIKE '%"
- + ((TermQueryCriteria) criteria)
- .getValue() + "%') ";
+ + ((TermQueryCriteria) criteria)
+ .getValue() + "%') ";
} else if (criteria instanceof RangeQueryCriteria) {
String startVal = ((RangeQueryCriteria) criteria)
- .getStartValue();
+ .getStartValue();
String endVal = ((RangeQueryCriteria) criteria)
- .getEndValue();
+ .getEndValue();
boolean inclusive = ((RangeQueryCriteria) criteria)
- .getInclusive();
+ .getInclusive();
if ((startVal != null && !startVal.equals(""))
- || (endVal != null && !endVal
- .equals(""))) {
+ || (endVal != null && !endVal
+ .equals(""))) {
clause += " metadata_value ";
boolean gotStart = false;
if (startVal != null
- && !startVal.equals("")) {
- if (inclusive)
+ && !startVal.equals("")) {
+ if (inclusive) {
clause += ">= '" + startVal + "'";
- else
+ } else {
clause += "> '" + startVal + "'";
+ }
gotStart = true;
}
if (endVal != null && !endVal.equals("")) {
if (gotStart) {
- if (inclusive)
+ if (inclusive) {
clause += " AND metadata_value <= '"
- + endVal + "'";
- else
+ + endVal + "'";
+ } else {
clause += " AND metadata_value < '"
- + endVal + "'";
- } else if (inclusive)
+ + endVal + "'";
+ }
+ } else if (inclusive) {
clause += "<= '" + endVal + "'";
- else
+ } else {
clause += "< '" + endVal + "'";
+ }
}
clause += ") ";
@@ -529,17 +532,17 @@ public class TestTypeHandler extends TestCase {
} else {
String subSelectTblName = "p" + clauseNum;
String subSelectQuery = subSelectQueryBase
- + "WHERE (element_id = " + elementIdStr
- + " AND ";
+ + "WHERE (element_id = " + elementIdStr
+ + " AND ";
if (criteria instanceof TermQueryCriteria) {
subSelectQuery += " metadata_value LIKE '%"
- + ((TermQueryCriteria) criteria)
- .getValue() + "%')";
+ + ((TermQueryCriteria) criteria)
+ .getValue() + "%')";
} else if (criteria instanceof RangeQueryCriteria) {
String startVal = ((RangeQueryCriteria) criteria)
- .getStartValue();
+ .getStartValue();
String endVal = ((RangeQueryCriteria) criteria)
- .getEndValue();
+ .getEndValue();
if (startVal != null || endVal != null) {
subSelectQuery += " metadata_value ";
@@ -547,19 +550,20 @@ public class TestTypeHandler extends TestCase {
boolean gotStart = false;
if (startVal != null
- && !startVal.equals("")) {
+ && !startVal.equals("")) {
subSelectQuery += ">= '" + startVal
- + "'";
+ + "'";
gotStart = true;
}
if (endVal != null && !endVal.equals("")) {
if (gotStart) {
subSelectQuery += " AND metadata_value <= '"
- + endVal + "'";
- } else
+ + endVal + "'";
+ } else {
subSelectQuery += "<= '" + endVal
- + "'";
+ + "'";
+ }
}
subSelectQuery += ") ";
@@ -698,64 +702,67 @@ public class TestTypeHandler extends TestCase {
if (query.getCriteria() != null
&& query.getCriteria().size() > 0) {
- for (Iterator i = query.getCriteria().iterator(); i
- .hasNext();) {
- QueryCriteria criteria = (QueryCriteria) i.next();
+ for (QueryCriteria criteria : query.getCriteria()) {
clauseNum++;
String elementIdStr = null;
if (fieldIdStringFlag) {
- elementIdStr = "'" + this.getValidationLayer().getElementByName(criteria.getElementName()).getElementId() + "'";
+ elementIdStr = "'" + this.getValidationLayer().getElementByName(criteria.getElementName())
+ .getElementId() + "'";
} else {
- elementIdStr = this.getValidationLayer().getElementByName(criteria.getElementName()).getElementId();
+ elementIdStr =
+ this.getValidationLayer().getElementByName(criteria.getElementName()).getElementId();
}
String clause = null;
if (!gotFirstClause) {
clause = "(p.element_id = " + elementIdStr
- + " AND ";
+ + " AND ";
if (criteria instanceof TermQueryCriteria) {
clause += " metadata_value LIKE '%"
- + ((TermQueryCriteria) criteria)
- .getValue() + "%') ";
+ + ((TermQueryCriteria) criteria)
+ .getValue() + "%') ";
} else if (criteria instanceof RangeQueryCriteria) {
String startVal = ((RangeQueryCriteria) criteria)
- .getStartValue();
+ .getStartValue();
String endVal = ((RangeQueryCriteria) criteria)
- .getEndValue();
+ .getEndValue();
boolean inclusive = ((RangeQueryCriteria) criteria)
- .getInclusive();
+ .getInclusive();
if ((startVal != null && !startVal.equals(""))
- || (endVal != null && !endVal
- .equals(""))) {
+ || (endVal != null && !endVal
+ .equals(""))) {
clause += " metadata_value ";
boolean gotStart = false;
if (startVal != null
- && !startVal.equals("")) {
- if (inclusive)
+ && !startVal.equals("")) {
+ if (inclusive) {
clause += ">= '" + startVal + "'";
- else
+ } else {
clause += "> '" + startVal + "'";
+ }
gotStart = true;
}
if (endVal != null && !endVal.equals("")) {
if (gotStart) {
- if (inclusive)
+ if (inclusive) {
clause += " AND metadata_value <= '"
- + endVal + "'";
- else
+ + endVal + "'";
+ } else {
clause += " AND metadata_value < '"
- + endVal + "'";
- } else if (inclusive)
+ + endVal + "'";
+ }
+ } else if (inclusive) {
clause += "<= '" + endVal + "'";
- else
+ } else {
clause += "< '" + endVal + "'";
+ }
}
clause += ") ";
@@ -766,17 +773,17 @@ public class TestTypeHandler extends TestCase {
} else {
String subSelectTblName = "p" + clauseNum;
String subSelectQuery = subSelectQueryBase
- + "WHERE (element_id = " + elementIdStr
- + " AND ";
+ + "WHERE (element_id = " + elementIdStr
+ + " AND ";
if (criteria instanceof TermQueryCriteria) {
subSelectQuery += " metadata_value LIKE '%"
- + ((TermQueryCriteria) criteria)
- .getValue() + "%')";
+ + ((TermQueryCriteria) criteria)
+ .getValue() + "%')";
} else if (criteria instanceof RangeQueryCriteria) {
String startVal = ((RangeQueryCriteria) criteria)
- .getStartValue();
+ .getStartValue();
String endVal = ((RangeQueryCriteria) criteria)
- .getEndValue();
+ .getEndValue();
if (startVal != null || endVal != null) {
subSelectQuery += " metadata_value ";
@@ -784,19 +791,20 @@ public class TestTypeHandler extends TestCase {
boolean gotStart = false;
if (startVal != null
- && !startVal.equals("")) {
+ && !startVal.equals("")) {
subSelectQuery += ">= '" + startVal
- + "'";
+ + "'";
gotStart = true;
}
if (endVal != null && !endVal.equals("")) {
if (gotStart) {
subSelectQuery += " AND metadata_value <= '"
- + endVal + "'";
- } else
+ + endVal + "'";
+ } else {
subSelectQuery += "<= '" + endVal
- + "'";
+ + "'";
+ }
}
subSelectQuery += ") ";
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManager.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManager.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManager.java
index 166c33d..4129f67 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManager.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManager.java
@@ -198,8 +198,8 @@ public class TestXmlRpcFileManager extends TestCase {
File[] delFiles = startDirFile.listFiles();
if (delFiles != null && delFiles.length > 0) {
- for (int i = 0; i < delFiles.length; i++) {
- delFiles[i].delete();
+ for (File delFile : delFiles) {
+ delFile.delete();
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java
index 0d0aba4..d67e3c4 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java
@@ -244,8 +244,8 @@ public class TestXmlRpcFileManagerClient extends TestCase {
File[] delFiles = startDirFile.listFiles();
if (delFiles != null && delFiles.length > 0) {
- for (int i = 0; i < delFiles.length; i++) {
- delFiles[i].delete();
+ for (File delFile : delFiles) {
+ delFile.delete();
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java
index 53b07e0..18096a9 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java
@@ -91,8 +91,8 @@ public class TestExpImpCatalog extends TestCase {
int countProds = 0;
- for (Iterator i = prods.iterator(); i.hasNext();) {
- Product p = (Product) i.next();
+ for (Object prod : prods) {
+ Product p = (Product) prod;
if (p.getProductName().equals("test.txt")) {
countProds++;
}
@@ -134,8 +134,8 @@ public class TestExpImpCatalog extends TestCase {
int countProds = 0;
- for (Iterator i = prods.iterator(); i.hasNext();) {
- Product p = (Product) i.next();
+ for (Object prod : prods) {
+ Product p = (Product) prod;
if (p.getProductName().equals("test.txt")) {
countProds++;
}
@@ -256,8 +256,8 @@ public class TestExpImpCatalog extends TestCase {
File[] delFiles = startDirFile.listFiles();
if (delFiles != null && delFiles.length > 0) {
- for (int i = 0; i < delFiles.length; i++) {
- delFiles[i].delete();
+ for (File delFile : delFiles) {
+ delFile.delete();
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestMetadataBasedProductMover.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestMetadataBasedProductMover.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestMetadataBasedProductMover.java
index 42e50e0..028f9ab 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestMetadataBasedProductMover.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestMetadataBasedProductMover.java
@@ -141,13 +141,13 @@ public class TestMetadataBasedProductMover extends TestCase {
File[] dirFiles = startDirFile.listFiles();
if (dirFiles != null && dirFiles.length > 0) {
- for (int i = 0; i < dirFiles.length; i++) {
- if (dirFiles[i].isDirectory()) {
- deleteAllFilesRecursive(dirFiles[i].getAbsolutePath());
+ for (File dirFile : dirFiles) {
+ if (dirFile.isDirectory()) {
+ deleteAllFilesRecursive(dirFile.getAbsolutePath());
// all dir files deleted, now delete dir
- dirFiles[i].delete();
+ dirFile.delete();
} else {
- dirFiles[i].delete();
+ dirFile.delete();
}
}
}
@@ -162,8 +162,8 @@ public class TestMetadataBasedProductMover extends TestCase {
File[] delFiles = startDirFile.listFiles();
if (delFiles != null && delFiles.length > 0) {
- for (int i = 0; i < delFiles.length; i++) {
- delFiles[i].delete();
+ for (File delFile : delFiles) {
+ delFile.delete();
}
}
[03/16] oodt git commit: OODT-902 tidy up fix enums
Posted by ma...@apache.org.
OODT-902 tidy up fix enums
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/f17f6a26
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/f17f6a26
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/f17f6a26
Branch: refs/heads/master
Commit: f17f6a266db2cc78aeb4982fd1e641083865fdac
Parents: 39306ff
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Oct 25 15:38:24 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Oct 25 15:38:24 2015 +0000
----------------------------------------------------------------------
.../oodt/cas/filemgr/browser/model/CasDB.java | 5 +--
.../perspective/view/impl/DefaultPropView.java | 32 ++++++-------
.../gui/perspective/view/impl/GraphView.java | 47 ++++++++++----------
.../catalog/query/parser/ParseException.java | 1 -
.../catalog/query/parser/SimpleCharStream.java | 1 -
.../cas/catalog/query/parser/TokenMgrError.java | 1 -
.../dictionary/WorkflowManagerDictionary.java | 11 ++---
.../apache/oodt/commons/io/WriterLogger.java | 2 -
.../java/org/apache/oodt/commons/util/XML.java | 39 ++++++++++++----
.../oodt/cas/crawl/action/TernaryAction.java | 8 ++--
.../oodt/cas/filemgr/catalog/LuceneCatalog.java | 5 +--
.../datatransfer/RemoteDataTransferer.java | 4 --
.../repository/XMLRepositoryManager.java | 2 -
.../oodt/cas/filemgr/tools/CatalogSearch.java | 4 --
.../tools/MetadataBasedProductMover.java | 24 +++++-----
.../filemgr/validation/XMLValidationLayer.java | 3 --
.../apache/oodt/pcs/tools/PCSHealthMonitor.java | 2 +-
.../pge/writers/xslt/XslTransformWriter.java | 4 +-
.../handlers/ofsn/AbstractCrawlLister.java | 10 +----
.../product/handlers/ofsn/OFSNFileHandler.java | 10 +----
.../oodt/cas/pushpull/config/RemoteSpecs.java | 16 +++----
.../oodt/cas/pushpull/expressions/Variable.java | 8 +---
.../filerestrictions/FileRestrictions.java | 8 +---
.../pushpull/filerestrictions/VirtualFile.java | 4 +-
.../cas/pushpull/protocol/ProtocolHandler.java | 14 +++---
.../retrievalsystem/FileRetrievalSystem.java | 5 +--
.../apache/oodt/security/sso/OpenSSOImpl.java | 13 +++---
.../LuceneWorkflowInstanceRepository.java | 5 +--
.../org/apache/oodt/xmlps/mapping/Mapping.java | 5 +--
.../java/org/apache/oodt/xmlquery/XMLQuery.java | 14 ++----
30 files changed, 127 insertions(+), 180 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/f17f6a26/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java
----------------------------------------------------------------------
diff --git a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java
index 4cdf9b4..2677254 100644
--- a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java
+++ b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java
@@ -59,10 +59,7 @@ public class CasDB {
}
public boolean isConnected() {
- if (filemgrUrl == null) {
- return false;
- } else
- return true;
+ return filemgrUrl != null;
}
public String[] getAvailableTypes() {
http://git-wip-us.apache.org/repos/asf/oodt/blob/f17f6a26/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultPropView.java
----------------------------------------------------------------------
diff --git a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultPropView.java b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultPropView.java
index cacfae9..1e0f0b8 100644
--- a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultPropView.java
+++ b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultPropView.java
@@ -18,6 +18,13 @@
package org.apache.oodt.cas.workflow.gui.perspective.view.impl;
//JDK imports
+import org.apache.commons.lang.StringUtils;
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.workflow.gui.model.ModelGraph;
+import org.apache.oodt.cas.workflow.gui.perspective.view.View;
+import org.apache.oodt.cas.workflow.gui.perspective.view.ViewState;
+import org.apache.oodt.cas.workflow.gui.util.GuiUtils;
+
import java.awt.BorderLayout;
import java.awt.Checkbox;
import java.awt.Color;
@@ -39,6 +46,7 @@ import java.util.HashMap;
import java.util.Hashtable;
import java.util.List;
import java.util.Vector;
+
import javax.swing.BoxLayout;
import javax.swing.DefaultListModel;
import javax.swing.JButton;
@@ -66,14 +74,7 @@ import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableColumn;
//Apache imports
-import org.apache.commons.lang.StringUtils;
-
//OODT imports
-import org.apache.oodt.cas.metadata.Metadata;
-import org.apache.oodt.cas.workflow.gui.model.ModelGraph;
-import org.apache.oodt.cas.workflow.gui.perspective.view.View;
-import org.apache.oodt.cas.workflow.gui.perspective.view.ViewState;
-import org.apache.oodt.cas.workflow.gui.util.GuiUtils;
/**
*
@@ -193,21 +194,16 @@ public class DefaultPropView extends View {
public boolean isCellEditable(int row, int col) {
if (row >= rows.size()) {
- if (selected.getModel().getStaticMetadata()
- .containsGroup(state.getCurrentMetGroup()))
- return true;
- else
- return false;
+ return selected.getModel().getStaticMetadata()
+ .containsGroup(state.getCurrentMetGroup());
}
if (col == 0)
return false;
String key = rows.get(row).get(1);
- if (key == null
- || (selected.getModel().getStaticMetadata() != null && selected
- .getModel().getStaticMetadata()
- .containsKey(getKey(key, state))))
- return true;
- return false;
+ return key == null
+ || (selected.getModel().getStaticMetadata() != null && selected
+ .getModel().getStaticMetadata()
+ .containsKey(getKey(key, state)));
}
public void setValueAt(Object value, int row, int col) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/f17f6a26/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/GraphView.java
----------------------------------------------------------------------
diff --git a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/GraphView.java b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/GraphView.java
index 69469d1..0fb1a68 100644
--- a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/GraphView.java
+++ b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/GraphView.java
@@ -18,6 +18,23 @@
package org.apache.oodt.cas.workflow.gui.perspective.view.impl;
//JDK imports
+import com.jgraph.layout.JGraphFacade;
+import com.jgraph.layout.hierarchical.JGraphHierarchicalLayout;
+
+import org.apache.oodt.cas.workflow.gui.model.ModelGraph;
+import org.apache.oodt.cas.workflow.gui.model.ModelNode;
+import org.apache.oodt.cas.workflow.gui.perspective.view.View;
+import org.apache.oodt.cas.workflow.gui.perspective.view.ViewChange;
+import org.apache.oodt.cas.workflow.gui.perspective.view.ViewState;
+import org.apache.oodt.cas.workflow.gui.util.GuiUtils;
+import org.apache.oodt.cas.workflow.gui.util.IconLoader;
+import org.apache.oodt.cas.workflow.gui.util.Line;
+import org.jgraph.JGraph;
+import org.jgraph.graph.AttributeMap;
+import org.jgraph.graph.DefaultEdge;
+import org.jgraph.graph.DefaultGraphCell;
+import org.jgraph.graph.GraphConstants;
+
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Cursor;
@@ -55,35 +72,20 @@ import java.util.HashMap;
import java.util.Hashtable;
import java.util.List;
import java.util.Map;
-import java.util.Vector;
import java.util.Map.Entry;
+import java.util.Vector;
+
import javax.swing.JScrollPane;
import javax.swing.SwingConstants;
import javax.swing.border.LineBorder;
import javax.swing.tree.DefaultMutableTreeNode;
-//JGraph imports
-import org.jgraph.JGraph;
-import org.jgraph.graph.AttributeMap;
-import org.jgraph.graph.DefaultGraphCell;
-import org.jgraph.graph.DefaultEdge;
-import org.jgraph.graph.GraphConstants;
-import com.jgraph.layout.JGraphFacade;
-import com.jgraph.layout.hierarchical.JGraphHierarchicalLayout;
-
-//Jung imports
import edu.uci.ics.jung.graph.DirectedSparseGraph;
import edu.uci.ics.jung.graph.ObservableGraph;
+//JGraph imports
+//Jung imports
//OODT imports
-import org.apache.oodt.cas.workflow.gui.model.ModelGraph;
-import org.apache.oodt.cas.workflow.gui.model.ModelNode;
-import org.apache.oodt.cas.workflow.gui.perspective.view.View;
-import org.apache.oodt.cas.workflow.gui.perspective.view.ViewChange;
-import org.apache.oodt.cas.workflow.gui.perspective.view.ViewState;
-import org.apache.oodt.cas.workflow.gui.util.GuiUtils;
-import org.apache.oodt.cas.workflow.gui.util.IconLoader;
-import org.apache.oodt.cas.workflow.gui.util.Line;
/**
*
@@ -240,11 +242,8 @@ public class GraphView extends DefaultTreeView {
}
public boolean isDataFlavorSupported(DataFlavor flavor) {
- if (flavor.getHumanPresentableName().equals(
- DefaultGraphCell.class.getSimpleName()))
- return true;
- else
- return false;
+ return flavor.getHumanPresentableName().equals(
+ DefaultGraphCell.class.getSimpleName());
}
}, new DragSourceListener() {
http://git-wip-us.apache.org/repos/asf/oodt/blob/f17f6a26/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/ParseException.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/ParseException.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/ParseException.java
index 1b8a696..50401fb 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/ParseException.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/ParseException.java
@@ -179,7 +179,6 @@ public class ParseException extends Exception {
} else {
retval.append(ch);
}
- continue;
}
}
return retval.toString();
http://git-wip-us.apache.org/repos/asf/oodt/blob/f17f6a26/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleCharStream.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleCharStream.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleCharStream.java
index eca5b5a..ef010ae 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleCharStream.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleCharStream.java
@@ -118,7 +118,6 @@ public class SimpleCharStream
}
else
maxNextCharInd += i;
- return;
}
catch(java.io.IOException e) {
--bufpos;
http://git-wip-us.apache.org/repos/asf/oodt/blob/f17f6a26/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 0dc612a..7bac32a 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
@@ -86,7 +86,6 @@ public class TokenMgrError extends Error
} else {
retval.append(ch);
}
- continue;
}
}
return retval.toString();
http://git-wip-us.apache.org/repos/asf/oodt/blob/f17f6a26/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionary.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionary.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionary.java
index 1c59709..5ffdf6d 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionary.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionary.java
@@ -62,13 +62,10 @@ public class WorkflowManagerDictionary implements Dictionary {
throws CatalogDictionaryException {
Set<String> bucketNames = queryExpression.getBucketNames();
if (bucketNames == null || bucketNames.contains("Workflows")) {
- if (queryExpression instanceof NotQueryExpression
- || queryExpression instanceof ComparisonQueryExpression
- || queryExpression instanceof StdQueryExpression
- || queryExpression instanceof QueryLogicalGroup) {
- return true;
- } else
- return false;
+ return queryExpression instanceof NotQueryExpression
+ || queryExpression instanceof ComparisonQueryExpression
+ || queryExpression instanceof StdQueryExpression
+ || queryExpression instanceof QueryLogicalGroup;
}
return false;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f17f6a26/commons/src/main/java/org/apache/oodt/commons/io/WriterLogger.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/io/WriterLogger.java b/commons/src/main/java/org/apache/oodt/commons/io/WriterLogger.java
index 7fbdaea..1ce6f6f 100644
--- a/commons/src/main/java/org/apache/oodt/commons/io/WriterLogger.java
+++ b/commons/src/main/java/org/apache/oodt/commons/io/WriterLogger.java
@@ -132,7 +132,6 @@ public class WriterLogger implements LogListener {
* @param event The event to ignore.
*/
public void streamStarted(LogEvent event) {
- return;
}
/** Ignore the stream stopped event.
@@ -140,7 +139,6 @@ public class WriterLogger implements LogListener {
* @param event The event to ignore.
*/
public void streamStopped(LogEvent event) {
- return;
}
public void propertyChange(java.beans.PropertyChangeEvent ignore) {}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f17f6a26/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 bd0a71b..6239946 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
@@ -60,21 +60,42 @@
package org.apache.oodt.commons.util;
-import java.io.*;
-import java.util.*;
-import org.w3c.dom.*;
-import org.xml.sax.*;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.SAXParserFactory;
-import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.OutputKeys;
/** XML services.
*
@@ -442,7 +463,7 @@ public class XML {
StringBuilder wrapped = new StringBuilder(text1(node, buffer));
boolean newline = false;
for (int i = 0; i < wrapped.length(); ++i) {
- if (newline == false) {
+ if (!newline) {
if (wrapped.charAt(i) == '\n') {
newline = true;
wrapped.setCharAt(i, ' ');
http://git-wip-us.apache.org/repos/asf/oodt/blob/f17f6a26/crawler/src/main/java/org/apache/oodt/cas/crawl/action/TernaryAction.java
----------------------------------------------------------------------
diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/TernaryAction.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/TernaryAction.java
index 8c496e2..72ac524 100755
--- a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/TernaryAction.java
+++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/TernaryAction.java
@@ -50,13 +50,13 @@ public class TernaryAction extends CrawlerAction {
if (passedCondition) {
LOG.info("Performing action (id = " + successAction.getId()
+ " : description = " + successAction.getDescription() + ")");
- return (successAction == null) ? true : successAction.performAction(
- product, metadata);
+ return (successAction == null) || successAction.performAction(
+ product, metadata);
} else {
LOG.info("Performing action (id = " + failureAction.getId()
+ " : description = " + failureAction.getDescription() + ")");
- return (failureAction == null) ? true : failureAction.performAction(
- product, metadata);
+ return (failureAction == null) || failureAction.performAction(
+ product, metadata);
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f17f6a26/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 e5a2fb1..843d226 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
@@ -961,10 +961,7 @@ public class LuceneCatalog implements Catalog {
boolean createIndex;
- if (indexDir.exists() && indexDir.isDirectory()) {
- createIndex = false;
- } else
- createIndex = true;
+ createIndex = !(indexDir.exists() && indexDir.isDirectory());
try {
writer = new IndexWriter(indexFilePath, new StandardAnalyzer(),
http://git-wip-us.apache.org/repos/asf/oodt/blob/f17f6a26/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java
index 57a1d19..de14832 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java
@@ -241,14 +241,12 @@ public class RemoteDataTransferer implements DataTransfer {
LOG.log(Level.WARNING,
"Error opening input stream to read file to transfer: Message: "
+ e.getMessage());
- return;
} catch (DataTransferException e) {
LOG.log(
Level.WARNING,
"DataTransferException when transfering file: [" + origFilePath
+ "] to [" + destFilePath + "]: Message: "
+ e.getMessage());
- return;
} finally {
if (is != null) {
try {
@@ -269,7 +267,6 @@ public class RemoteDataTransferer implements DataTransfer {
LOG.log(Level.WARNING,
"Error notifying file manager of product transfer initiation for product: ["
+ p.getProductId() + "]: Message: " + e.getMessage());
- return;
}
}
@@ -281,7 +278,6 @@ public class RemoteDataTransferer implements DataTransfer {
LOG.log(Level.WARNING,
"Error notifying file manager of product transfer completion for product: ["
+ p.getProductId() + "]: Message: " + e.getMessage());
- return;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f17f6a26/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManager.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManager.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManager.java
index 4730e1d..023e9ca 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManager.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManager.java
@@ -190,7 +190,6 @@ public class XMLRepositoryManager implements RepositoryManager {
+ "type directory URI: " + dirUri
+ ": Skipping Product Type saving"
+ "for it: Message: " + e.getMessage());
- continue;
}
}
@@ -252,7 +251,6 @@ public class XMLRepositoryManager implements RepositoryManager {
+ "type directory URI: " + dirUri
+ ": Skipping Product Type loading"
+ "for it: Message: " + e.getMessage());
- continue;
}
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f17f6a26/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java
index caa24ac..f6d8e1e 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java
@@ -301,27 +301,23 @@ public class CatalogSearch {
listElements();
} else {
System.out.println("Error parsing command");
- return;
}
}
}
} else {
System.out.println("Error parsing command");
- return;
}
} else if (com.equalsIgnoreCase("add")) {
if (tokCount == 3 && tok.nextToken().equalsIgnoreCase("filter")) {
setFilter(tok.nextToken());
} else {
System.out.println("Error parsing command");
- return;
}
} else if (com.equalsIgnoreCase("remove")) {
if (tokCount == 2 && tok.nextToken().equalsIgnoreCase("filter")) {
removeFilter();
} else {
System.out.println("Error parsing command");
- return;
}
} else if (com.equalsIgnoreCase("help")) {
printHelp();
http://git-wip-us.apache.org/repos/asf/oodt/blob/f17f6a26/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataBasedProductMover.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataBasedProductMover.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataBasedProductMover.java
index d5c4302..db9b669 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataBasedProductMover.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataBasedProductMover.java
@@ -18,6 +18,15 @@
package org.apache.oodt.cas.filemgr.tools;
//JDK imports
+import org.apache.oodt.cas.filemgr.structs.Product;
+import org.apache.oodt.cas.filemgr.structs.ProductPage;
+import org.apache.oodt.cas.filemgr.structs.ProductType;
+import org.apache.oodt.cas.filemgr.structs.Reference;
+import org.apache.oodt.cas.filemgr.structs.exceptions.ConnectionException;
+import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.metadata.util.PathUtils;
+
import java.io.File;
import java.net.MalformedURLException;
import java.net.URI;
@@ -27,14 +36,6 @@ import java.util.logging.Level;
import java.util.logging.Logger;
//OODT imports
-import org.apache.oodt.cas.filemgr.structs.Product;
-import org.apache.oodt.cas.filemgr.structs.ProductPage;
-import org.apache.oodt.cas.filemgr.structs.ProductType;
-import org.apache.oodt.cas.filemgr.structs.Reference;
-import org.apache.oodt.cas.filemgr.structs.exceptions.ConnectionException;
-import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
-import org.apache.oodt.cas.metadata.util.PathUtils;
-import org.apache.oodt.cas.metadata.Metadata;
/**
* @author mattmann
@@ -129,12 +130,7 @@ public class MetadataBasedProductMover {
String currentLocationURI = new URI(currentLocation).getSchemeSpecificPart();
String newLocationURI = new URI(newLocation).getSchemeSpecificPart();
- if (currentLocationURI.equals(newLocationURI)) {
- return true;
- }
- else {
- return false;
- }
+ return currentLocationURI.equals(newLocationURI);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f17f6a26/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java
index d6e427b..81d5c2f 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java
@@ -323,7 +323,6 @@ public class XMLValidationLayer implements ValidationLayer {
+ dirUri
+ ": Skipping Element and Product Type map saving"
+ "for it: Message: " + e.getMessage());
- continue;
}
}
@@ -374,7 +373,6 @@ public class XMLValidationLayer implements ValidationLayer {
+ "directory URI: " + dirUri
+ ": Skipping element loading"
+ "for it: Message: " + e.getMessage());
- continue;
}
}
}
@@ -460,7 +458,6 @@ public class XMLValidationLayer implements ValidationLayer {
+ "directory URI: " + dirUri
+ ": Skipping product type map loading"
+ "for it: Message: " + e.getMessage());
- continue;
}
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f17f6a26/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 889f8aa..8783669 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
@@ -605,7 +605,7 @@ public final class PCSHealthMonitor implements CoreMetKeys,
}
private boolean getFmUp() {
- return fm.getFmgrClient() != null ? fm.getFmgrClient().isAlive() : false;
+ return fm.getFmgrClient() != null && fm.getFmgrClient().isAlive();
}
private boolean getWmUp() {
http://git-wip-us.apache.org/repos/asf/oodt/blob/f17f6a26/pge/src/main/java/org/apache/oodt/cas/pge/writers/xslt/XslTransformWriter.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/writers/xslt/XslTransformWriter.java b/pge/src/main/java/org/apache/oodt/cas/pge/writers/xslt/XslTransformWriter.java
index 9c783cb..acac422 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/writers/xslt/XslTransformWriter.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/writers/xslt/XslTransformWriter.java
@@ -58,8 +58,8 @@ public class XslTransformWriter implements SciPgeConfigFileWriter {
TransformerFactory transFact = TransformerFactory.newInstance();
Transformer trans = transFact.newTransformer(xsltSource);
- boolean useCDATA = customArgs.length > 1 ? ((String) customArgs[1])
- .toLowerCase().equals("true") : false;
+ boolean useCDATA = customArgs.length > 1 && ((String) customArgs[1])
+ .toLowerCase().equals("true");
Source xmlSource = new DOMSource((new SerializableMetadata(
inputMetadata,
trans.getOutputProperty(OutputKeys.ENCODING), useCDATA))
http://git-wip-us.apache.org/repos/asf/oodt/blob/f17f6a26/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java
----------------------------------------------------------------------
diff --git a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java
index c2dd506..e4c8581 100644
--- a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java
+++ b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java
@@ -49,19 +49,13 @@ public abstract class AbstractCrawlLister implements OFSNListHandler {
protected static final FileFilter FILE_FILTER = new FileFilter() {
public boolean accept(File pathname) {
- if (pathname.isFile()) {
- return true;
- } else
- return false;
+ return pathname.isFile();
}
};
protected static final FileFilter DIR_FILTER = new FileFilter() {
public boolean accept(File pathname) {
- if (pathname.isDirectory()) {
- return true;
- } else
- return false;
+ return pathname.isDirectory();
}
};
http://git-wip-us.apache.org/repos/asf/oodt/blob/f17f6a26/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandler.java
----------------------------------------------------------------------
diff --git a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandler.java b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandler.java
index 484d5f3..ab5c447 100644
--- a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandler.java
+++ b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandler.java
@@ -246,19 +246,13 @@ public class OFSNFileHandler implements LargeProductQueryHandler,
throw new ProductException("Unrecognized command: [" + cmd + "]!");
}
- if (cfg.getType().equals(LISTING_CMD)) {
- return true;
- } else
- return false;
+ return cfg.getType().equals(LISTING_CMD);
}
private boolean isGetCmd(String cmd) throws ProductException {
OFSNHandlerConfig cfg = this.conf.getHandlerConfig(cmd);
- if (cfg.getType().equals(GET_CMD)) {
- return true;
- } else
- return false;
+ return cfg.getType().equals(GET_CMD);
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f17f6a26/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java
index e0d5f0e..52ea401 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java
@@ -17,28 +17,28 @@
package org.apache.oodt.cas.pushpull.config;
//OODT imports
+import com.google.common.base.Strings;
+
+import org.apache.oodt.cas.metadata.util.PathUtils;
import org.apache.oodt.cas.pushpull.exceptions.ConfigException;
import org.apache.oodt.cas.pushpull.filerestrictions.Parser;
import org.apache.oodt.cas.pushpull.filerestrictions.renamingconventions.RenamingConvention;
import org.apache.oodt.cas.pushpull.objectfactory.PushPullObjectFactory;
import org.apache.oodt.cas.pushpull.protocol.RemoteSite;
-import org.apache.oodt.cas.metadata.util.PathUtils;
import org.apache.oodt.commons.xml.XMLUtils;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
-//JDK imports
import java.io.File;
import java.io.FileInputStream;
import java.net.URL;
import java.util.HashMap;
import java.util.LinkedList;
+//JDK imports
//DOM imports
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
//Google imports
-import com.google.common.base.Strings;
/**
* Remote Site Crawling specifications.
@@ -110,7 +110,7 @@ public class RemoteSpecs implements ConfigParserMetKeys {
.getAttribute(FIRSTRUN_DATETIME_ATTR);
period = runInfo.getAttribute(PERIOD_ATTR);
runOnReboot = (runInfo.getAttribute(RUNONREBOOT_ATTR)
- .toLowerCase().equals("yes")) ? true : false;
+ .toLowerCase().equals("yes"));
epsilon = runInfo.getAttribute(EPSILON_ATTR);
if (epsilon.equals(""))
epsilon = "0s";
http://git-wip-us.apache.org/repos/asf/oodt/blob/f17f6a26/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Variable.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Variable.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Variable.java
index 38828b9..7dde7ae 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Variable.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Variable.java
@@ -62,15 +62,11 @@ public class Variable implements ValidInput {
}
public boolean isString() {
- if (value instanceof String)
- return true;
- return false;
+ return value instanceof String;
}
public boolean isInteger() {
- if (value instanceof Integer)
- return true;
- return false;
+ return value instanceof Integer;
}
public void setValue(Object value) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/f17f6a26/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/FileRestrictions.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/FileRestrictions.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/FileRestrictions.java
index 1ff7b76..b080c59 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/FileRestrictions.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/FileRestrictions.java
@@ -490,12 +490,8 @@ public class FileRestrictions {
}
private static boolean isValidPath(ProtocolPath path) {
- if (path != null && !path.getFileName().equals(".")
- && !path.getFileName().equals("..")) {
- return true;
- } else {
- return false;
- }
+ return path != null && !path.getFileName().equals(".")
+ && !path.getFileName().equals("..");
}
public static LinkedList<String> toStringList(VirtualFile root) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/f17f6a26/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 f3aefce..d3a4a2d 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
@@ -186,9 +186,7 @@ public class VirtualFile {
}
public boolean hasChild(VirtualFile vf) {
- if (children.contains(vf))
- return true;
- return false;
+ return children.contains(vf);
}
public String getAbsolutePath() {
http://git-wip-us.apache.org/repos/asf/oodt/blob/f17f6a26/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolHandler.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolHandler.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolHandler.java
index b8f3b61..3bc9a3c 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolHandler.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolHandler.java
@@ -240,15 +240,11 @@ public class ProtocolHandler {
private boolean passesDynamicDetection(PagingInfo pgInfo,
List<RemoteSiteFile> newLS) throws MalformedURLException,
ProtocolException {
- if (pgInfo.getSizeOfLastLS() != -1
- && (pgInfo.getSizeOfLastLS() != newLS.size() || (newLS.size() != 0
- && pgInfo.getPageLoc() < newLS.size() && (newLS.get(pgInfo
- .getPageLoc()) == null || !newLS.get(pgInfo.getPageLoc()).equals(
- pgInfo.getRemoteSiteFileAtPageLoc()))))) {
- return false;
- } else {
- return true;
- }
+ return !(pgInfo.getSizeOfLastLS() != -1
+ && (pgInfo.getSizeOfLastLS() != newLS.size() || (newLS.size() != 0
+ && pgInfo.getPageLoc() < newLS.size() && (newLS.get(pgInfo
+ .getPageLoc()) == null || !newLS.get(pgInfo.getPageLoc()).equals(
+ pgInfo.getRemoteSiteFileAtPageLoc())))));
}
public void download(Protocol protocol, RemoteSiteFile fromFile, File toFile,
http://git-wip-us.apache.org/repos/asf/oodt/blob/f17f6a26/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 b462796..8c7bf65 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
@@ -249,9 +249,8 @@ public class FileRetrievalSystem {
}
public boolean isAlreadyInDatabase(RemoteFile rf) throws CatalogException {
- return config.getIngester() != null ? config.getIngester().hasProduct(
- config.getFmUrl(), rf.getMetadata(RemoteFile.PRODUCT_NAME))
- : false;
+ return config.getIngester() != null && config.getIngester().hasProduct(
+ config.getFmUrl(), rf.getMetadata(RemoteFile.PRODUCT_NAME));
}
public List<RemoteSiteFile> getNextPage(final RemoteSiteFile dir,
http://git-wip-us.apache.org/repos/asf/oodt/blob/f17f6a26/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 4333f14..bd8043a 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
@@ -18,19 +18,20 @@
package org.apache.oodt.security.sso;
//JDK imports
+import org.apache.commons.codec.binary.Base64;
+import org.apache.oodt.security.sso.opensso.SSOMetKeys;
+import org.apache.oodt.security.sso.opensso.SSOProxy;
+import org.apache.oodt.security.sso.opensso.UserDetails;
+
import java.util.Collections;
import java.util.List;
import java.util.Vector;
import java.util.logging.Logger;
+
import javax.servlet.http.Cookie;
//APACHE imports
-import org.apache.commons.codec.binary.Base64;
-
//LMMP imports
-import org.apache.oodt.security.sso.opensso.SSOMetKeys;
-import org.apache.oodt.security.sso.opensso.SSOProxy;
-import org.apache.oodt.security.sso.opensso.UserDetails;
/**
*
@@ -82,7 +83,7 @@ public class OpenSSOImpl extends AbstractWebBasedSingleSignOn implements
public boolean isLoggedIn() {
// TODO: make sure the token is valid?
- return (this.getSSOToken() == null) ? false : true;
+ return (this.getSSOToken() != null);
}
public boolean login(String username, String password) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/f17f6a26/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java
index 1203002..94b3081 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java
@@ -446,10 +446,7 @@ public class LuceneWorkflowInstanceRepository extends
boolean createIndex = false;
- if (indexDir.exists() && indexDir.isDirectory()) {
- createIndex = false;
- } else
- createIndex = true;
+ createIndex = !(indexDir.exists() && indexDir.isDirectory());
try {
writer = new IndexWriter(idxFilePath, new StandardAnalyzer(),
http://git-wip-us.apache.org/repos/asf/oodt/blob/f17f6a26/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/Mapping.java
----------------------------------------------------------------------
diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/Mapping.java b/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/Mapping.java
index 3df9a49..18e2ca3 100644
--- a/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/Mapping.java
+++ b/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/Mapping.java
@@ -88,10 +88,7 @@ public class Mapping {
return true; // leave it out
}
- if (fld.getType() == FieldType.CONSTANT) {
- return true;
- } else
- return false;
+ return fld.getType() == FieldType.CONSTANT;
}
public int getNumFields() {
http://git-wip-us.apache.org/repos/asf/oodt/blob/f17f6a26/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 1da150e..1b6710c 100755
--- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java
+++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java
@@ -419,12 +419,8 @@ public class XMLQuery implements java.io.Serializable, Cloneable {
tokens.whitespaceChars(0, ' ');
tokens.quoteChar('"');
tokens.quoteChar('\'');
-
- if (kqOrParse ()){
- return true;
- } else {
- return false;
- }
+
+ return kqOrParse();
}
/**
@@ -809,8 +805,7 @@ public class XMLQuery implements java.io.Serializable, Cloneable {
}
}
}
- return;
- }
+ }
/**
* Replace the dictionary keyword value with the DOM text node value.
@@ -824,8 +819,7 @@ public class XMLQuery implements java.io.Serializable, Cloneable {
} else {
map.put(nodeName, "UNKNOWN");
}
- return;
- }
+ }
/**
* Scan the DOM structure for the SELECT, FROM, or WHERE set.
[13/16] oodt git commit: OODT-906 remove unrequired assignment
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/resource/src/main/java/org/apache/oodt/cas/resource/tools/RunDirJobSubmitter.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/tools/RunDirJobSubmitter.java b/resource/src/main/java/org/apache/oodt/cas/resource/tools/RunDirJobSubmitter.java
index a34741b..63970d5 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/tools/RunDirJobSubmitter.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/tools/RunDirJobSubmitter.java
@@ -105,8 +105,8 @@ public final class RunDirJobSubmitter {
if (!in.ready())
throw new IOException();
- String line = null;
- String jobId = null;
+ String line;
+ String jobId;
while ((line = in.readLine()) != null) {
// overwrite the runDirName
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/resource/src/main/java/org/apache/oodt/cas/resource/util/GenericResourceManagerObjectFactory.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/util/GenericResourceManagerObjectFactory.java b/resource/src/main/java/org/apache/oodt/cas/resource/util/GenericResourceManagerObjectFactory.java
index f676838..f70a33c 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/util/GenericResourceManagerObjectFactory.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/util/GenericResourceManagerObjectFactory.java
@@ -135,8 +135,8 @@ public final class GenericResourceManagerObjectFactory {
* @return A new implementation of a {@link QueueRepository}.
*/
public static QueueRepository getQueueRepositoryFromFactory(String queueRepositoryFactory) {
- Class clazz = null;
- QueueRepositoryFactory factory = null;
+ Class clazz;
+ QueueRepositoryFactory factory;
try {
clazz = Class.forName(queueRepositoryFactory);
@@ -171,8 +171,8 @@ public final class GenericResourceManagerObjectFactory {
* @return A new implementation of a {@link BackendRepository}.
*/
public static BackendRepository getBackendRepositoryFromFactory(String backendRepositoryFactory) {
- Class clazz = null;
- BackendRepositoryFactory factory = null;
+ Class clazz;
+ BackendRepositoryFactory factory;
try {
clazz = Class.forName(backendRepositoryFactory);
@@ -204,8 +204,8 @@ public final class GenericResourceManagerObjectFactory {
* @return A new implementation of a {@link NodeRepository}.
*/
public static NodeRepository getNodeRepositoryFromFactory(String nodeRepositoryFactory) {
- Class clazz = null;
- NodeRepositoryFactory factory = null;
+ Class clazz;
+ NodeRepositoryFactory factory;
try {
clazz = Class.forName(nodeRepositoryFactory);
@@ -241,8 +241,8 @@ public final class GenericResourceManagerObjectFactory {
* @return A new implementation of a {@link JobQueue}.
*/
public static JobQueue getJobQueueServiceFromFactory(String serviceFactory) {
- Class clazz = null;
- JobQueueFactory factory = null;
+ Class clazz;
+ JobQueueFactory factory;
try {
clazz = Class.forName(serviceFactory);
@@ -278,8 +278,8 @@ public final class GenericResourceManagerObjectFactory {
* @return A new {@link Batchmgr} implementation.
*/
public static Batchmgr getBatchmgrServiceFromFactory(String serviceFactory) {
- Class clazz = null;
- BatchmgrFactory factory = null;
+ Class clazz;
+ BatchmgrFactory factory;
try {
clazz = Class.forName(serviceFactory);
@@ -315,8 +315,8 @@ public final class GenericResourceManagerObjectFactory {
* @return A new {@link Monitor} implementation.
*/
public static Monitor getMonitorServiceFromFactory(String serviceFactory) {
- Class clazz = null;
- MonitorFactory factory = null;
+ Class clazz;
+ MonitorFactory factory;
try {
clazz = Class.forName(serviceFactory);
@@ -353,8 +353,8 @@ public final class GenericResourceManagerObjectFactory {
* @return A new {@link Scheduler} implementation.
*/
public static Scheduler getSchedulerServiceFromFactory(String serviceFactory) {
- Class clazz = null;
- SchedulerFactory factory = null;
+ Class clazz;
+ SchedulerFactory factory;
try {
clazz = Class.forName(serviceFactory);
@@ -388,8 +388,8 @@ public final class GenericResourceManagerObjectFactory {
* @return A new {@link JobRepository} from the given service factory.
*/
public static JobRepository getJobRepositoryFromServiceFactory(String serviceFactory) {
- Class clazz = null;
- JobRepositoryFactory factory = null;
+ Class clazz;
+ JobRepositoryFactory factory;
try {
clazz = Class.forName(serviceFactory);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/resource/src/main/java/org/apache/oodt/cas/resource/util/JobBuilder.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/util/JobBuilder.java b/resource/src/main/java/org/apache/oodt/cas/resource/util/JobBuilder.java
index 8cc8d65..1d96263 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/util/JobBuilder.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/util/JobBuilder.java
@@ -47,7 +47,7 @@ public final class JobBuilder {
}
public static JobSpec buildJobSpec(String jobFilePath) {
- Document doc = null;
+ Document doc;
try {
doc = XMLUtils.getDocumentRoot(new FileInputStream(new File(
jobFilePath)));
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/resource/src/main/java/org/apache/oodt/cas/resource/util/Ulimit.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/util/Ulimit.java b/resource/src/main/java/org/apache/oodt/cas/resource/util/Ulimit.java
index 10982da..adba1b1 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/util/Ulimit.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/util/Ulimit.java
@@ -167,7 +167,7 @@ public final class Ulimit implements UlimitMetKeys {
}
public static Map getUlimitPropertiesMap() throws Exception {
- Process p = null;
+ Process p;
try {
p = Runtime.getRuntime().exec(
new String[] { shell, runShellCmdOption, ulimitCommand });
@@ -180,7 +180,7 @@ public final class Ulimit implements UlimitMetKeys {
BufferedReader in = new BufferedReader(new InputStreamReader(p
.getInputStream()));
- String line = null;
+ String line;
Map properties = new HashMap();
while ((line = in.readLine()) != null) {
@@ -198,7 +198,7 @@ public final class Ulimit implements UlimitMetKeys {
}
public static List getUlimitProperties() throws Exception {
- Process p = null;
+ Process p;
try {
p = Runtime.getRuntime().exec(
new String[] { shell, runShellCmdOption, ulimitCommand });
@@ -211,7 +211,7 @@ public final class Ulimit implements UlimitMetKeys {
BufferedReader in = new BufferedReader(new InputStreamReader(p
.getInputStream()));
- String line = null;
+ String line;
List properties = new Vector();
while ((line = in.readLine()) != null) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/resource/src/test/java/org/apache/oodt/cas/resource/jobqueue/TestJobStack.java
----------------------------------------------------------------------
diff --git a/resource/src/test/java/org/apache/oodt/cas/resource/jobqueue/TestJobStack.java b/resource/src/test/java/org/apache/oodt/cas/resource/jobqueue/TestJobStack.java
index cac41c9..147478b 100644
--- a/resource/src/test/java/org/apache/oodt/cas/resource/jobqueue/TestJobStack.java
+++ b/resource/src/test/java/org/apache/oodt/cas/resource/jobqueue/TestJobStack.java
@@ -140,7 +140,7 @@ public class TestJobStack extends TestCase {
public void testGetNextJob() {
JobStack stack = new JobStack(waitTime, repo);
- JobSpec nextJob = null;
+ JobSpec nextJob;
try {
stack.addJob(job1);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 bd8043a..4145556 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
@@ -61,7 +61,7 @@ public class OpenSSOImpl extends AbstractWebBasedSingleSignOn implements
// and pull the username from there
String ssoToken = this.getSSOToken();
if (ssoToken != null) {
- UserDetails details = null;
+ UserDetails details;
try {
details = this.ssoProxy.getUserAttributes(ssoToken);
} catch (Exception e) {
@@ -88,7 +88,7 @@ public class OpenSSOImpl extends AbstractWebBasedSingleSignOn implements
public boolean login(String username, String password) {
- String ssoToken = null;
+ String ssoToken;
try {
ssoToken = this.ssoProxy.authenticate(username, password);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/sso/src/main/java/org/apache/oodt/security/sso/SingleSignOnFactory.java
----------------------------------------------------------------------
diff --git a/sso/src/main/java/org/apache/oodt/security/sso/SingleSignOnFactory.java b/sso/src/main/java/org/apache/oodt/security/sso/SingleSignOnFactory.java
index bed2aae..dd6b892 100644
--- a/sso/src/main/java/org/apache/oodt/security/sso/SingleSignOnFactory.java
+++ b/sso/src/main/java/org/apache/oodt/security/sso/SingleSignOnFactory.java
@@ -38,8 +38,8 @@ public final class SingleSignOnFactory {
@SuppressWarnings("unchecked")
public static AbstractWebBasedSingleSignOn getWebBasedSingleSignOn(String className) {
- AbstractWebBasedSingleSignOn sso = null;
- Class<AbstractWebBasedSingleSignOn> clazz = null;
+ AbstractWebBasedSingleSignOn sso;
+ Class<AbstractWebBasedSingleSignOn> clazz;
try {
clazz = (Class<AbstractWebBasedSingleSignOn>) Class.forName(className);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/sso/src/main/java/org/apache/oodt/security/sso/opensso/SSOProxy.java
----------------------------------------------------------------------
diff --git a/sso/src/main/java/org/apache/oodt/security/sso/opensso/SSOProxy.java b/sso/src/main/java/org/apache/oodt/security/sso/opensso/SSOProxy.java
index e4e0de3..6a47838 100755
--- a/sso/src/main/java/org/apache/oodt/security/sso/opensso/SSOProxy.java
+++ b/sso/src/main/java/org/apache/oodt/security/sso/opensso/SSOProxy.java
@@ -87,7 +87,7 @@ public class SSOProxy implements SSOMetKeys {
public String authenticate(String username, String password) {
HttpClient httpClient = new HttpClient();
PostMethod post = new PostMethod(AUTH_ENDPOINT);
- String response = null;
+ String response;
String ssoToken = null;
NameValuePair[] data = { new NameValuePair("username", username),
@@ -186,7 +186,7 @@ public class SSOProxy implements SSOMetKeys {
while ((line = br.readLine()) != null) {
if (line.equals(IDENTITY_DETAILS_ATTR_SKIP_LINE))
continue;
- String key = null, val = null;
+ String key, val;
if (line.startsWith(IDENTITY_DETAILS_REALM)) {
// can't parse it the same way
key = line.substring(0, IDENTITY_DETAILS_REALM.length());
@@ -222,7 +222,6 @@ public class SSOProxy implements SSOMetKeys {
} catch (Exception ignore) {
}
- is = null;
}
if (br != null) {
@@ -231,7 +230,6 @@ public class SSOProxy implements SSOMetKeys {
} catch (Exception ignore) {
}
- br = null;
}
}
@@ -247,7 +245,7 @@ public class SSOProxy implements SSOMetKeys {
try {
while ((line = br.readLine()) != null) {
- String key = null, val = null;
+ String key, val;
if (line.startsWith(USER_DETAILS_ROLE)) {
// can't parse by splitting, parse by using substring
key = line.substring(0, USER_DETAILS_ROLE.length());
@@ -279,7 +277,6 @@ public class SSOProxy implements SSOMetKeys {
} catch (Exception ignore) {
}
- is = null;
}
if (br != null) {
@@ -288,7 +285,6 @@ public class SSOProxy implements SSOMetKeys {
} catch (Exception ignore) {
}
- br = null;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/browser/types/TypeBrowser.java
----------------------------------------------------------------------
diff --git a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/browser/types/TypeBrowser.java b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/browser/types/TypeBrowser.java
index 3e902eb..0c33641 100644
--- a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/browser/types/TypeBrowser.java
+++ b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/browser/types/TypeBrowser.java
@@ -250,7 +250,7 @@ public class TypeBrowser extends Panel {
this.pageNum = this.productPage.getPageNum();
// get the last page
- ProductPage lastPage = null;
+ ProductPage lastPage;
Query query = new Query();
query.getCriteria().addAll(this.criteria);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/VisibilityAndSortToggler.java
----------------------------------------------------------------------
diff --git a/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/VisibilityAndSortToggler.java b/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/VisibilityAndSortToggler.java
index 14e8910..0845375 100644
--- a/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/VisibilityAndSortToggler.java
+++ b/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/VisibilityAndSortToggler.java
@@ -53,7 +53,7 @@ class VisibilityAndSortToggler extends VisibilityToggler {
final ListModel model) {
super(id, showLinkId, hideLinkId, moreId, model);
- Link<Link> sortLink = null;
+ Link<Link> sortLink;
Link<Link> unsortLink = null;
sortLink = new Link<Link>(sortLinkId, new Model<Link>(unsortLink)) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 8a53976..62993cd 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
@@ -47,7 +47,7 @@ public class VisibilityToggler extends WebMarkupContainer {
String moreId, final ListModel model) {
super(id, model);
- Link<Link> showLink = null;
+ Link<Link> showLink;
Link<Link> hideLink = null;
final Vector allStatusList = (Vector) ((Vector) model.getObject()).clone();
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java
index 7de8e20..df13867 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java
@@ -157,7 +157,6 @@ public class CASProductHandler implements LargeProductQueryHandler {
} catch (Exception ignore) {
}
- in = null;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataDeliveryServlet.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataDeliveryServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataDeliveryServlet.java
index d82f7ee..be68235 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataDeliveryServlet.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataDeliveryServlet.java
@@ -59,7 +59,7 @@ public class DataDeliveryServlet extends HttpServlet implements
public void init(ServletConfig config) throws ServletException {
super.init(config);
try {
- String fileMgrURL = null;
+ String fileMgrURL;
try {
fileMgrURL = PathUtils.replaceEnvVariables(config.getServletContext().getInitParameter(
"filemgr.url") );
@@ -157,8 +157,8 @@ public class DataDeliveryServlet extends HttpServlet implements
// we'll be delivering a zip
res.addHeader(CONTENT_TYPE_HDR, FORMAT_ZIP);
- String productZipFilePath = null;
- File productZipFile = null;
+ String productZipFilePath;
+ File productZipFile;
InputStream in = null;
OutputStream o2 = null;
@@ -202,7 +202,6 @@ public class DataDeliveryServlet extends HttpServlet implements
} catch (Exception ignore) {
}
- in = null;
}
if (o2 != null) {
@@ -211,10 +210,8 @@ public class DataDeliveryServlet extends HttpServlet implements
} catch (Exception ignore) {
}
- o2 = null;
}
- productZipFile = null;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DatasetDeliveryServlet.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DatasetDeliveryServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DatasetDeliveryServlet.java
index 20148dc..3f0ee6f 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DatasetDeliveryServlet.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DatasetDeliveryServlet.java
@@ -127,7 +127,7 @@ public class DatasetDeliveryServlet extends HttpServlet implements
// for each product, zip it up
// after you zip up all products then create the dataset zip
- ProductPage page = null;
+ ProductPage page;
try {
page = client.getFirstPage(type);
@@ -144,7 +144,7 @@ public class DatasetDeliveryServlet extends HttpServlet implements
continue;
}
- Metadata metadata = null;
+ Metadata metadata;
product.setProductReferences(client.getProductReferences(product));
metadata = client.getMetadata(product);
DataUtils.createProductZipFile(product, metadata, productDirPath);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 1db11dd..8244333 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
@@ -193,7 +193,7 @@ public class RdfConfiguration
? keyNsMap.get(key) : defaultKeyNs;
// Create the element.
- Element element = null;
+ Element element;
if (resLinkMap.containsKey(key))
{
element = document.createElement(namespace + ":" + tagName);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/servlets/CasProductJaxrsServlet.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/servlets/CasProductJaxrsServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/servlets/CasProductJaxrsServlet.java
index ee88739..9dc4c28 100755
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/servlets/CasProductJaxrsServlet.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/servlets/CasProductJaxrsServlet.java
@@ -81,7 +81,7 @@ public class CasProductJaxrsServlet extends CXFNonSpringJaxrsServlet
{
try
{
- URL url = null;
+ URL url;
String urlParameter = context.getInitParameter("filemgr.url");
if (urlParameter != null)
{
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/writers/RdfWriter.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/writers/RdfWriter.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/writers/RdfWriter.java
index ad8b986..1db3ba7 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/writers/RdfWriter.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/writers/RdfWriter.java
@@ -59,7 +59,7 @@ public class RdfWriter
public String getBaseUri()
{
String baseUri = uriInfo.getBaseUri().toString();
- return baseUri += baseUri.endsWith("/") ? "" : "/";
+ return baseUri.endsWith("/") ? "" : "/";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/writers/RssWriter.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/writers/RssWriter.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/writers/RssWriter.java
index da449c4..70331fb 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/writers/RssWriter.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/writers/RssWriter.java
@@ -57,7 +57,7 @@ public abstract class RssWriter
public String getBaseUri()
{
String baseUri = uriInfo.getBaseUri().toString();
- return baseUri += baseUri.endsWith("/") ? "" : "/";
+ return baseUri.endsWith("/") ? "" : "/";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 5d69e85..7c237c1 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
@@ -100,7 +100,7 @@ public class RDFDatasetServlet extends HttpServlet {
throw new ServletException(e.getMessage());
}
- String fileManagerUrl = null;
+ String fileManagerUrl;
try {
fileManagerUrl = PathUtils.replaceEnvVariables(config.getServletContext().getInitParameter(
"filemgr.url") );
@@ -146,7 +146,7 @@ public class RDFDatasetServlet extends HttpServlet {
String productTypeName = req.getParameter("type");
String productTypeId = req.getParameter("typeID");
ProductTypeFilter filter = new ProductTypeFilter(req.getParameter("filter"));
- ProductType type = null;
+ ProductType type;
List<ProductType> productTypes = new Vector<ProductType>();
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 1b3a53c..71e3307 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
@@ -105,7 +105,7 @@ public class RDFProductServlet extends HttpServlet {
throw new ServletException(e.getMessage());
}
- String fileManagerUrl = null;
+ String fileManagerUrl;
try {
fileManagerUrl = PathUtils.replaceEnvVariables(config.getServletContext().getInitParameter(
"filemgr.url") );
@@ -151,7 +151,7 @@ public class RDFProductServlet extends HttpServlet {
String productTypeId = req.getParameter("id");
ProductType type = null;
- List<Product> products = null;
+ List<Product> products;
try {
if (productTypeName.equals("ALL")) {
@@ -207,7 +207,7 @@ public class RDFProductServlet extends HttpServlet {
for (Product p : products) {
String productTypeIdStr = p.getProductType().getProductTypeId();
- ProductType productType = null;
+ ProductType productType;
if (type != null) {
productType = type;
@@ -287,7 +287,7 @@ public class RDFProductServlet extends HttpServlet {
if (types != null && types.size() > 0) {
products = new Vector<Product>();
for (ProductType type : types) {
- ProductPage page = null;
+ ProductPage page;
try {
page = fClient.getFirstPage(type);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFUtils.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFUtils.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFUtils.java
index 6598724..a8933ba 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFUtils.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFUtils.java
@@ -52,7 +52,7 @@ public final class RDFUtils {
// does this tag have a namespace? if not, use the default
String ns = conf.getKeyNs(key);
- Element elem = null;
+ Element elem;
// is this a resource link?
if (conf.getResLinkMap().containsKey(key)) {
elem = doc.createElement(ns + ":" + tagName);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 065d619..5237f6b 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
@@ -155,7 +155,7 @@ public class RSSProductServlet extends HttpServlet {
channelMet.addMetadata("TopN", String.valueOf(topN));
channelMet.addMetadata("BaseUrl", base);
- List products = null;
+ List products;
try {
if (productTypeName.equals("ALL")) {
@@ -184,7 +184,7 @@ public class RSSProductServlet extends HttpServlet {
}
if (products != null && products.size() > 0) {
- String channelDesc = null;
+ String channelDesc;
if (!productTypeName.equals("ALL")) {
channelDesc = type.getDescription();
@@ -227,7 +227,7 @@ public class RSSProductServlet extends HttpServlet {
Product p = (Product) product;
String productTypeIdStr = p.getProductType().getProductTypeId();
- ProductType productType = null;
+ ProductType productType;
try {
productType = fm.getProductTypeById(productTypeIdStr);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java
index a516226..0cb1a5b 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java
@@ -104,7 +104,7 @@ public class RSSProductTransferServlet extends HttpServlet {
public void init(ServletConfig config) throws ServletException {
super.init(config);
- String fileManagerUrl = null;
+ String fileManagerUrl;
try {
fileManagerUrl = PathUtils.replaceEnvVariables(config.getServletContext().getInitParameter(
"filemgr.url") );
@@ -154,7 +154,7 @@ public class RSSProductTransferServlet extends HttpServlet {
public void doIt(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, java.io.IOException {
- List currentTransfers = null;
+ List currentTransfers;
try {
currentTransfers = fClient.getCurrentFileTransfers();
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/webapp/fmprod/src/test/java/org/apache/oodt/cas/product/data/TestDataUtils.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/test/java/org/apache/oodt/cas/product/data/TestDataUtils.java b/webapp/fmprod/src/test/java/org/apache/oodt/cas/product/data/TestDataUtils.java
index 0ae42d3..28f7f84 100644
--- a/webapp/fmprod/src/test/java/org/apache/oodt/cas/product/data/TestDataUtils.java
+++ b/webapp/fmprod/src/test/java/org/apache/oodt/cas/product/data/TestDataUtils.java
@@ -62,7 +62,7 @@ public class TestDataUtils extends TestCase {
Metadata metadata = new Metadata();
- String workingDirPath = null;
+ String workingDirPath;
workingDir = Files.createTempDir();
workingDirPath = workingDir.getAbsolutePath();
workingDir.deleteOnExit();
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetFirstPageCliAction.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetFirstPageCliAction.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetFirstPageCliAction.java
index 3abfb1f..6641526 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetFirstPageCliAction.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetFirstPageCliAction.java
@@ -40,7 +40,7 @@ public class GetFirstPageCliAction extends WorkflowCliAction {
throws CmdLineActionException {
try {
XmlRpcWorkflowManagerClient client = getClient();
- WorkflowInstancePage page = null;
+ WorkflowInstancePage page;
if (status != null && !status.equals("")) {
page = client.paginateWorkflowInstances(1, status);
} else {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetLastPageCliAction.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetLastPageCliAction.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetLastPageCliAction.java
index 252364b..389416e 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetLastPageCliAction.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetLastPageCliAction.java
@@ -40,7 +40,7 @@ public class GetLastPageCliAction extends WorkflowCliAction {
throws CmdLineActionException {
try {
XmlRpcWorkflowManagerClient client = getClient();
- WorkflowInstancePage page = null;
+ WorkflowInstancePage page;
if (status != null && !status.equals("")) {
WorkflowInstancePage firstPage = client.paginateWorkflowInstances(
1, status);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetNextPageCliAction.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetNextPageCliAction.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetNextPageCliAction.java
index 09fc551..9c83eae 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetNextPageCliAction.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetNextPageCliAction.java
@@ -46,7 +46,7 @@ public class GetNextPageCliAction extends WorkflowCliAction {
try {
XmlRpcWorkflowManagerClient client = getClient();
- WorkflowInstancePage page = null;
+ WorkflowInstancePage page;
if (status != null && !status.equals("")) {
page = client.paginateWorkflowInstances(pageNum + 1, status);
} else {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetPrevPageCliAction.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetPrevPageCliAction.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetPrevPageCliAction.java
index cbc0dd9..ab62165 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetPrevPageCliAction.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetPrevPageCliAction.java
@@ -46,7 +46,7 @@ public class GetPrevPageCliAction extends WorkflowCliAction {
try {
XmlRpcWorkflowManagerClient client = getClient();
- WorkflowInstancePage page = null;
+ WorkflowInstancePage page;
if (status != null && !status.equals("")) {
page = client.paginateWorkflowInstances(pageNum - 1, status);
} else {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/IterativeWorkflowProcessorThread.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/IterativeWorkflowProcessorThread.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/IterativeWorkflowProcessorThread.java
index 3776e01..2a8020f 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/IterativeWorkflowProcessorThread.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/IterativeWorkflowProcessorThread.java
@@ -501,7 +501,7 @@ public class IterativeWorkflowProcessorThread implements WorkflowStatus,
private boolean satisfied(List conditionList, String taskId) {
for (Object aConditionList : conditionList) {
WorkflowCondition c = (WorkflowCondition) aConditionList;
- WorkflowConditionInstance cInst = null;
+ WorkflowConditionInstance cInst;
// see if we've already cached this condition instance
if (CONDITION_CACHE.get(taskId) != null) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 78ef705..6b512f0 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
@@ -105,7 +105,7 @@ public class ThreadPoolWorkflowEngine implements WorkflowEngine, WorkflowStatus
long threadKeepAliveTime, boolean unlimitedQueue, URL resUrl) {
this.instRep = instRep;
- Channel c = null;
+ Channel c;
if (unlimitedQueue) {
c = new LinkedQueue();
} else {
@@ -363,7 +363,7 @@ public class ThreadPoolWorkflowEngine implements WorkflowEngine, WorkflowStatus
.getEndDateTimeIsoStr().equals("null")) ? safeDateConvert(inst
.getEndDateTimeIsoStr()) : new Date();
- Date workflowStartDateTime = null;
+ Date workflowStartDateTime;
if (inst.getStartDateTimeIsoStr() == null
|| (inst.getStartDateTimeIsoStr() != null && (inst
@@ -396,7 +396,7 @@ public class ThreadPoolWorkflowEngine implements WorkflowEngine, WorkflowStatus
.getCurrentTaskEndDateTimeIsoStr().equals("null")) ? safeDateConvert(inst
.getCurrentTaskEndDateTimeIsoStr()) : new Date();
- Date workflowTaskStartDateTime = null;
+ Date workflowTaskStartDateTime;
if (inst.getCurrentTaskStartDateTimeIsoStr() == null
|| (inst.getCurrentTaskStartDateTimeIsoStr() != null && (inst
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java
index 4cd8121..2b36b6b 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java
@@ -72,7 +72,7 @@ public class WorkflowProcessorQueue {
* @return the list of available, Queued, {@link WorkflowProcessor}s.
*/
public synchronized List<WorkflowProcessor> getProcessors() {
- WorkflowInstancePage page = null;
+ WorkflowInstancePage page;
try {
page = repo.getPagedWorkflows(1);
} catch (Exception e) {
@@ -87,7 +87,7 @@ public class WorkflowProcessorQueue {
for (WorkflowInstance inst : (List<WorkflowInstance>) (List<?>) page
.getPageWorkflows()) {
if (!inst.getState().getCategory().getName().equals("done")) {
- WorkflowProcessor processor = null;
+ WorkflowProcessor processor;
try {
processor = fromWorkflowInstance(inst);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java
index 595c43a..77d82ee 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java
@@ -18,6 +18,14 @@
package org.apache.oodt.cas.workflow.engine.runner;
//JDK imports
+import org.apache.oodt.cas.workflow.engine.processor.TaskProcessor;
+import org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
+import org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycle;
+import org.apache.oodt.cas.workflow.lifecycle.WorkflowState;
+import org.apache.oodt.cas.workflow.structs.WorkflowTask;
+import org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance;
+import org.apache.oodt.cas.workflow.util.GenericWorkflowObjectFactory;
+
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
@@ -27,13 +35,6 @@ import java.util.logging.Level;
import java.util.logging.Logger;
//OODT imports
-import org.apache.oodt.cas.workflow.engine.processor.TaskProcessor;
-import org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
-import org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycle;
-import org.apache.oodt.cas.workflow.lifecycle.WorkflowState;
-import org.apache.oodt.cas.workflow.structs.WorkflowTask;
-import org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance;
-import org.apache.oodt.cas.workflow.util.GenericWorkflowObjectFactory;
/**
* Runs a local version of a {@link TaskProcessor} asynchronously.
@@ -130,12 +131,11 @@ public class AsynchronousLocalEngineRunner extends AbstractEngineRunnerBase {
*/
@Override
public void shutdown() {
- for (Thread worker : this.workerMap.values()) {
+ for (Thread worker : this.workerMap.values())
if (worker != null) {
worker.interrupt();
worker = null;
}
- }
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/BranchRedirector.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/BranchRedirector.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/BranchRedirector.java
index 42aa7a7..8af329f 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/BranchRedirector.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/BranchRedirector.java
@@ -54,7 +54,7 @@ public class BranchRedirector implements WorkflowTaskInstance {
@Override
public void run(Metadata metadata, WorkflowTaskConfiguration config)
throws WorkflowTaskInstanceException {
- XmlRpcWorkflowManagerClient wm = null;
+ XmlRpcWorkflowManagerClient wm;
try {
wm = new XmlRpcWorkflowManagerClient(new URL(
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepository.java
index 06ac404..d8b62db 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepository.java
@@ -748,7 +748,7 @@ public class DataSourceWorkflowInstanceRepository extends
// must call next first, or else no relative cursor
if (rs.next()) {
// grab the first one
- int numGrabbed = -1;
+ int numGrabbed;
if(pageNum == 1){
numGrabbed = 1;
wInstIds.add(rs.getString("workflow_instance_id"));
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 e428bc6..f814922 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
@@ -61,7 +61,7 @@ public class DataSourceWorkflowInstanceRepositoryFactory implements
* </p>
*/
public DataSourceWorkflowInstanceRepositoryFactory() throws Exception {
- String jdbcUrl = null, user = null, pass = null, driver = null;
+ String jdbcUrl, user, pass, driver;
jdbcUrl = PathUtils
.replaceEnvVariables(System
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java
index 2d5f377..d42c5e3 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java
@@ -118,7 +118,6 @@ public class LuceneWorkflowInstanceRepository extends
searcher.close();
} catch (Exception ignore) {
}
- searcher = null;
}
}
@@ -156,7 +155,6 @@ public class LuceneWorkflowInstanceRepository extends
searcher.close();
} catch (Exception ignore) {
}
- searcher = null;
}
}
@@ -238,7 +236,6 @@ public class LuceneWorkflowInstanceRepository extends
searcher.close();
} catch (Exception ignore) {
}
- searcher = null;
}
}
@@ -283,7 +280,6 @@ public class LuceneWorkflowInstanceRepository extends
searcher.close();
} catch (Exception ignore) {
}
- searcher = null;
}
}
@@ -329,7 +325,6 @@ public class LuceneWorkflowInstanceRepository extends
searcher.close();
} catch (Exception ignore) {
}
- searcher = null;
}
}
@@ -400,7 +395,6 @@ public class LuceneWorkflowInstanceRepository extends
searcher.close();
} catch (Exception ignore) {
}
- searcher = null;
}
}
@@ -432,7 +426,6 @@ public class LuceneWorkflowInstanceRepository extends
} catch (Exception ignore) {
}
- reader = null;
}
}
@@ -444,7 +437,7 @@ public class LuceneWorkflowInstanceRepository extends
File indexDir = new File(idxFilePath);
- boolean createIndex = false;
+ boolean createIndex;
createIndex = !(indexDir.exists() && indexDir.isDirectory());
@@ -466,7 +459,6 @@ public class LuceneWorkflowInstanceRepository extends
writer.close();
} catch (Exception ignore) {
}
- writer = null;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetadataReader.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetadataReader.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetadataReader.java
index 9b71b7b..8f1efe5 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetadataReader.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetadataReader.java
@@ -106,12 +106,12 @@ public final class WorkflowInstanceMetadataReader implements
private static Document getDocumentRoot(String xmlFile) {
// open up the XML file
- DocumentBuilderFactory factory = null;
- DocumentBuilder parser = null;
- Document document = null;
- InputSource inputSource = null;
+ DocumentBuilderFactory factory;
+ DocumentBuilder parser;
+ Document document;
+ InputSource inputSource;
- InputStream xmlInputStream = null;
+ InputStream xmlInputStream;
try {
xmlInputStream = new File(xmlFile).toURL().openStream();
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 8c6e4ae..e2c6a07 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
@@ -211,7 +211,7 @@ public class WorkflowLifecycleManager {
public int getLastCompletedStageNum(WorkflowInstance inst) {
int currStageNum = getStageNum(inst);
if(inst.getState().getCategory() == null){
- WorkflowLifecycleStage category = null;
+ WorkflowLifecycleStage category;
if((category = getStage(inst)) != null){
inst.getState().setCategory(category);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecyclesReader.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecyclesReader.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecyclesReader.java
index e9e34df..22fc39a 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecyclesReader.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecyclesReader.java
@@ -155,12 +155,12 @@ public final class WorkflowLifecyclesReader implements WorkflowLifecycleMetKeys
private static Document getDocumentRoot(String xmlFile) {
// open up the XML file
- DocumentBuilderFactory factory = null;
- DocumentBuilder parser = null;
- Document document = null;
- InputSource inputSource = null;
+ DocumentBuilderFactory factory;
+ DocumentBuilder parser;
+ Document document;
+ InputSource inputSource;
- InputStream xmlInputStream = null;
+ InputStream xmlInputStream;
try {
xmlInputStream = new File(xmlFile).toURL().openStream();
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/DataSourceWorkflowRepositoryFactory.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/DataSourceWorkflowRepositoryFactory.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/DataSourceWorkflowRepositoryFactory.java
index 078a4ec..dea7dda 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/DataSourceWorkflowRepositoryFactory.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/DataSourceWorkflowRepositoryFactory.java
@@ -50,7 +50,7 @@ public class DataSourceWorkflowRepositoryFactory implements
* </p>.
*/
public DataSourceWorkflowRepositoryFactory() throws Exception {
- String jdbcUrl = null, user = null, pass = null, driver = null;
+ String jdbcUrl, user, pass, driver;
jdbcUrl = System
.getProperty("org.apache.oodt.cas.workflow.repo.datasource.jdbc.url");
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java
index a93bb73..ea6db55 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java
@@ -316,7 +316,7 @@ public class PackagedWorkflowRepository implements WorkflowRepository {
workflow.setId(workflowId);
}
- ParentChildWorkflow pcw = null;
+ ParentChildWorkflow pcw;
if(workflow instanceof ParentChildWorkflow) {
pcw = (ParentChildWorkflow) workflow;
}
@@ -369,7 +369,7 @@ public class PackagedWorkflowRepository implements WorkflowRepository {
this.globalConfGroups = new HashMap<String, Metadata>();
this.graphs = new Vector<Graph>();
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- DocumentBuilder parser = null;
+ DocumentBuilder parser;
try {
parser = factory.newDocumentBuilder();
@@ -597,7 +597,7 @@ public class PackagedWorkflowRepository implements WorkflowRepository {
}
this.workflows.put(graph.getModelId(), workflow);
} else if (graph.getExecutionType().equals("condition")) {
- WorkflowCondition cond = null;
+ WorkflowCondition cond;
if (graph.getModelIdRef() != null && !graph.getModelIdRef().equals("")) {
cond = this.conditions.get(graph.getModelIdRef());
@@ -639,7 +639,7 @@ public class PackagedWorkflowRepository implements WorkflowRepository {
// is null and it's a condition definition, just add it
} else if (graph.getExecutionType().equals("task")) {
- WorkflowTask task = null;
+ WorkflowTask task;
if (graph.getModelIdRef() != null && !graph.getModelIdRef().equals("")) {
LOG.log(Level.FINER, "Model ID-Ref to: [" + graph.getModelIdRef() + "]");
task = this.tasks.get(graph.getModelIdRef());
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
index 71d9a94..6456887 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
@@ -348,7 +348,7 @@ public class XMLWorkflowRepository implements WorkflowRepository {
*/
public static void main(String[] args) throws RepositoryException {
String usage = "XmlWorkflowRepository <uri 1>...<uri n>\n";
- List uris = null;
+ List uris;
if (args.length == 0) {
System.err.println(usage);
@@ -534,7 +534,6 @@ public class XMLWorkflowRepository implements WorkflowRepository {
String workflowDirStr = workflowDir.getAbsolutePath();
if (!workflowDirStr.endsWith("/")) {
- workflowDirStr += "/";
}
// get all the workflow xml files
@@ -614,7 +613,7 @@ public class XMLWorkflowRepository implements WorkflowRepository {
String eventName = eventElem
.getAttribute("name");
- Workflow w = null;
+ Workflow w;
NodeList workflowNodeList = eventElem
.getElementsByTagName("workflow");
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 7fa9be3..53fe62c 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
@@ -72,7 +72,7 @@ public class HighestFIFOPrioritySorter implements PrioritySorter {
}
private Double calculatePriority(WorkflowProcessor processorStub) {
- double aliveTime = 0.0;
+ double aliveTime;
try {
aliveTime = (double) (System.currentTimeMillis() - processorStub
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 f0c46bd..8fdd95a 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
@@ -141,7 +141,7 @@ public class XmlRpcWorkflowManager {
public Vector getRegisteredEvents() throws RepositoryException {
- List events = null;
+ List events;
Vector eventsVector = new Vector();
try {
@@ -253,7 +253,7 @@ public class XmlRpcWorkflowManager {
public Vector getWorkflowsByEvent(String eventName)
throws RepositoryException {
- List workflows = null;
+ List workflows;
Vector workflowList = new Vector();
try {
@@ -282,7 +282,7 @@ public class XmlRpcWorkflowManager {
throws RepositoryException, EngineException {
LOG.log(Level.INFO, "WorkflowManager: Received event: " + eventName);
- List workflows = null;
+ List workflows;
try {
workflows = repo.getWorkflowsForEvent(eventName);
@@ -318,7 +318,7 @@ public class XmlRpcWorkflowManager {
}
public Hashtable getWorkflowInstanceById(String wInstId) {
- WorkflowInstance inst = null;
+ WorkflowInstance inst;
try {
inst = engine.getInstanceRepository().getWorkflowInstanceById(
@@ -369,7 +369,7 @@ public class XmlRpcWorkflowManager {
public Vector getWorkflowInstancesByStatus(String status)
throws EngineException {
- List workflowInsts = null;
+ List workflowInsts;
Vector workflowInstances = new Vector();
@@ -421,7 +421,7 @@ public class XmlRpcWorkflowManager {
}
public Vector getWorkflowInstances() throws EngineException {
- List workflowInsts = null;
+ List workflowInsts;
Vector workflowInstances = new Vector();
@@ -556,7 +556,7 @@ public class XmlRpcWorkflowManager {
public synchronized boolean setWorkflowInstanceCurrentTaskStartDateTime(
String wInstId, String startDateTimeIsoStr) {
- WorkflowInstance wInst = null;
+ WorkflowInstance wInst;
try {
wInst = this.engine.getInstanceRepository()
.getWorkflowInstanceById(wInstId);
@@ -570,7 +570,7 @@ public class XmlRpcWorkflowManager {
public synchronized boolean setWorkflowInstanceCurrentTaskEndDateTime(
String wInstId, String endDateTimeIsoStr) {
- WorkflowInstance wInst = null;
+ WorkflowInstance wInst;
try {
wInst = this.engine.getInstanceRepository()
.getWorkflowInstanceById(wInstId);
@@ -584,7 +584,7 @@ public class XmlRpcWorkflowManager {
public synchronized boolean updateWorkflowInstanceStatus(
String workflowInstanceId, String status) throws Exception {
- WorkflowInstance wInst = null;
+ WorkflowInstance wInst;
try {
wInst = engine.getInstanceRepository().getWorkflowInstanceById(
workflowInstanceId);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 a7b1e40..1d54673 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
@@ -94,7 +94,7 @@ public class XmlRpcWorkflowManagerClient {
Vector argList = new Vector();
Vector<String> taskIdVector = new Vector<String>();
taskIdVector.addAll(taskIds);
- String instId = null;
+ String instId;
argList.add(taskIdVector);
argList.add(metadata.getHashtable());
@@ -129,7 +129,7 @@ public class XmlRpcWorkflowManagerClient {
public WorkflowInstancePage getFirstPage() throws Exception {
Vector argList = new Vector();
- Hashtable pageHash = null;
+ Hashtable pageHash;
try {
pageHash = (Hashtable) client.execute("workflowmgr.getFirstPage",
@@ -149,7 +149,7 @@ public class XmlRpcWorkflowManagerClient {
Vector argList = new Vector();
argList.add(XmlRpcStructFactory
.getXmlRpcWorkflowInstancePage(currentPage));
- Hashtable pageHash = null;
+ Hashtable pageHash;
try {
pageHash = (Hashtable) client.execute("workflowmgr.getNextPage",
@@ -169,7 +169,7 @@ public class XmlRpcWorkflowManagerClient {
Vector argList = new Vector();
argList.add(XmlRpcStructFactory
.getXmlRpcWorkflowInstancePage(currentPage));
- Hashtable pageHash = null;
+ Hashtable pageHash;
try {
pageHash = (Hashtable) client.execute("workflowmgr.getPrevPage",
@@ -186,7 +186,7 @@ public class XmlRpcWorkflowManagerClient {
public WorkflowInstancePage getLastPage() throws Exception {
Vector argList = new Vector();
- Hashtable pageHash = null;
+ Hashtable pageHash;
try {
pageHash = (Hashtable) client.execute("workflowmgr.getLastPage",
@@ -206,7 +206,7 @@ public class XmlRpcWorkflowManagerClient {
Vector argList = new Vector();
argList.add(pageNum);
argList.add(status);
- Hashtable pageHash = null;
+ Hashtable pageHash;
try {
pageHash = (Hashtable) client.execute(
@@ -225,7 +225,7 @@ public class XmlRpcWorkflowManagerClient {
throws Exception {
Vector argList = new Vector();
argList.add(pageNum);
- Hashtable pageHash = null;
+ Hashtable pageHash;
try {
pageHash = (Hashtable) client.execute(
@@ -242,7 +242,7 @@ public class XmlRpcWorkflowManagerClient {
public List getWorkflowsByEvent(String eventName) throws Exception {
List workflows = new Vector();
- Vector workflowVector = new Vector();
+ Vector workflowVector;
Vector argList = new Vector();
argList.add(eventName);
@@ -271,7 +271,7 @@ public class XmlRpcWorkflowManagerClient {
public Metadata getWorkflowInstanceMetadata(String wInstId) throws Exception {
Vector argList = new Vector();
argList.add(wInstId);
- Metadata met = null;
+ Metadata met;
try {
Hashtable instMetHash = (Hashtable) client.execute(
@@ -550,8 +550,8 @@ public class XmlRpcWorkflowManagerClient {
public Vector getWorkflows() throws Exception {
Vector argList = new Vector();
- Vector works = null;
- Vector workflows = null;
+ Vector works;
+ Vector workflows;
try {
works = (Vector) client
@@ -583,7 +583,7 @@ public class XmlRpcWorkflowManagerClient {
public int getNumWorkflowInstancesByStatus(String status) throws Exception{
Vector argList = new Vector();
argList.add(status);
- int numInsts = -1;
+ int numInsts;
try {
numInsts = (Integer) client.execute(
@@ -601,7 +601,7 @@ public class XmlRpcWorkflowManagerClient {
public int getNumWorkflowInstances() throws Exception{
Vector argList = new Vector();
- int numInsts = -1;
+ int numInsts;
try {
numInsts = (Integer) client.execute(
@@ -620,8 +620,8 @@ public class XmlRpcWorkflowManagerClient {
public Vector getWorkflowInstancesByStatus(String status) throws Exception {
Vector argList = new Vector();
argList.add(status);
- Vector insts = null;
- Vector instsUnpacked = null;
+ Vector insts;
+ Vector instsUnpacked;
try {
insts = (Vector) client.execute(
@@ -649,8 +649,8 @@ public class XmlRpcWorkflowManagerClient {
public Vector getWorkflowInstances() throws Exception {
Vector argList = new Vector();
- Vector insts = null;
- Vector instsUnpacked = null;
+ Vector insts;
+ Vector instsUnpacked;
try {
insts = (Vector) client.execute("workflowmgr.getWorkflowInstances",
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/tools/InstanceRepoCleaner.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/tools/InstanceRepoCleaner.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/tools/InstanceRepoCleaner.java
index 03779ec..be77073 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/tools/InstanceRepoCleaner.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/tools/InstanceRepoCleaner.java
@@ -77,7 +77,7 @@ public class InstanceRepoCleaner {
System.exit(1);
}
- InstanceRepoCleaner clean = null;
+ InstanceRepoCleaner clean;
if (args.length == 1) {
String wmUrlStr = args[0];
clean = new InstanceRepoCleaner(wmUrlStr);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/util/CygwinScriptFile.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/CygwinScriptFile.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/CygwinScriptFile.java
index 78df722..038a12a 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/CygwinScriptFile.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/CygwinScriptFile.java
@@ -69,7 +69,6 @@ public class CygwinScriptFile extends ScriptFile {
} finally {
try {
pw.close();
- pw = null;
} catch (Exception ignore) {
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java
index bcc61f7..c86cd40 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java
@@ -120,8 +120,8 @@ public final class GenericWorkflowObjectFactory {
public static WorkflowInstanceRepository getWorkflowInstanceRepositoryFromClassName(
String serviceFactory) {
- WorkflowInstanceRepositoryFactory factory = null;
- Class clazz = null;
+ WorkflowInstanceRepositoryFactory factory;
+ Class clazz;
try {
clazz = Class.forName(serviceFactory);
@@ -163,7 +163,7 @@ public final class GenericWorkflowObjectFactory {
public static WorkflowTaskInstance getTaskObjectFromClassName(String className) {
if (className != null) {
- WorkflowTaskInstance taskInstance = null;
+ WorkflowTaskInstance taskInstance;
try {
Class workflowTaskClass = Class.forName(className);
@@ -209,7 +209,7 @@ public final class GenericWorkflowObjectFactory {
public static WorkflowTaskInstance getTaskObjectFromInnerClassName(Class<?> enclosingInstance, String className) {
if (className != null) {
- WorkflowTaskInstance taskInstance = null;
+ WorkflowTaskInstance taskInstance;
try {
Class workflowTaskClass = Class.forName(className);
@@ -269,7 +269,7 @@ public final class GenericWorkflowObjectFactory {
public static WorkflowConditionInstance getConditionObjectFromClassName(
String className) {
if (className != null) {
- WorkflowConditionInstance conditionInstance = null;
+ WorkflowConditionInstance conditionInstance;
try {
Class workflowConditionClass = Class.forName(className);
@@ -312,7 +312,7 @@ public final class GenericWorkflowObjectFactory {
*/
public static Workflow getWorkflowObjectFromClassName(String className){
if (className != null) {
- Workflow workflow = null;
+ Workflow workflow;
try {
Class workflowClass = Class.forName(className);
@@ -393,7 +393,7 @@ public final class GenericWorkflowObjectFactory {
* @return A copy of the specified Workflow.
*/
public static Workflow copyWorkflow(Workflow w){
- Workflow newWorkflow = null;
+ Workflow newWorkflow;
newWorkflow = getWorkflowObjectFromClassName(w.getClass().getName());
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/util/ScriptFile.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/ScriptFile.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/ScriptFile.java
index 1361f20..5b9f047 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/ScriptFile.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/ScriptFile.java
@@ -118,7 +118,6 @@ public class ScriptFile {
} finally {
try {
pw.close();
- pw = null;
} catch (Exception ignore) {
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/QuerierAndRunnerUtils.java
----------------------------------------------------------------------
diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/QuerierAndRunnerUtils.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/QuerierAndRunnerUtils.java
index b936617..e9de482 100644
--- a/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/QuerierAndRunnerUtils.java
+++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/QuerierAndRunnerUtils.java
@@ -96,7 +96,7 @@ public class QuerierAndRunnerUtils {
}
private File getTmpPath() throws IOException{
- File testDir = null;
+ File testDir;
String parentPath = File.createTempFile("test", "txt").getParentFile().getAbsolutePath();
parentPath = parentPath.endsWith("/") ? parentPath:parentPath + "/";
String testJobDirPath = parentPath + "jobs";
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/SimpleTester.java
----------------------------------------------------------------------
diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/SimpleTester.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/SimpleTester.java
index 5d2c378..627f9db 100644
--- a/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/SimpleTester.java
+++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/SimpleTester.java
@@ -76,7 +76,6 @@ public class SimpleTester implements WorkflowTaskInstance {
pw.close();
} catch (Exception ignore) {
}
- pw = null;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestAsynchronousLocalEngineRunner.java
----------------------------------------------------------------------
diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestAsynchronousLocalEngineRunner.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestAsynchronousLocalEngineRunner.java
index 4e5ef23..cd32455 100644
--- a/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestAsynchronousLocalEngineRunner.java
+++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestAsynchronousLocalEngineRunner.java
@@ -115,7 +115,6 @@ public class TestAsynchronousLocalEngineRunner extends TestCase {
} catch (Exception ignore) {
}
- br = null;
}
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestTaskQuerier.java
----------------------------------------------------------------------
diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestTaskQuerier.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestTaskQuerier.java
index fe5bc9f..eb6b8a2 100644
--- a/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestTaskQuerier.java
+++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestTaskQuerier.java
@@ -48,14 +48,14 @@ public class TestTaskQuerier extends TestCase {
public void testGetNext(){
FILOPrioritySorter prioritizer = new FILOPrioritySorter();
MockProcessorQueue processorQueue = new MockProcessorQueue();
- List<WorkflowProcessor> queued = null;
+ List<WorkflowProcessor> queued;
assertNotNull(queued = processorQueue.getProcessors());
assertEquals(3, queued.size());
processorQueue = new MockProcessorQueue();
TaskQuerier querier = new TaskQuerier(processorQueue, prioritizer, null, WAIT_SECS);
Thread querierThread = new Thread(querier);
querierThread.start();
- List<WorkflowProcessor> runnables = null;
+ List<WorkflowProcessor> runnables;
while ((runnables = querier.getRunnableProcessors()) != null &&
runnables.size() < 2) {
assertNotNull(runnables);
@@ -72,14 +72,14 @@ public class TestTaskQuerier extends TestCase {
public void testGetRunnableProcessors() {
FILOPrioritySorter prioritizer = new FILOPrioritySorter();
MockProcessorQueue processorQueue = new MockProcessorQueue();
- List<WorkflowProcessor> queued = null;
+ List<WorkflowProcessor> queued;
assertNotNull(queued = processorQueue.getProcessors());
assertEquals(3, queued.size());
processorQueue = new MockProcessorQueue();
TaskQuerier querier = new TaskQuerier(processorQueue, prioritizer, null, WAIT_SECS);
Thread querierThread = new Thread(querier);
querierThread.start();
- List<WorkflowProcessor> runnables = null;
+ List<WorkflowProcessor> runnables;
while ((runnables = querier.getRunnableProcessors()) != null &&
runnables.size() < 2) {
assertNotNull(runnables);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/test/java/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java
index b5c6558..7056042 100644
--- a/workflow/src/test/java/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java
+++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java
@@ -112,7 +112,7 @@ public class TestLuceneWorkflowInstanceRepository extends TestCase implements
// get a temp directory
File tempDir = null;
- File tempFile = null;
+ File tempFile;
try {
tempFile = File.createTempFile("foo", "bar");
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/TestWorkflowDataSourceRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/TestWorkflowDataSourceRepository.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/TestWorkflowDataSourceRepository.java
index 163d1ab..368baee 100644
--- a/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/TestWorkflowDataSourceRepository.java
+++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/TestWorkflowDataSourceRepository.java
@@ -68,7 +68,7 @@ public class TestWorkflowDataSourceRepository extends TestCase {
// get a temp directory
File tempDir = null;
- File tempFile = null;
+ File tempFile;
try {
tempFile = File.createTempFile("foo", "bar");
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManagerClient.java
----------------------------------------------------------------------
diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManagerClient.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManagerClient.java
index 485d61a..0375d48 100644
--- a/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManagerClient.java
+++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManagerClient.java
@@ -128,7 +128,7 @@ public class TestXmlRpcWorkflowManagerClient extends TestCase {
assertNotNull(WInst);
// get Metadata for the workflow instance
- Metadata met = null;
+ Metadata met;
met = WInst.getSharedContext();
assertNotNull(met);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java
----------------------------------------------------------------------
diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java b/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java
index 39cbcc7..9c0ac12 100644
--- a/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java
+++ b/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java
@@ -103,7 +103,6 @@ public class DBMSExecutor {
} catch (Exception ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -112,7 +111,6 @@ public class DBMSExecutor {
} catch (Exception ignore) {
}
- conn = null;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java
----------------------------------------------------------------------
diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java b/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java
index a98c835..5b5e27a 100644
--- a/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java
+++ b/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java
@@ -55,7 +55,7 @@ public class HandlerQueryParser implements ParseConstants {
*/
public static Expression parse(Stack<QueryElement> queryStack, Mapping map) {
- QueryElement qe = null;
+ QueryElement qe;
if (!queryStack.empty()) {
qe = (QueryElement) queryStack.pop();
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/xmlps/src/main/java/org/apache/oodt/xmlps/util/GenericCDEObjectFactory.java
----------------------------------------------------------------------
diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/util/GenericCDEObjectFactory.java b/xmlps/src/main/java/org/apache/oodt/xmlps/util/GenericCDEObjectFactory.java
index bd32cac..f402b6a 100644
--- a/xmlps/src/main/java/org/apache/oodt/xmlps/util/GenericCDEObjectFactory.java
+++ b/xmlps/src/main/java/org/apache/oodt/xmlps/util/GenericCDEObjectFactory.java
@@ -41,7 +41,7 @@ public final class GenericCDEObjectFactory {
}
public static MappingFunc getMappingFuncFromClassName(String className) {
- MappingFunc func = null;
+ MappingFunc func;
Class funcClazz;
try {
funcClazz = Class.forName(className);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/xmlps/src/test/java/org/apache/oodt/xmlps/structs/TestCDEResultInputStream.java
----------------------------------------------------------------------
diff --git a/xmlps/src/test/java/org/apache/oodt/xmlps/structs/TestCDEResultInputStream.java b/xmlps/src/test/java/org/apache/oodt/xmlps/structs/TestCDEResultInputStream.java
index 49f040e..fd01cc5 100644
--- a/xmlps/src/test/java/org/apache/oodt/xmlps/structs/TestCDEResultInputStream.java
+++ b/xmlps/src/test/java/org/apache/oodt/xmlps/structs/TestCDEResultInputStream.java
@@ -98,9 +98,9 @@ public class TestCDEResultInputStream extends TestCase {
public void testReadCharArrayIntInt() {
byte[] buf = new byte[128];
- int n = 0;
- int length = 0;
- String expected = null;
+ int n;
+ int length;
+ String expected;
try {
expected = ID + FS + LAST;
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/xmlquery/src/main/java/org/apache/oodt/xmlquery/Header.java
----------------------------------------------------------------------
diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Header.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Header.java
index 8e7cf7f..abc666b 100755
--- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Header.java
+++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Header.java
@@ -18,11 +18,17 @@
package org.apache.oodt.xmlquery;
-import java.io.*;
-import java.util.*;
-
-import org.apache.oodt.commons.util.*;
-import org.w3c.dom.*;
+import org.apache.oodt.commons.util.Documentable;
+import org.apache.oodt.commons.util.XML;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
/** A single header.
*
@@ -170,7 +176,7 @@ public class Header implements Serializable, Cloneable, Documentable {
}
public Object clone() {
- Object rc = null;
+ Object rc;
try {
rc = super.clone();
} catch (CloneNotSupportedException cantHappen) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java
----------------------------------------------------------------------
diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java
index 8e4b90e..b5a2889 100755
--- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java
+++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java
@@ -335,7 +335,7 @@ public class Result implements Serializable, Cloneable, Documentable {
}
public Object clone() {
- Object rc = null;
+ Object rc;
try {
rc = super.clone();
} catch (CloneNotSupportedException cantHappen) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 514b13a..365d5fd 100755
--- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java
+++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java
@@ -561,10 +561,9 @@ public class XMLQuery implements java.io.Serializable, Cloneable {
*/
private boolean isTokenEqual (String s1) {
String ts;
- boolean rc = false;
+ boolean rc;
- ts = previous_token;
- if (previous_token.compareTo("") == 0) {
+ if (previous_token.compareTo("") == 0) {
ts = getNextTokenFromStream ();
if (ts.compareTo("") == 0) {
rc = false;
@@ -593,7 +592,7 @@ public class XMLQuery implements java.io.Serializable, Cloneable {
*/
private String getNextTokenFromStream () {
int c, c2;
- String rc = "";
+ String rc;
try {
switch (c=tokens.nextToken()) {
case StreamTokenizer.TT_EOF:
@@ -669,8 +668,8 @@ public class XMLQuery implements java.io.Serializable, Cloneable {
int p1, p2, s1l;
String s2;
- p1 = 0; p2 = 0;
- s1l = s1.length();
+ p1 = 0;
+ s1l = s1.length();
s2 = "";
p2 = s1.indexOf(c, p1);
while (p2 >= 0) {
[04/16] oodt git commit: fix static access
Posted by ma...@apache.org.
fix static access
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/82400c18
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/82400c18
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/82400c18
Branch: refs/heads/master
Commit: 82400c18f2915a9c617544464825d835e15fe6cb
Parents: f17f6a2
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Oct 25 15:42:46 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Oct 25 15:42:46 2015 +0000
----------------------------------------------------------------------
.../cas/curation/service/CurationService.java | 2 +-
.../cas/curation/service/MetadataResource.java | 2 +-
.../filemgr/catalog/TestDataSourceCatalog.java | 2 +-
.../preconditions/PreCondEvalUtils.java | 4 ++--
.../oodt/cas/product/rss/RSSProductServlet.java | 2 +-
.../repository/XMLWorkflowRepository.java | 22 ++++++++++----------
6 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/82400c18/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java
----------------------------------------------------------------------
diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java
index 784078b..dc84ce8 100644
--- a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java
+++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java
@@ -83,7 +83,7 @@ public class CurationService extends HttpServlet implements CuratorConfMetKeys {
@Override
public void init(ServletConfig conf) throws ServletException {
super.init(conf);
- this.config = CurationServiceConfig.getInstance(conf);
+ config = CurationServiceConfig.getInstance(conf);
}
/**
http://git-wip-us.apache.org/repos/asf/oodt/blob/82400c18/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 a99bab1..7889906 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
@@ -159,7 +159,7 @@ public class MetadataResource extends CurationService {
public String getMetExtractorConfigList(
@DefaultValue("") @QueryParam("current") String current,
@DefaultValue(FORMAT_HTML) @QueryParam("format") String format) {
- String[] configIds = this.getFilesInDirectory(this.config
+ String[] configIds = this.getFilesInDirectory(config
.getMetExtrConfUploadPath(), false);
if (FORMAT_HTML.equals(format)) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/82400c18/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java
index a108853..04c5516 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java
@@ -264,7 +264,7 @@ public class TestDataSourceCatalog extends TestCase {
Product testProd = getTestProduct();
Metadata met = getTestMetadata("test");
- for (int i = 0; i < this.catPageSize; i++) {
+ for (int i = 0; i < catPageSize; i++) {
try {
myCat.addProduct(testProd);
myCat.addMetadata(met, testProd);
http://git-wip-us.apache.org/repos/asf/oodt/blob/82400c18/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreCondEvalUtils.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreCondEvalUtils.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreCondEvalUtils.java
index 9d6ac12..fec6db5 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreCondEvalUtils.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreCondEvalUtils.java
@@ -47,7 +47,7 @@ public class PreCondEvalUtils implements PreConditionOperatorMetKeys {
private static ApplicationContext applicationContext;
public PreCondEvalUtils(ApplicationContext applicationContext) {
- this.applicationContext = applicationContext;
+ PreCondEvalUtils.applicationContext = applicationContext;
}
/**
@@ -64,7 +64,7 @@ public class PreCondEvalUtils implements PreConditionOperatorMetKeys {
*/
public boolean eval(List<String> preCondComparatorIds, File product) {
for (String preCondComparatorId : preCondComparatorIds) {
- if (!((PreConditionComparator<?>) this.applicationContext.getBean(
+ if (!((PreConditionComparator<?>) applicationContext.getBean(
preCondComparatorId, PreConditionComparator.class))
.passes(product)) {
LOG.log(Level.INFO, "Failed precondition comparator id "
http://git-wip-us.apache.org/repos/asf/oodt/blob/82400c18/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 410b1c9..34b5f11 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
@@ -317,7 +317,7 @@ public class RSSProductServlet extends HttpServlet {
private void getFileManager(String fileManagerUrl) {
try {
- this.fm = new XmlRpcFileManagerClient(new URL(fileManagerUrl));
+ fm = new XmlRpcFileManagerClient(new URL(fileManagerUrl));
} catch (MalformedURLException e) {
LOG.log(Level.SEVERE,
"Unable to initialize file manager url in RSS Servlet: [url="
http://git-wip-us.apache.org/repos/asf/oodt/blob/82400c18/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
index 8553ef2..7477b91 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
@@ -265,13 +265,13 @@ public class XMLWorkflowRepository implements WorkflowRepository {
// check its conditions
if(task.getPreConditions() != null && task.getPreConditions().size() > 0){
for(WorkflowCondition cond: task.getPreConditions()){
- if(!this.conditionMap.containsKey(cond.getConditionId())){
+ if(!conditionMap.containsKey(cond.getConditionId())){
throw new RepositoryException("Reference in new task: ["+task.getTaskName()+"] to undefined pre condition ith id: ["+cond.getConditionId()+"]");
}
}
for(WorkflowCondition cond: task.getPostConditions()){
- if(!this.conditionMap.containsKey(cond.getConditionId())){
+ if(!conditionMap.containsKey(cond.getConditionId())){
throw new RepositoryException("Reference in new task: ["+task.getTaskName()+"] to undefined post condition ith id: ["+cond.getConditionId()+"]");
}
}
@@ -279,7 +279,7 @@ public class XMLWorkflowRepository implements WorkflowRepository {
String taskId = task.getTaskId() != null ?
task.getTaskId():UUID.randomUUID().toString();
- this.taskMap.put(taskId, task);
+ taskMap.put(taskId, task);
return taskId;
}
@@ -295,14 +295,14 @@ public class XMLWorkflowRepository implements WorkflowRepository {
}
for(WorkflowTask task: (List<WorkflowTask>)workflow.getTasks()){
- if(!this.taskMap.containsKey(task.getTaskId())){
+ if(!taskMap.containsKey(task.getTaskId())){
throw new RepositoryException("Reference in new workflow: ["+workflow.getName()+"] to undefined task with id: ["+task.getTaskId()+"]");
}
// check its conditions
if(task.getConditions() != null && task.getConditions().size() > 0){
for(WorkflowCondition cond: (List<WorkflowCondition>)task.getConditions()){
- if(!this.conditionMap.containsKey(cond.getConditionId())){
+ if(!conditionMap.containsKey(cond.getConditionId())){
throw new RepositoryException("Reference in new workflow: ["+workflow.getName()+"] to undefined condition ith id: ["+cond.getConditionId()+"]");
}
}
@@ -315,8 +315,8 @@ public class XMLWorkflowRepository implements WorkflowRepository {
workflowId = UUID.randomUUID().toString();
workflow.setId(workflowId);
}
- this.workflowMap.put(workflowId, workflow);
- this.eventMap.put(workflowId, Collections.singletonList(workflow));
+ workflowMap.put(workflowId, workflow);
+ eventMap.put(workflowId, Collections.singletonList(workflow));
return workflowId;
}
@@ -327,11 +327,11 @@ public class XMLWorkflowRepository implements WorkflowRepository {
@Override
public List<WorkflowCondition> getConditionsByWorkflowId(String workflowId)
throws RepositoryException {
- if(!this.workflowMap.containsKey(workflowId)) throw new
+ if(!workflowMap.containsKey(workflowId)) throw new
RepositoryException("Attempt to obtain conditions for a workflow: " +
"["+workflowId+"] that does not exist!");
- return ((Workflow)this.workflowMap.get(workflowId)).getConditions();
+ return ((Workflow) workflowMap.get(workflowId)).getConditions();
}
@@ -340,7 +340,7 @@ public class XMLWorkflowRepository implements WorkflowRepository {
*/
@Override
public WorkflowTask getTaskById(String taskId) throws RepositoryException {
- return (WorkflowTask)this.taskMap.get(taskId);
+ return (WorkflowTask) taskMap.get(taskId);
}
/**
@@ -694,7 +694,7 @@ public class XMLWorkflowRepository implements WorkflowRepository {
task.setTaskId(workflowId+"-global-conditions-eval");
task.setTaskName(workflowName+"-global-conditions-eval");
task.setTaskInstanceClassName(NoOpTask.class.getName());
- this.taskMap.put(task.getTaskId(), task);
+ taskMap.put(task.getTaskId(), task);
return task;
}
[14/16] oodt git commit: OODT-906 remove unrequired assignment
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/RangeQueryTester.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/RangeQueryTester.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/RangeQueryTester.java
index 7572a40..dcd9d3b 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/RangeQueryTester.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/RangeQueryTester.java
@@ -150,7 +150,6 @@ public final class RangeQueryTester {
searcher.close();
} catch (Exception ignore) {
}
- searcher = null;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
index 90d708e..f99b055 100755
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
@@ -92,7 +92,7 @@ public class SolrIndexer {
public SolrIndexer(String solrUrl, String fmUrl)
throws InstantiationException {
InputStream input = null;
- String filename = null;
+ String filename;
try {
LOG.info("System property " + SOLR_INDEXER_CONFIG + " set to "
@@ -636,7 +636,7 @@ public class SolrIndexer {
} else if (line.hasOption("all") || line.hasOption("product")
|| line.hasOption("metFile") || line.hasOption("read")
|| line.hasOption("types") || line.hasOption("deleteAll")) {
- SolrIndexer indexer = null;
+ SolrIndexer indexer;
String solrUrl = null;
String fmUrl = null;
if (line.hasOption("solrUrl")) {
@@ -684,7 +684,7 @@ public class SolrIndexer {
*/
private static List<String> readProductIdsFromStdin() {
List<String> productIds = new ArrayList<String>();
- BufferedReader br = null;
+ BufferedReader br;
br = new BufferedReader(new InputStreamReader(System.in));
String line = null;
@@ -702,7 +702,6 @@ public class SolrIndexer {
br.close();
} catch (Exception ignore) {
}
- br = null;
}
}
return productIds;
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/GenericFileManagerObjectFactory.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/GenericFileManagerObjectFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/GenericFileManagerObjectFactory.java
index 57a4345..640cd80 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/GenericFileManagerObjectFactory.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/GenericFileManagerObjectFactory.java
@@ -81,8 +81,8 @@ public final class GenericFileManagerObjectFactory {
@SuppressWarnings("unchecked")
public static DataTransfer getDataTransferServiceFromFactory(
String serviceFactory) {
- DataTransferFactory dataTransferFactory = null;
- Class<DataTransferFactory> dataTransferFactoryClass = null;
+ DataTransferFactory dataTransferFactory;
+ Class<DataTransferFactory> dataTransferFactoryClass;
try {
dataTransferFactoryClass = (Class<DataTransferFactory>) Class.forName(serviceFactory);
@@ -122,8 +122,8 @@ public final class GenericFileManagerObjectFactory {
@SuppressWarnings("unchecked")
public static RepositoryManager getRepositoryManagerServiceFromFactory(
String serviceFactory) {
- RepositoryManagerFactory factory = null;
- Class<RepositoryManagerFactory> clazz = null;
+ RepositoryManagerFactory factory;
+ Class<RepositoryManagerFactory> clazz;
try {
clazz = (Class<RepositoryManagerFactory>) Class.forName(serviceFactory);
@@ -162,8 +162,8 @@ public final class GenericFileManagerObjectFactory {
*/
@SuppressWarnings("unchecked")
public static Catalog getCatalogServiceFromFactory(String serviceFactory) {
- CatalogFactory factory = null;
- Class<CatalogFactory> clazz = null;
+ CatalogFactory factory;
+ Class<CatalogFactory> clazz;
try {
clazz = (Class<CatalogFactory>) Class.forName(serviceFactory);
@@ -204,8 +204,8 @@ public final class GenericFileManagerObjectFactory {
@SuppressWarnings("unchecked")
public static ValidationLayer getValidationLayerFromFactory(
String serviceFactory) {
- ValidationLayerFactory factory = null;
- Class<ValidationLayerFactory> clazz = null;
+ ValidationLayerFactory factory;
+ Class<ValidationLayerFactory> clazz;
try {
clazz = (Class<ValidationLayerFactory>) Class.forName(serviceFactory);
@@ -233,8 +233,8 @@ public final class GenericFileManagerObjectFactory {
@SuppressWarnings("unchecked")
public static Cache getCacheFromFactory(String serviceFactory){
- CacheFactory factory = null;
- Class<CacheFactory> clazz = null;
+ CacheFactory factory;
+ Class<CacheFactory> clazz;
try {
clazz = (Class<CacheFactory>) Class.forName(serviceFactory);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/SqlParser.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/SqlParser.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/SqlParser.java
index 53ff23c..9d98f96 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/SqlParser.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/SqlParser.java
@@ -256,7 +256,7 @@ public class SqlParser {
stack.push("(");
break;
case ')':
- String value = null;
+ String value;
while (!(value = stack.pop()).equals("("))
postFix.add(value);
if (stack.peek().equals("NOT"))
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 284898b..fda21e4 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
@@ -86,7 +86,7 @@ public final class XmlStructFactory {
org.w3c.dom.Element descElem = XMLUtils.getFirstElement("description",
productTypeElem);
- String description = null;
+ String description;
if (descElem.getAttribute("trim") != null
&& !descElem.getAttribute("trim").equals("")
&& !Boolean.valueOf(descElem.getAttribute("trim"))) {
@@ -234,7 +234,7 @@ public final class XmlStructFactory {
HashMap<String, String> subToSuperMap) {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
factory.setNamespaceAware(true);
- Document document = null;
+ Document document;
try {
DocumentBuilder builder = factory.newDocumentBuilder();
@@ -295,7 +295,7 @@ public final class XmlStructFactory {
public static Document getElementXmlDocument(List<org.apache.oodt.cas.filemgr.structs.Element> elements) {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
factory.setNamespaceAware(true);
- Document document = null;
+ Document document;
try {
DocumentBuilder builder = factory.newDocumentBuilder();
@@ -336,7 +336,7 @@ public final class XmlStructFactory {
public static Document getProductTypeXmlDocument(List<ProductType> productTypes) {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
factory.setNamespaceAware(true);
- Document document = null;
+ Document document;
try {
DocumentBuilder builder = factory.newDocumentBuilder();
@@ -438,7 +438,7 @@ public final class XmlStructFactory {
org.w3c.dom.Element descElem = XMLUtils.getFirstElement("description",
elementElem);
- String description = null;
+ String description;
if (descElem.getAttribute("trim") != null
&& !descElem.getAttribute("trim").equals("")
&& !Boolean.valueOf(descElem.getAttribute("trim"))) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayer.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayer.java
index 8b136db..5103d19 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayer.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayer.java
@@ -530,7 +530,7 @@ public class DataSourceValidationLayer implements ValidationLayer {
Connection conn = null;
Statement statement = null;
ResultSet rs = null;
- List<Element> elements = null;
+ List<Element> elements;
elements = new Vector<Element>();
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayerFactory.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayerFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayerFactory.java
index ef5ab15..7d291fe 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayerFactory.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayerFactory.java
@@ -45,7 +45,7 @@ public class DataSourceValidationLayerFactory implements ValidationLayerFactory
* </p>
*/
public DataSourceValidationLayerFactory() {
- String jdbcUrl = null, user = null, pass = null, driver = null;
+ String jdbcUrl, user, pass, driver;
jdbcUrl = System
.getProperty("org.apache.oodt.cas.filemgr.validation.datasource.jdbc.url");
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ScienceDataValidationLayer.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ScienceDataValidationLayer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ScienceDataValidationLayer.java
index e9807ed..2a13c93 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ScienceDataValidationLayer.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ScienceDataValidationLayer.java
@@ -80,7 +80,6 @@ public class ScienceDataValidationLayer implements ValidationLayer {
statement.close();
} catch (Exception ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -88,7 +87,6 @@ public class ScienceDataValidationLayer implements ValidationLayer {
conn.close();
} catch (Exception ignore) {
}
- conn = null;
}
}
@@ -121,7 +119,6 @@ public class ScienceDataValidationLayer implements ValidationLayer {
statement.close();
} catch (Exception ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -129,7 +126,6 @@ public class ScienceDataValidationLayer implements ValidationLayer {
conn.close();
} catch (Exception ignore) {
}
- conn = null;
}
}
@@ -166,7 +162,6 @@ public class ScienceDataValidationLayer implements ValidationLayer {
rs.close();
} catch (Exception ignore) {
}
- rs = null;
}
if (statement != null) {
@@ -174,7 +169,6 @@ public class ScienceDataValidationLayer implements ValidationLayer {
statement.close();
} catch (Exception ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -182,7 +176,6 @@ public class ScienceDataValidationLayer implements ValidationLayer {
conn.close();
} catch (Exception ignore) {
}
- conn = null;
}
}
@@ -221,7 +214,6 @@ public class ScienceDataValidationLayer implements ValidationLayer {
rs.close();
} catch (Exception ignore) {
}
- rs = null;
}
if (statement != null) {
@@ -229,7 +221,6 @@ public class ScienceDataValidationLayer implements ValidationLayer {
statement.close();
} catch (Exception ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -237,7 +228,6 @@ public class ScienceDataValidationLayer implements ValidationLayer {
conn.close();
} catch (Exception ignore) {
}
- conn = null;
}
}
@@ -272,7 +262,6 @@ public class ScienceDataValidationLayer implements ValidationLayer {
rs.close();
} catch (Exception ignore) {
}
- rs = null;
}
if (statement != null) {
@@ -280,7 +269,6 @@ public class ScienceDataValidationLayer implements ValidationLayer {
statement.close();
} catch (Exception ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -288,7 +276,6 @@ public class ScienceDataValidationLayer implements ValidationLayer {
conn.close();
} catch (Exception ignore) {
}
- conn = null;
}
}
@@ -326,7 +313,6 @@ public class ScienceDataValidationLayer implements ValidationLayer {
rs.close();
} catch (Exception ignore) {
}
- rs = null;
}
if (statement != null) {
@@ -334,7 +320,6 @@ public class ScienceDataValidationLayer implements ValidationLayer {
statement.close();
} catch (Exception ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -342,7 +327,6 @@ public class ScienceDataValidationLayer implements ValidationLayer {
conn.close();
} catch (Exception ignore) {
}
- conn = null;
}
}
@@ -378,7 +362,6 @@ public class ScienceDataValidationLayer implements ValidationLayer {
statement.close();
} catch (Exception ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -386,7 +369,6 @@ public class ScienceDataValidationLayer implements ValidationLayer {
conn.close();
} catch (Exception ignore) {
}
- conn = null;
}
}
@@ -419,7 +401,6 @@ public class ScienceDataValidationLayer implements ValidationLayer {
statement.close();
} catch (Exception ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -427,7 +408,6 @@ public class ScienceDataValidationLayer implements ValidationLayer {
conn.close();
} catch (Exception ignore) {
}
- conn = null;
}
}
@@ -463,7 +443,6 @@ public class ScienceDataValidationLayer implements ValidationLayer {
statement.close();
} catch (Exception ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -471,7 +450,6 @@ public class ScienceDataValidationLayer implements ValidationLayer {
conn.close();
} catch (Exception ignore) {
}
- conn = null;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ScienceDataValidationLayerFactory.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ScienceDataValidationLayerFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ScienceDataValidationLayerFactory.java
index 48f343e..d30158a 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ScienceDataValidationLayerFactory.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ScienceDataValidationLayerFactory.java
@@ -40,7 +40,7 @@ public class ScienceDataValidationLayerFactory implements
private DataSource dataSource;
public ScienceDataValidationLayerFactory() {
- String jdbcUrl = null, user = null, pass = null, driver = null;
+ String jdbcUrl, user, pass, driver;
jdbcUrl = PathUtils
.replaceEnvVariables(System
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java
index b87c0b5..8c0d4c8 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java
@@ -273,7 +273,7 @@ public class XMLValidationLayer implements ValidationLayer {
private void saveElementsAndMappings() {
for (String dirUri : xmlFileDirUris) {
- File elementDir = null;
+ File elementDir;
try {
elementDir = new File(new URI(dirUri));
@@ -458,12 +458,12 @@ public class XMLValidationLayer implements ValidationLayer {
private Document getDocumentRoot(String xmlFile) {
// open up the XML file
- DocumentBuilderFactory factory = null;
- DocumentBuilder parser = null;
- Document document = null;
- InputSource inputSource = null;
+ DocumentBuilderFactory factory;
+ DocumentBuilder parser;
+ Document document;
+ InputSource inputSource;
- InputStream xmlInputStream = null;
+ InputStream xmlInputStream;
try {
xmlInputStream = new File(xmlFile).toURL().openStream();
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/BasicVersioner.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/BasicVersioner.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/BasicVersioner.java
index 4d1695e..a9319a1 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/BasicVersioner.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/BasicVersioner.java
@@ -82,7 +82,7 @@ public class BasicVersioner implements Versioner {
// TODO: fix that hack :-)
Reference r = (Reference) product.getProductReferences().get(0);
- String dataStoreRef = null;
+ String dataStoreRef;
try {
dataStoreRef = new File(new URI(productRepoPath)).toURL()
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java
index 21bbe4b..3e06198 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java
@@ -87,7 +87,7 @@ public class DateTimeVersioner implements Versioner {
if (productionDateTime == null) { // generate it ourselves then
productionDateTime = dateFormatter.format(new Date());
} else {
- Date prodDateTime = null;
+ Date prodDateTime;
try {
prodDateTime = DateConvert.isoParse(productionDateTime);
} catch (ParseException e) {
@@ -106,7 +106,7 @@ public class DateTimeVersioner implements Versioner {
// we'll use the format: yyyy.dd.MM.HH.mm.ss
for (Reference r : product.getProductReferences()) {
- String dataStoreRef = null;
+ String dataStoreRef;
try {
dataStoreRef = new File(new URI(product.getProductType()
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/VersioningUtils.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/VersioningUtils.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/VersioningUtils.java
index 6334d0d..078ef93 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/VersioningUtils.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/VersioningUtils.java
@@ -69,7 +69,7 @@ public final class VersioningUtils {
};
public static List<Reference> getReferencesFromDir(File dirRoot) {
- List<Reference> references = null;
+ List<Reference> references;
if (dirRoot == null)
throw new IllegalArgumentException("null");
@@ -126,7 +126,7 @@ public final class VersioningUtils {
}
public static List<String> getURIsFromDir(File dirRoot) {
- List<String> uris = null;
+ List<String> uris;
if (dirRoot == null)
throw new IllegalArgumentException("null");
@@ -209,7 +209,7 @@ public final class VersioningUtils {
String productRepoPath, List<Reference> references) {
for (Reference r : references) {
String dataStoreRef = null;
- String productRepoPathRef = null;
+ String productRepoPathRef;
try {
productRepoPathRef = new File(new URI(productRepoPath)).toURL()
@@ -262,7 +262,7 @@ public final class VersioningUtils {
}
public static String getAbsolutePathFromUri(String uriStr) {
- URI uri = null;
+ URI uri;
String absPath = null;
try {
@@ -278,7 +278,7 @@ public final class VersioningUtils {
}
private static long quietGetFileSizeFromUri(String uri) {
- File fileRef = null;
+ File fileRef;
try {
fileRef = new File(new URI(uri));
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java
index 368bf94..76ee6e3 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java
@@ -88,7 +88,7 @@ public class TestDataSourceCatalog extends TestCase {
// get a temp directory
File tempDir = null;
- File tempFile = null;
+ File tempFile;
try {
tempFile = File.createTempFile("foo", "bar");
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java
index 78115bf..fe4df37 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java
@@ -104,7 +104,7 @@ public class TestCachedIngester extends TestCase {
}
public void testIngest() {
- Metadata prodMet = null;
+ Metadata prodMet;
try {
URL ingestUrl = this.getClass().getResource("/ingest");
@@ -131,7 +131,6 @@ public class TestCachedIngester extends TestCase {
assertNotNull(p);
assertEquals(Product.STATUS_RECEIVED, p.getTransferStatus());
assertTrue(fmClient.hasProduct("test.txt"));
- fmClient = null;
} catch (Exception e) {
fail(e.getMessage());
}
@@ -182,7 +181,7 @@ public class TestCachedIngester extends TestCase {
}
private void ingestTestFile() {
- Metadata prodMet = null;
+ Metadata prodMet;
StdIngester ingester = new StdIngester(transferServiceFacClass);
try {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java
index 7e54081..618e85b 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java
@@ -181,7 +181,7 @@ public class TestLocalCache extends TestCase {
}
private void doIngest() {
- Metadata prodMet = null;
+ Metadata prodMet;
try {
URL ingestUrl = this.getClass().getResource("/ingest");
@@ -209,7 +209,6 @@ public class TestLocalCache extends TestCase {
assertNotNull(p);
assertEquals(Product.STATUS_RECEIVED, p.getTransferStatus());
assertTrue(fmClient.hasProduct("test.txt"));
- fmClient = null;
} catch (Exception e) {
fail(e.getMessage());
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java
index 63978b7..5d64370 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java
@@ -197,7 +197,7 @@ public class TestRmiCache extends TestCase {
}
private void doIngest() {
- Metadata prodMet = null;
+ Metadata prodMet;
try {
URL ingestUrl = this.getClass().getResource("/ingest");
@@ -225,7 +225,6 @@ public class TestRmiCache extends TestCase {
assertNotNull(p);
assertEquals(Product.STATUS_RECEIVED, p.getTransferStatus());
assertTrue(fmClient.hasProduct("test.txt"));
- fmClient = null;
} catch (Exception e) {
fail(e.getMessage());
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestStdIngester.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestStdIngester.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestStdIngester.java
index 48d93ac..957f601 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestStdIngester.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestStdIngester.java
@@ -63,7 +63,7 @@ public class TestStdIngester extends TestCase {
}
public void testIngest() {
- Metadata prodMet = null;
+ Metadata prodMet;
try {
URL ingestUrl = this.getClass().getResource("/ingest");
@@ -89,7 +89,6 @@ public class TestStdIngester extends TestCase {
assertNotNull(p);
assertEquals(Product.STATUS_RECEIVED, p.getTransferStatus());
assertTrue(fmClient.hasProduct("test.txt"));
- fmClient = null;
} catch (Exception e){
fail(e.getMessage());
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 6b5f6aa..60b9eda 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
@@ -93,7 +93,7 @@ public class TestTypeHandler extends TestCase {
// get a temp directory
File tempDir = null;
- File tempFile = null;
+ File tempFile;
try {
tempFile = File.createTempFile("foo", "bar");
@@ -447,7 +447,7 @@ public class TestTypeHandler extends TestCase {
ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY);
- String getProductSql = "";
+ String getProductSql;
String tableName = type.getName() + "_metadata";
String subSelectQueryBase = "SELECT product_id FROM "
+ tableName + " ";
@@ -463,7 +463,7 @@ public class TestTypeHandler extends TestCase {
for (QueryCriteria criteria : query.getCriteria()) {
clauseNum++;
- String elementIdStr = null;
+ String elementIdStr;
if (fieldIdStringFlag) {
elementIdStr = "'" + this.getValidationLayer().getElementByName(criteria.getElementName())
@@ -473,7 +473,7 @@ public class TestTypeHandler extends TestCase {
this.getValidationLayer().getElementByName(criteria.getElementName()).getElementId();
}
- String clause = null;
+ String clause;
if (!gotFirstClause) {
clause = "(p.element_id = " + elementIdStr
@@ -598,7 +598,7 @@ public class TestTypeHandler extends TestCase {
// must call next first, or else no relative cursor
if (rs.next()) {
// grab the first one
- int numGrabbed = -1;
+ int numGrabbed;
if (pageNum == 1) {
numGrabbed = 1;
@@ -651,7 +651,6 @@ public class TestTypeHandler extends TestCase {
} catch (SQLException ignore) {
}
- rs = null;
}
if (statement != null) {
@@ -660,7 +659,6 @@ public class TestTypeHandler extends TestCase {
} catch (SQLException ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -670,7 +668,6 @@ public class TestTypeHandler extends TestCase {
} catch (SQLException ignore) {
}
- conn = null;
}
}
@@ -689,7 +686,7 @@ public class TestTypeHandler extends TestCase {
conn = dataSource.getConnection();
statement = conn.createStatement();
- String getProductSql = "";
+ String getProductSql;
String tableName = type.getName() + "_metadata";
String subSelectQueryBase = "SELECT product_id FROM "
+ tableName + " ";
@@ -705,7 +702,7 @@ public class TestTypeHandler extends TestCase {
for (QueryCriteria criteria : query.getCriteria()) {
clauseNum++;
- String elementIdStr = null;
+ String elementIdStr;
if (fieldIdStringFlag) {
elementIdStr = "'" + this.getValidationLayer().getElementByName(criteria.getElementName())
@@ -715,7 +712,7 @@ public class TestTypeHandler extends TestCase {
this.getValidationLayer().getElementByName(criteria.getElementName()).getElementId();
}
- String clause = null;
+ String clause;
if (!gotFirstClause) {
clause = "(p.element_id = " + elementIdStr
@@ -855,7 +852,6 @@ public class TestTypeHandler extends TestCase {
} catch (SQLException ignore) {
}
- rs = null;
}
if (statement != null) {
@@ -864,7 +860,6 @@ public class TestTypeHandler extends TestCase {
} catch (SQLException ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -874,7 +869,6 @@ public class TestTypeHandler extends TestCase {
} catch (SQLException ignore) {
}
- conn = null;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManager.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManager.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManager.java
index 4129f67..2a66dad 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManager.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManager.java
@@ -208,7 +208,7 @@ public class TestXmlRpcFileManager extends TestCase {
}
private void ingestTestFile() {
- Metadata prodMet = null;
+ Metadata prodMet;
StdIngester ingester = new StdIngester(transferServiceFacClass);
try {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java
index d67e3c4..ec6d392 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java
@@ -85,7 +85,7 @@ public class TestXmlRpcFileManagerClient extends TestCase {
XmlRpcFileManagerClient fmc = new XmlRpcFileManagerClient(new URL(
"http://localhost:" + FM_PORT));
- Metadata reducedMet = null;
+ Metadata reducedMet;
List pTypes = fmc.getProductTypes();
assertNotNull(pTypes);
assertTrue(pTypes.size() > 0);
@@ -151,7 +151,7 @@ public class TestXmlRpcFileManagerClient extends TestCase {
URL refUrl = this.getClass().getResource("/ingest/test-file-3.txt");
URL metUrl = this.getClass().getResource("/ingest/test-file-3.txt.met");
- Metadata prodMet = null;
+ Metadata prodMet;
StdIngester ingester = new StdIngester(transferServiceFacClass);
prodMet = new SerializableMetadata(new FileInputStream(
metUrl.getFile()));
@@ -254,7 +254,7 @@ public class TestXmlRpcFileManagerClient extends TestCase {
}
private void ingestTestFile() {
- Metadata prodMet = null;
+ Metadata prodMet;
StdIngester ingester = new StdIngester(transferServiceFacClass);
try {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java
index 18096a9..f7d71e0 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java
@@ -99,7 +99,6 @@ public class TestExpImpCatalog extends TestCase {
}
assertEquals(1, countProds);
- fmClient = null;
} catch (Exception e) {
e.printStackTrace();
fail(e.getMessage());
@@ -142,7 +141,6 @@ public class TestExpImpCatalog extends TestCase {
}
assertEquals(2, countProds);
- fmClient = null;
} catch (Exception e) {
e.printStackTrace();
fail(e.getMessage());
@@ -170,7 +168,6 @@ public class TestExpImpCatalog extends TestCase {
prod.setProductReferences(fmClient.getProductReferences(prod));
assertNotNull(prod.getProductReferences());
assertEquals(1, prod.getProductReferences().size());
- fmClient = null;
} catch (Exception e) {
e.printStackTrace();
fail(e.getMessage());
@@ -225,7 +222,7 @@ public class TestExpImpCatalog extends TestCase {
}
private void ingestTestFiles() {
- Metadata prodMet = null;
+ Metadata prodMet;
StdIngester ingester = new StdIngester(transferServiceFacClass);
try {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestMetadataBasedProductMover.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestMetadataBasedProductMover.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestMetadataBasedProductMover.java
index 028f9ab..1d4ad71 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestMetadataBasedProductMover.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestMetadataBasedProductMover.java
@@ -77,7 +77,7 @@ public class TestMetadataBasedProductMover extends TestCase {
}
private void ingestTestFile() {
- Metadata prodMet = null;
+ Metadata prodMet;
StdIngester ingester = new StdIngester(transferServiceFacClass);
try {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/test/java/org/apache/oodt/cas/filemgr/util/TestXmlStructFactory.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/util/TestXmlStructFactory.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/util/TestXmlStructFactory.java
index 201d623..03254db 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/util/TestXmlStructFactory.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/util/TestXmlStructFactory.java
@@ -52,7 +52,7 @@ public class TestXmlStructFactory extends TestCase {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
factory.setNamespaceAware(true);
- Document document = null;
+ Document document;
try {
DocumentBuilder builder = factory.newDocumentBuilder();
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/grid/src/main/java/org/apache/oodt/grid/GridServlet.java
----------------------------------------------------------------------
diff --git a/grid/src/main/java/org/apache/oodt/grid/GridServlet.java b/grid/src/main/java/org/apache/oodt/grid/GridServlet.java
index 0f5cf5d..7a039ff 100755
--- a/grid/src/main/java/org/apache/oodt/grid/GridServlet.java
+++ b/grid/src/main/java/org/apache/oodt/grid/GridServlet.java
@@ -57,7 +57,7 @@ public abstract class GridServlet extends HttpServlet {
if (path == null)
throw new ServletException("The config.xml file can't be accessed. Are we running from a war file!??!");
File file = new File(path);
- Configuration c = null;
+ Configuration c;
try {
c = new Configuration(file);
} catch (SAXException ex) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CmdLineMetExtractor.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CmdLineMetExtractor.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CmdLineMetExtractor.java
index 93ef68b..7edd70e 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CmdLineMetExtractor.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CmdLineMetExtractor.java
@@ -55,7 +55,7 @@ public abstract class CmdLineMetExtractor extends AbstractMetExtractor {
CmdLineMetExtractor extractor) throws Exception {
String usage = "Usage: " + extractor.getClass().getName()
+ " <file> <configfile>";
- String extractFilePath = null, configFilePath = null;
+ String extractFilePath, configFilePath;
if (args.length < 2) {
System.err.println(usage);
@@ -75,7 +75,7 @@ public abstract class CmdLineMetExtractor extends AbstractMetExtractor {
CmdLineMetExtractor extractor, OutputStream os) throws Exception {
String usage = "Usage: " + extractor.getClass().getName()
+ " <file> <configfile>";
- String extractFilePath = null, configFilePath = null;
+ String extractFilePath, configFilePath;
if (args.length < 2) {
System.err.println(usage);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CopyAndRewriteExtractor.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CopyAndRewriteExtractor.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CopyAndRewriteExtractor.java
index 8cd7217..8b45d7a 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CopyAndRewriteExtractor.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CopyAndRewriteExtractor.java
@@ -78,7 +78,7 @@ public class CopyAndRewriteExtractor extends CmdLineMetExtractor {
"No config file defined: unable to copy and rewrite metadata!");
}
- Metadata met = null;
+ Metadata met;
try {
met = new SerializableMetadata(new File(PathUtils
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 18a5d4c..3a736eb 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
@@ -87,7 +87,7 @@ public final class ExternConfigReader implements MetExtractorConfigReader,
Vector argVector = new Vector();
for (int i = 0; i < argNodes.getLength(); i++) {
Element argElem = (Element) argNodes.item(i);
- String argStr = null;
+ String argStr;
if (Boolean.valueOf(
argElem.getAttribute(IS_DATA_FILE_ATTR)
.toLowerCase()))
@@ -99,7 +99,7 @@ public final class ExternConfigReader implements MetExtractorConfigReader,
else
argStr = XMLUtils.getSimpleElementText(argElem);
- String appendExt = null;
+ String appendExt;
if (!(appendExt = argElem.getAttribute(APPEND_EXT_ATTR))
.equals(""))
argStr += "." + appendExt;
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java
index e151366..238d1e9 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java
@@ -95,7 +95,7 @@ public class ExternMetExtractor extends CmdLineMetExtractor implements
// generate metadata file
LOG.log(Level.INFO, "Generating met file for product file: ["
+ file.getAbsolutePath() + "]");
- int status = -1;
+ int status;
try {
LOG.log(Level.INFO, "Executing command line: ["
+ ExecUtils.printCommandLine(commandLineArgs)
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/metadata/src/main/java/org/apache/oodt/cas/metadata/util/GenericMetadataObjectFactory.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/util/GenericMetadataObjectFactory.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/util/GenericMetadataObjectFactory.java
index eed3a70..445f853 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/util/GenericMetadataObjectFactory.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/util/GenericMetadataObjectFactory.java
@@ -40,8 +40,8 @@ public final class GenericMetadataObjectFactory {
.getLogger(GenericMetadataObjectFactory.class.getName());
public static MetExtractor getMetExtractorFromClassName(String className) {
- Class metExtractorClass = null;
- MetExtractor extractor = null;
+ Class metExtractorClass;
+ MetExtractor extractor;
try {
metExtractorClass = Class.forName(className);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 bfa245e..8954f2e 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
@@ -66,7 +66,7 @@ public final class PathUtils {
for (int i = 0; i < origPath.length(); i++) {
if (origPath.charAt(i) == '[') {
VarData data = readEnvVarName(origPath, i);
- String var = null;
+ String var;
if (metadata != null
&& metadata.getMetadata(data.getFieldName()) != null) {
List valList = metadata.getAllMetadata(data.getFieldName());
@@ -142,7 +142,7 @@ public final class PathUtils {
throw new Exception("No date type specified - '" + dateString
+ "'");
String dateType = splitDate[1].replaceAll("[\\[\\]\\s]", "");
- String replacement = "";
+ String replacement;
if (dateType.equals("DAY")) {
replacement = StringUtils.leftPad(gc
.get(GregorianCalendar.DAY_OF_MONTH)
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileElementExtractor.java
----------------------------------------------------------------------
diff --git a/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileElementExtractor.java b/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileElementExtractor.java
index b4416af..ef1da78 100644
--- a/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileElementExtractor.java
+++ b/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileElementExtractor.java
@@ -62,7 +62,7 @@ public class OpendapProfileElementExtractor {
Profile profile, DAS das) throws NoSuchAttributeException {
RangedProfileElement elem = new RangedProfileElement(profile);
elem.setName(elemName);
- AttributeTable attTable = null;
+ AttributeTable attTable;
try {
attTable = das.getAttributeTable(varname);
@@ -85,7 +85,7 @@ public class OpendapProfileElementExtractor {
Attribute attr = attTable.getAttribute(attrName);
if (!attr.isContainer()) {
- Enumeration attrValues = null;
+ Enumeration attrValues;
try {
attrValues = attr.getValues();
@@ -125,7 +125,7 @@ public class OpendapProfileElementExtractor {
EnumeratedProfileElement elem = new EnumeratedProfileElement(profile);
elem.setName(elemName);
- AttributeTable attTable = null;
+ AttributeTable attTable;
try {
attTable = das.getAttributeTable(elemName);
} catch (NoSuchAttributeException e) {
@@ -139,7 +139,7 @@ public class OpendapProfileElementExtractor {
while (attributeNames.hasMoreElements()) {
String attrName = (String) attributeNames.nextElement();
Attribute attr = attTable.getAttribute(attrName);
- Enumeration attrValues = null;
+ Enumeration attrValues;
try {
attrValues = attr.getValues();
} catch (NoSuchAttributeException e) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileHandler.java
----------------------------------------------------------------------
diff --git a/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileHandler.java b/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileHandler.java
index 5870fef..871cd0c 100644
--- a/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileHandler.java
+++ b/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileHandler.java
@@ -109,7 +109,7 @@ public class OpendapProfileHandler implements ProfileHandler {
LOG.log(Level.FINE,"Connecting to opendapurl="+opendapUrl);
Profile profile = new Profile();
- DConnect dConn = null;
+ DConnect dConn;
try {
dConn = new DConnect(opendapUrl, true);
} catch (FileNotFoundException e) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 307667b..7538984 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
@@ -184,8 +184,8 @@ public final class PCSHealthMonitor implements CoreMetKeys,
public static void main(String[] args) throws Exception {
String usage = "PCSHealthMonitor <fm url> <wm url> <rm url> <crawler xml file path> <workflow states xml file path>\n";
- String fmUrlStr = null, wmUrlStr = null, rmUrlStr = null;
- String crawlerXmlFilePath = null, workflowStateXmlPath = null;
+ String fmUrlStr, wmUrlStr, rmUrlStr;
+ String crawlerXmlFilePath, workflowStateXmlPath;
if (args.length != 5) {
System.err.println(usage);
@@ -471,7 +471,7 @@ public final class PCSHealthMonitor implements CoreMetKeys,
}
private void quickPrintBatchStubs() {
- List resNodes = null;
+ List resNodes;
if (getRmUp()) {
// only print if the resource manager is up
@@ -594,7 +594,7 @@ public final class PCSHealthMonitor implements CoreMetKeys,
}
private boolean getCrawlerUp(String crawlUrlStr) {
- CrawlDaemonController controller = null;
+ CrawlDaemonController controller;
try {
controller = new CrawlDaemonController(crawlUrlStr);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java
----------------------------------------------------------------------
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java b/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java
index 28b24f7..ae31bd2 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java
@@ -145,7 +145,7 @@ public final class PCSTrace implements PCSMetadata, PCSConfigMetadata {
System.out.println(REPORT_LINE_SEPARATOR);
System.out.println("Generated from workflow:");
System.out.println("");
- WorkflowInstance inst = null;
+ WorkflowInstance inst;
try {
inst = getWorkflowInstanceById(wm.safeGetWorkflowInstances(), met
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/pcs/core/src/main/java/org/apache/oodt/pcs/util/FileManagerUtils.java
----------------------------------------------------------------------
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/util/FileManagerUtils.java b/pcs/core/src/main/java/org/apache/oodt/pcs/util/FileManagerUtils.java
index cb672a3..a75550c 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/util/FileManagerUtils.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/util/FileManagerUtils.java
@@ -294,7 +294,7 @@ public class FileManagerUtils implements PCSConfigMetadata {
}
public Product getLatestProduct(Query query, ProductType type) {
- List products = null;
+ List products;
try {
products = fmgrClient.query(query, type);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileReader.java
----------------------------------------------------------------------
diff --git a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileReader.java b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileReader.java
index 9a04a6d..327714a 100644
--- a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileReader.java
+++ b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileReader.java
@@ -66,7 +66,7 @@ public class PGEConfigFileReader {
* If there is an error reading the url.
*/
public PGEConfigurationFile read(URL url) throws PGEConfigFileException {
- PGEConfigurationFile configFile = null;
+ PGEConfigurationFile configFile;
try {
configFile = read(url.openStream());
@@ -95,11 +95,11 @@ public class PGEConfigFileReader {
*/
public PGEConfigurationFile read(InputStream is)
throws PGEConfigFileException {
- PGEConfigurationFile configFile = null;
+ PGEConfigurationFile configFile;
- DocumentBuilderFactory factory = null;
- DocumentBuilder parser = null;
- Document document = null;
+ DocumentBuilderFactory factory;
+ DocumentBuilder parser;
+ Document document;
if (is == null) {
return null;
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileWriter.java
----------------------------------------------------------------------
diff --git a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileWriter.java b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileWriter.java
index 165da6d..5d6de33 100644
--- a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileWriter.java
+++ b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileWriter.java
@@ -98,7 +98,7 @@ public final class PGEConfigFileWriter implements PGEConfigFileKeys,
public Document getConfigFileXml() throws Exception {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
factory.setNamespaceAware(true);
- Document document = null;
+ Document document;
try {
DocumentBuilder builder = factory.newDocumentBuilder();
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java b/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java
index 609b198..0b16ac8 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java
@@ -500,7 +500,7 @@ public class PGETaskInstance implements WorkflowTaskInstance {
protected ProductCrawler createProductCrawler() throws Exception {
/* create a ProductCrawler based on whether or not the output dir specifies a MIME_EXTRACTOR_REPO */
logger.info("Configuring ProductCrawler...");
- ProductCrawler crawler = null;
+ ProductCrawler crawler;
if (pgeMetadata.getMetadata(MIME_EXTRACTOR_REPO) != null &&
!pgeMetadata.getMetadata(MIME_EXTRACTOR_REPO).equals("")){
crawler = new AutoDetectProductCrawler();
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/pge/src/main/java/org/apache/oodt/cas/pge/writers/MetadataKeyReplacerTemplateWriter.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/writers/MetadataKeyReplacerTemplateWriter.java b/pge/src/main/java/org/apache/oodt/cas/pge/writers/MetadataKeyReplacerTemplateWriter.java
index 775445a..f0ee686 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/writers/MetadataKeyReplacerTemplateWriter.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/writers/MetadataKeyReplacerTemplateWriter.java
@@ -63,7 +63,7 @@ public class MetadataKeyReplacerTemplateWriter extends
String separator = args.length == 2 ? (String) args[1] : DEFAULT_SEPARATOR;
for (String key : metadata.getAllKeys()) {
- String replaceVal = null;
+ String replaceVal;
if (metadata.isMultiValued(key)) {
List<String> values = metadata.getAllMetadata(key);
replaceVal = StringUtils.join(values, separator);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/pge/src/main/java/org/apache/oodt/cas/pge/writers/metlist/MetadataListPcsMetFileWriter.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/writers/metlist/MetadataListPcsMetFileWriter.java b/pge/src/main/java/org/apache/oodt/cas/pge/writers/metlist/MetadataListPcsMetFileWriter.java
index 019e4cd..b2509c0 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/writers/metlist/MetadataListPcsMetFileWriter.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/writers/metlist/MetadataListPcsMetFileWriter.java
@@ -65,7 +65,7 @@ public class MetadataListPcsMetFileWriter extends PcsMetFileWriter {
if (val != null && !val.equals("")) {
if (!metadataElement.getAttribute(ENV_REPLACE_ATTR).toLowerCase().equals("false"))
val = PathUtils.doDynamicReplacement(val, inputMetadata);
- String[] vals = null;
+ String[] vals;
if (metadataElement.getAttribute(SPLIT_ATTR).toLowerCase().equals("false")) {
vals = new String[] { val };
} else {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java
----------------------------------------------------------------------
diff --git a/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java b/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java
index 812f526..f10b031 100644
--- a/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java
+++ b/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java
@@ -328,7 +328,7 @@ public class TestPGETaskInstance {
private static Document parseXmlFile(File file) throws Exception{
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- Document dom = null;
+ Document dom;
DocumentBuilder db = dbf.newDocumentBuilder();
dom = db.parse(file);
return dom;
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java
----------------------------------------------------------------------
diff --git a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java
index f5c28e0..34f76f7 100644
--- a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java
+++ b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java
@@ -92,7 +92,7 @@ public abstract class AbstractCrawlLister implements OFSNListHandler {
File dir = (File) stack.pop();
LOG.log(Level.INFO, "OFSN: Crawling " + dir);
- File[] productFiles = null;
+ File[] productFiles;
if (crawlForDirs) {
productFiles = dir.listFiles(DIR_FILTER);
} else {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandlerConfiguration.java
----------------------------------------------------------------------
diff --git a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandlerConfiguration.java b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandlerConfiguration.java
index e663f56..5e8b73d 100644
--- a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandlerConfiguration.java
+++ b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandlerConfiguration.java
@@ -125,7 +125,6 @@ public class OFSNFileHandlerConfiguration {
private void cleanse(String path) {
if (path != null && !path.endsWith("/")) {
- path += "/";
}
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/product/src/main/java/org/apache/oodt/product/handlers/ofsn/StdOFSNGetHandler.java
----------------------------------------------------------------------
diff --git a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/StdOFSNGetHandler.java b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/StdOFSNGetHandler.java
index 2a56cf1..0b39838 100644
--- a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/StdOFSNGetHandler.java
+++ b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/StdOFSNGetHandler.java
@@ -81,7 +81,6 @@ public class StdOFSNGetHandler implements OFSNGetHandler {
} catch (Exception ignore) {
}
- in = null;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/product/src/main/java/org/apache/oodt/product/handlers/ofsn/util/OFSNUtils.java
----------------------------------------------------------------------
diff --git a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/util/OFSNUtils.java b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/util/OFSNUtils.java
index fbf335f..be5aa12 100644
--- a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/util/OFSNUtils.java
+++ b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/util/OFSNUtils.java
@@ -76,7 +76,7 @@ public final class OFSNUtils implements OODTMetKeys, OFSNXMLMetKeys,
String productRoot, boolean showDirSize, boolean showFileSize) {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
factory.setNamespaceAware(true);
- Document document = null;
+ Document document;
try {
DocumentBuilder builder = factory.newDocumentBuilder();
@@ -163,7 +163,6 @@ public final class OFSNUtils implements OODTMetKeys, OFSNXMLMetKeys,
} catch (Exception ignore) {
}
- out = null;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/profile/src/main/java/org/apache/oodt/profile/handlers/cas/CASProfileHandler.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/handlers/cas/CASProfileHandler.java b/profile/src/main/java/org/apache/oodt/profile/handlers/cas/CASProfileHandler.java
index 1ef17a1..945508a 100644
--- a/profile/src/main/java/org/apache/oodt/profile/handlers/cas/CASProfileHandler.java
+++ b/profile/src/main/java/org/apache/oodt/profile/handlers/cas/CASProfileHandler.java
@@ -258,7 +258,7 @@ public class CASProfileHandler implements ProfileHandler {
private List queryAndBuildProfiles(ProductType type, Query query) {
List profiles = new Vector();
- List products = null;
+ List products;
try {
products = fmClient.query(query, type);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/protocol/api/src/main/java/org/apache/oodt/cas/protocol/system/ProtocolManager.java
----------------------------------------------------------------------
diff --git a/protocol/api/src/main/java/org/apache/oodt/cas/protocol/system/ProtocolManager.java b/protocol/api/src/main/java/org/apache/oodt/cas/protocol/system/ProtocolManager.java
index f08e67d..630ab29 100644
--- a/protocol/api/src/main/java/org/apache/oodt/cas/protocol/system/ProtocolManager.java
+++ b/protocol/api/src/main/java/org/apache/oodt/cas/protocol/system/ProtocolManager.java
@@ -78,7 +78,7 @@ public class ProtocolManager {
return verifiedMap.get(site).newInstance();
} else {
for (ProtocolFactory factory : protocolConfig.getFactoriesBySite(site)) {
- Protocol protocol = null;
+ Protocol protocol;
try {
protocol = factory.newInstance();
if (verifier == null || verifier.verify(protocol, site, auth)) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/protocol/http/src/main/java/org/apache/oodt/cas/protocol/http/HttpProtocol.java
----------------------------------------------------------------------
diff --git a/protocol/http/src/main/java/org/apache/oodt/cas/protocol/http/HttpProtocol.java b/protocol/http/src/main/java/org/apache/oodt/cas/protocol/http/HttpProtocol.java
index 24077c7..dba31cb 100644
--- a/protocol/http/src/main/java/org/apache/oodt/cas/protocol/http/HttpProtocol.java
+++ b/protocol/http/src/main/java/org/apache/oodt/cas/protocol/http/HttpProtocol.java
@@ -61,7 +61,7 @@ public class HttpProtocol implements Protocol {
public void cd(ProtocolFile file) throws ProtocolException {
try {
- HttpFile httpFile = null;
+ HttpFile httpFile;
if (!(file instanceof HttpFile)) {
URL link = HttpUtils.resolveUri(currentFile.getLink().toURI(), file.getPath()).toURL();
httpFile = new HttpFile(link.getPath(), file.isDir(), link);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 a4a250a..3bded2d 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
@@ -274,7 +274,7 @@ public class TestJschSftpProtocol extends TestCase {
File publicKeyFile = new File(publicKeysDir, "sample-dsa.pub");
br = new BufferedReader(new FileReader(new File("src/test/resources/sample-dsa.pub").getAbsoluteFile()));
ps = new PrintStream(new FileOutputStream(publicKeyFile));
- String nextLine = null;
+ String nextLine;
while ((nextLine = br.readLine()) != null) {
ps.println(nextLine.replace("2022", Integer.toString(port)));
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java
index 52ea401..6359fcd 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java
@@ -120,7 +120,7 @@ public class RemoteSpecs implements ConfigParserMetKeys {
NodeList propInfoList = ((Element) daemonNode)
.getElementsByTagName(PROP_INFO_TAG);
LinkedList<PropFilesInfo> pfiList = new LinkedList<PropFilesInfo>();
- PropFilesInfo pfi = null;
+ PropFilesInfo pfi;
if (propInfoList.getLength() > 0) {
Node propInfoNode = propInfoList.item(0);
@@ -187,8 +187,7 @@ public class RemoteSpecs implements ConfigParserMetKeys {
String regExp = ((Element) downloadInfo)
.getAttribute(REG_EXP_ATTR);
if (regExp.equals(""))
- regExp = propFilesRegExp;
- NodeList propsList = ((Element) propInfoNode)
+ NodeList propsList = ((Element) propInfoNode)
.getElementsByTagName(PROP_FILE_TAG);
HashMap<File, Parser> propFileToParserMap = new HashMap<File, Parser>();
for (int p = 0; p < propsList.getLength(); p++) {
@@ -238,7 +237,7 @@ public class RemoteSpecs implements ConfigParserMetKeys {
// get DATAINFO elements
NodeList dataInfoList = ((Element) daemonNode)
.getElementsByTagName(DATA_INFO_TAG);
- DataFilesInfo dfi = null;
+ DataFilesInfo dfi;
if (dataInfoList.getLength() > 0) {
Node dataInfo = dataInfoList.item(0);
String queryElement = ((Element) dataInfo)
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java
index 135c6e5..805b900 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java
@@ -456,7 +456,6 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
String element = this.daemonInfo.getDataFilesInfo()
.getQueryMetadataElementName();
if (element == null || element.equals(""))
- element = "Filename";
return this.daemonInfo.getDataFilesInfo().getQueryMetadataElementName();
}
@@ -542,7 +541,6 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
if (args[i].equals("--rmiPort"))
rmiPort = Integer.parseInt(args[++i]);
else if (args[i].equals("--waitForNotification"))
- waitForCrawlNotification = true;
}
LocateRegistry.createRegistry(rmiPort);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/FileRestrictions.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/FileRestrictions.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/FileRestrictions.java
index b080c59..949aab8 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/FileRestrictions.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/FileRestrictions.java
@@ -477,7 +477,7 @@ public class FileRestrictions {
public static boolean isAllowed(VirtualFile file, VirtualFile root) {
boolean vfDoesNotExist = false, lastFileIsDir = file.isDir();
- VirtualFile vf = null;
+ VirtualFile vf;
while ((vf = root.getChildRecursive(file)) == null) {
vfDoesNotExist = true;
lastFileIsDir = file.isDir();
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/ClassNoaaEmailParser.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/ClassNoaaEmailParser.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/ClassNoaaEmailParser.java
index c7992c3..cc148f5 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/ClassNoaaEmailParser.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/ClassNoaaEmailParser.java
@@ -63,7 +63,7 @@ public class ClassNoaaEmailParser implements Parser {
Pattern getPattern = Pattern.compile("\\s*get\\s{1,}.{1,}?(?:\\s|$)");
Matcher getMatcher = getPattern.matcher(sb);
- VirtualFile vf = null;
+ VirtualFile vf;
while (cdMatcher.find() && getMatcher.find()) {
String cdCommand = sb.substring(cdMatcher.start(), cdMatcher.end());
String directory = cdCommand.trim().split(" ")[1];
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalmethod/ListRetriever.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalmethod/ListRetriever.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalmethod/ListRetriever.java
index a2b4e78..743e5f8 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalmethod/ListRetriever.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalmethod/ListRetriever.java
@@ -60,7 +60,7 @@ public class ListRetriever implements RetrievalMethod {
public void processPropFile(FileRetrievalSystem frs, Parser propFileParser,
File propFile, DataFilesInfo dfi, DataFileToPropFileLinker linker)
throws Exception {
- RemoteSite remoteSite = null;
+ RemoteSite remoteSite;
// parse property file
Metadata fileMetadata = new Metadata();
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RetrievalSetup.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RetrievalSetup.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RetrievalSetup.java
index 147781e..865d08f 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RetrievalSetup.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RetrievalSetup.java
@@ -81,7 +81,7 @@ public class RetrievalSetup {
.initialize();
dataFilesFRS.registerDownloadListener(linker);
- File[] propFiles = null;
+ File[] propFiles;
while ((propFiles = getCurrentlyDownloadedPropFiles(pfi)).length > 0
|| downloadingProps) {
for (File propFile : propFiles) {
@@ -89,7 +89,7 @@ public class RetrievalSetup {
Parser parser = pfi.getParserForFile(propFile);
Class<RetrievalMethod> rmClass = config.getParserInfo()
.getRetrievalMethod(parser);
- RetrievalMethod rm = null;
+ RetrievalMethod rm;
if ((rm = this.classToRmMap.get(rmClass)) == null) {
LOG.log(Level.INFO, "Creating '"
+ rmClass.getCanonicalName()
@@ -167,7 +167,7 @@ public class RetrievalSetup {
Parser parser = pfi.getParserForFile(dirStructFile);
Class<RetrievalMethod> rmClass = config
.getParserInfo().getRetrievalMethod(parser);
- RetrievalMethod rm = null;
+ RetrievalMethod rm;
if ((rm = RetrievalSetup.this.classToRmMap
.get(rmClass)) == null) {
LOG.log(Level.INFO, "Creating '"
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 4d28cb8..61ecb30 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
@@ -131,7 +131,7 @@ public class XmlRpcBatchMgr implements Batchmgr {
* org.apache.oodt.cas.resource.structs.ResourceNode)
*/
public boolean killJob(String jobId, ResourceNode node) {
- JobSpec spec = null;
+ JobSpec spec;
try {
spec = repo.getJobById(jobId);
} catch (Exception e) {
@@ -179,7 +179,6 @@ public class XmlRpcBatchMgr implements Batchmgr {
XmlRpcBatchMgrProxy proxy = (XmlRpcBatchMgrProxy) this.specToProxyMap
.remove(spec.getJob().getId());
if (proxy != null) {
- proxy = null;
}
}
@@ -200,7 +199,6 @@ public class XmlRpcBatchMgr implements Batchmgr {
XmlRpcBatchMgrProxy proxy = (XmlRpcBatchMgrProxy) this.specToProxyMap
.remove(spec.getJob().getId());
if (proxy != null) {
- proxy = null;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 65f2405..16eaaac 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
@@ -69,7 +69,7 @@ public class XmlRpcBatchMgrProxy extends Thread implements Runnable {
client = new XmlRpcClient(remoteHost.getIpAddr());
Vector argList = new Vector();
- boolean alive = false;
+ boolean alive;
try {
alive = (Boolean) client.execute("batchstub.isAlive", argList);
@@ -88,7 +88,7 @@ public class XmlRpcBatchMgrProxy extends Thread implements Runnable {
Vector argList = new Vector();
argList.add(XmlRpcStructFactory.getXmlRpcJob(jobSpec.getJob()));
- boolean result = false;
+ boolean result;
try {
result = (Boolean) client.execute("batchstub.killJob", argList);
} catch (XmlRpcException e) {
@@ -112,7 +112,7 @@ public class XmlRpcBatchMgrProxy extends Thread implements Runnable {
argList.add(XmlRpcStructFactory.getXmlRpcJob(jobSpec.getJob()));
argList.add(jobSpec.getIn().write());
- boolean result = false;
+ boolean result;
try {
parent.jobExecuting(jobSpec);
result = (Boolean) client
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/resource/src/main/java/org/apache/oodt/cas/resource/monitor/utils/MockGmetad.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/monitor/utils/MockGmetad.java b/resource/src/main/java/org/apache/oodt/cas/resource/monitor/utils/MockGmetad.java
index 8c655e1..f41ebc3 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/monitor/utils/MockGmetad.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/monitor/utils/MockGmetad.java
@@ -86,8 +86,8 @@ public class MockGmetad implements Runnable {
}
public static void main(String [] args) throws Exception{
- String xmlPath = null;
- int serverPort = -1;
+ String xmlPath;
+ int serverPort;
final String usage = "java MockGmetad <xml path> <port>\n";
if (args.length != 2){
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/resource/src/main/java/org/apache/oodt/cas/resource/mux/XmlBackendRepository.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/mux/XmlBackendRepository.java b/resource/src/main/java/org/apache/oodt/cas/resource/mux/XmlBackendRepository.java
index 32ca801..ffa2779 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/mux/XmlBackendRepository.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/mux/XmlBackendRepository.java
@@ -174,7 +174,7 @@ public class XmlBackendRepository implements BackendRepository {
private static String getFactoryAttribute(String queue,Element elem, String tag) throws RepositoryException {
NodeList children = elem.getElementsByTagName(tag);
try {
- String attr = "";
+ String attr;
if (children.getLength() != 1 || (attr = ((Element)children.item(0)).getAttribute("factory")) == "") {
throw new RepositoryException("Could not find exactly one "+tag+", with factory set, in queue: "+queue);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/resource/src/main/java/org/apache/oodt/cas/resource/noderepo/XmlNodeRepository.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/noderepo/XmlNodeRepository.java b/resource/src/main/java/org/apache/oodt/cas/resource/noderepo/XmlNodeRepository.java
index 6adf58f..fd31062 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/noderepo/XmlNodeRepository.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/noderepo/XmlNodeRepository.java
@@ -77,7 +77,6 @@ public class XmlNodeRepository implements NodeRepository {
String nodesDirStr = nodesDir.getAbsolutePath();
if (!nodesDirStr.endsWith("/")) {
- nodesDirStr += "/";
}
// get all the workflow xml files
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/resource/src/main/java/org/apache/oodt/cas/resource/queuerepo/XmlQueueRepository.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/queuerepo/XmlQueueRepository.java b/resource/src/main/java/org/apache/oodt/cas/resource/queuerepo/XmlQueueRepository.java
index aad472c..cc8ba86 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/queuerepo/XmlQueueRepository.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/queuerepo/XmlQueueRepository.java
@@ -82,7 +82,6 @@ public class XmlQueueRepository implements QueueRepository {
String nodesDirStr = nodesDir.getAbsolutePath();
if (!nodesDirStr.endsWith("/")) {
- nodesDirStr += "/";
}
// get all the workflow xml files
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java b/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java
index d756292..698c871 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java
@@ -91,7 +91,7 @@ public class LRUScheduler implements Scheduler {
} catch (Exception ignore) {}
if (!myJobQueue.isEmpty()) {
- JobSpec exec = null;
+ JobSpec exec;
try {
exec = myJobQueue.getNextJob();
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java b/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java
index 1258c93..1f73aa8 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java
@@ -145,7 +145,7 @@ public class XmlRpcResourceManager {
}
public Hashtable getJobInfo(String jobId) throws JobRepositoryException {
- JobSpec spec = null;
+ JobSpec spec;
try {
spec = scheduler.getJobQueue().getJobRepository()
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/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 835aba9..5add384 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
@@ -130,8 +130,8 @@ public class XmlRpcBatchStub {
}
private boolean genericExecuteJob(Hashtable jobHash, Object jobInput) {
- JobInstance exec = null;
- JobInput in = null;
+ JobInstance exec;
+ JobInput in;
try {
Job job = XmlRpcStructFactory.getJobFromXmlRpc(jobHash);
@@ -162,7 +162,6 @@ public class XmlRpcBatchStub {
synchronized (jobThreadMap) {
Thread endThread = (Thread) jobThreadMap.get(job.getId());
if (endThread != null)
- endThread = null;
}
return false;
}
@@ -170,7 +169,6 @@ public class XmlRpcBatchStub {
synchronized (jobThreadMap) {
Thread endThread = (Thread) jobThreadMap.get(job.getId());
if (endThread != null)
- endThread = null;
}
return runner.wasSuccessful();
[06/16] oodt git commit: OODT-904 remove redundant throws
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/product/src/main/java/org/apache/oodt/product/LargeProductQueryHandler.java
----------------------------------------------------------------------
diff --git a/product/src/main/java/org/apache/oodt/product/LargeProductQueryHandler.java b/product/src/main/java/org/apache/oodt/product/LargeProductQueryHandler.java
index 58f3d7c..029e9ce 100644
--- a/product/src/main/java/org/apache/oodt/product/LargeProductQueryHandler.java
+++ b/product/src/main/java/org/apache/oodt/product/LargeProductQueryHandler.java
@@ -53,5 +53,5 @@ public interface LargeProductQueryHandler extends QueryHandler {
* @param id Product ID.
* @throws ProductException if an error occurs.
*/
- void close(String id) throws ProductException;
+ void close(String id);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandler.java
----------------------------------------------------------------------
diff --git a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandler.java b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandler.java
index ab5c447..31a3218 100644
--- a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandler.java
+++ b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandler.java
@@ -171,7 +171,7 @@ public class OFSNFileHandler implements LargeProductQueryHandler,
*
* @see org.apache.oodt.product.LargeProductQueryHandler#close(java.lang.String)
*/
- public void close(String id) throws ProductException {
+ public void close(String id) {
// nothing to do
}
@@ -249,7 +249,7 @@ public class OFSNFileHandler implements LargeProductQueryHandler,
return cfg.getType().equals(LISTING_CMD);
}
- private boolean isGetCmd(String cmd) throws ProductException {
+ private boolean isGetCmd(String cmd) {
OFSNHandlerConfig cfg = this.conf.getHandlerConfig(cmd);
return cfg.getType().equals(GET_CMD);
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java b/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java
index f2b1eb4..28a9b9c 100755
--- a/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java
+++ b/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java
@@ -64,7 +64,7 @@ public abstract class DatabaseProfileManager implements ProfileManager
* @return The profiles in the database, as a list.
* @throws ProfileException If an error occurs.
*/
- public abstract List getProfiles(Connection conn) throws ProfileException;
+ public abstract List getProfiles(Connection conn);
Connection conn;
Properties props;
@@ -107,7 +107,7 @@ public abstract class DatabaseProfileManager implements ProfileManager
}
}
- public abstract List findProfiles(Connection conn, XMLQuery query) throws DOMException, ProfileException;
+ public abstract List findProfiles(Connection conn, XMLQuery query) throws DOMException;
public void add(Profile profile) throws ProfileException {
@@ -122,7 +122,7 @@ public abstract class DatabaseProfileManager implements ProfileManager
throw new ProfileSQLException (e);
}
}
- public abstract void add(Connection conn, Profile profile) throws ProfileException ;
+ public abstract void add(Connection conn, Profile profile);
public void addAll(Collection collection) throws ProfileException
@@ -143,9 +143,9 @@ public abstract class DatabaseProfileManager implements ProfileManager
}
}
- public abstract void addAll(Connection conn,Collection collection) throws ProfileException;
+ public abstract void addAll(Connection conn,Collection collection);
- public abstract void clear(Connection conn) throws ProfileException ;
+ public abstract void clear(Connection conn);
public void clear() throws ProfileException
{
@@ -161,14 +161,14 @@ public abstract class DatabaseProfileManager implements ProfileManager
throw new ProfileSQLException (e);
}
}
- public boolean contains(Profile profile) throws ProfileException {
+ public boolean contains(Profile profile) {
throw new UnsupportedOperationException("Not yet implemented");
}
- public boolean containsAll(Collection collection) throws ProfileException {
+ public boolean containsAll(Collection collection) {
throw new UnsupportedOperationException("Not yet implemented");
}
- public abstract Profile get(Connection conn, String profID) throws ProfileException;
+ public abstract Profile get(Connection conn, String profID);
public Profile get(String profId) throws ProfileException {
// Create database connection
@@ -183,20 +183,20 @@ public abstract class DatabaseProfileManager implements ProfileManager
}
}
- public Collection getAll() throws ProfileException {
+ public Collection getAll() {
throw new UnsupportedOperationException("Not yet implemented");
}
- public boolean isEmpty() throws ProfileException {
+ public boolean isEmpty() {
throw new UnsupportedOperationException("Not yet implemented");
}
- public Iterator iterator() throws ProfileException {
+ public Iterator iterator() {
throw new UnsupportedOperationException("Not yet implemented");
}
public abstract boolean remove(Connection conn, String profId, String version)
- throws ProfileException;
+ ;
- public abstract boolean remove(Connection conn, String profId) throws ProfileException;
+ public abstract boolean remove(Connection conn, String profId);
public boolean remove(String profId, String version) throws ProfileException
@@ -242,7 +242,7 @@ public abstract class DatabaseProfileManager implements ProfileManager
}
- public abstract int size(Connection conn) throws ProfileException ;
+ public abstract int size(Connection conn);
public void replace(Profile profile) throws ProfileException {
// Create database connection
@@ -257,7 +257,7 @@ public abstract class DatabaseProfileManager implements ProfileManager
throw new ProfileException(e.getMessage());
}
}
- public abstract void replace(Connection conn, Profile profile) throws ProfileException ;
+ public abstract void replace(Connection conn, Profile profile);
protected static Connection openConnection(Properties props) throws SQLException, ProfileException
{
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileManager.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileManager.java b/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileManager.java
index c5aa987..13d0ba6 100755
--- a/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileManager.java
+++ b/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileManager.java
@@ -66,7 +66,7 @@ public interface ProfileManager extends ProfileHandler {
* @return True if <var>profile</var> is present in the server, false otherwise.
* @throws ProfileException If any error occurs.
*/
- boolean contains(Profile profile) throws ProfileException;
+ boolean contains(Profile profile);
/**
* Tell if the given collection of profiles are managed by this server.
@@ -76,7 +76,7 @@ public interface ProfileManager extends ProfileHandler {
* the server, false otherwise.
* @throws ProfileException If any error occurs.
*/
- boolean containsAll(Collection collection) throws ProfileException;
+ boolean containsAll(Collection collection);
/**
* Get all profiles.
@@ -84,7 +84,7 @@ public interface ProfileManager extends ProfileHandler {
* @return A collection of profiles
* @throws ProfileException If any error occurs.
*/
- Collection getAll() throws ProfileException;
+ Collection getAll();
/**
* Tell if the set of profiles managed by this server is empty.
@@ -92,7 +92,7 @@ public interface ProfileManager extends ProfileHandler {
* @return True if there are no profiles in this server.
* @throws ProfileException If any error occurs.
*/
- boolean isEmpty() throws ProfileException;
+ boolean isEmpty();
/**
* Iterate over the available profiles.
@@ -104,7 +104,7 @@ public interface ProfileManager extends ProfileHandler {
* @return An iterator over {@link Profile}s.
* @throws ProfileException If any error occurs.
*/
- Iterator iterator() throws ProfileException;
+ Iterator iterator();
/**
* Remove the profile with the given ID.
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/protocol/api/src/main/java/org/apache/oodt/cas/protocol/cli/action/DownloadCliAction.java
----------------------------------------------------------------------
diff --git a/protocol/api/src/main/java/org/apache/oodt/cas/protocol/cli/action/DownloadCliAction.java b/protocol/api/src/main/java/org/apache/oodt/cas/protocol/cli/action/DownloadCliAction.java
index 7ed0b64..9497d02 100644
--- a/protocol/api/src/main/java/org/apache/oodt/cas/protocol/cli/action/DownloadCliAction.java
+++ b/protocol/api/src/main/java/org/apache/oodt/cas/protocol/cli/action/DownloadCliAction.java
@@ -68,7 +68,7 @@ public class DownloadCliAction extends ProtocolCliAction {
return usedProtocol;
}
- protected ProtocolFile createProtocolFile() throws URISyntaxException {
+ protected ProtocolFile createProtocolFile() {
return new ProtocolFile(uri.getPath(), false);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/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 8ee8e87..b09a4d7 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
@@ -304,7 +304,7 @@ public class ImapsProtocol implements Protocol {
}
private String getContentFromPlainText(Part p) throws MessagingException,
- IOException, DecoderException {
+ IOException {
StringBuilder content = new StringBuilder("");
if (p.isMimeType("text/plain")) {
content.append((String) p.getContent());
@@ -322,7 +322,7 @@ public class ImapsProtocol implements Protocol {
}
private String getContentFromHTML(Part p) throws MessagingException,
- IOException, DecoderException, SAXException, TikaException {
+ IOException, SAXException, TikaException {
StringBuilder content = new StringBuilder("");
if (p.isMimeType("multipart/*")) {
Multipart mp = (Multipart) p.getContent();
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/Config.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/Config.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/Config.java
index ddf35de..790f51b 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/Config.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/Config.java
@@ -173,8 +173,7 @@ public class Config implements ConfigMetKeys {
* @throws ClassNotFoundException
* @throws ClassNotFoundException
*/
- void loadProperties() throws ConfigException, InstantiationException,
- IOException, ClassNotFoundException {
+ void loadProperties() throws ConfigException, InstantiationException {
this.loadExternalConfigFiles();
this.loadProtocolTypes();
this.loadParserInfo();
@@ -228,7 +227,7 @@ public class Config implements ConfigMetKeys {
}
}
- void loadIngester() throws InstantiationException, ConfigException {
+ void loadIngester() throws ConfigException {
try {
String fmUrlStr = PropertiesUtils.getProperties(INGESTER_FM_URL,
new String[] { NO_FM_SPECIFIED })[0];
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java
index 5ff5e0e..135c6e5 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java
@@ -115,8 +115,7 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
* @throws SecurityException
*/
public Daemon(int rmiRegPort, int daemonID, Config config,
- DaemonInfo daemonInfo, SiteInfo siteInfo) throws RemoteException,
- InstantiationException {
+ DaemonInfo daemonInfo, SiteInfo siteInfo) throws RemoteException {
super();
this.rmiRegPort = rmiRegPort;
@@ -155,8 +154,7 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
return "Daemon" + this.getDaemonID();
}
- private void registerRMIServer() throws RemoteException,
- MalformedURLException, NotBoundException, AlreadyBoundException {
+ private void registerRMIServer() throws RemoteException {
try {
Naming.bind("//localhost:" + this.rmiRegPort + "/daemon"
+ this.getDaemonID(), this);
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonController.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonController.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonController.java
index 284e4ee..264e7cd 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonController.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonController.java
@@ -43,7 +43,7 @@ public class DaemonController {
*
* @throws InstantiationException
*/
- public DaemonController(String rmiUrl) throws RemoteException {
+ public DaemonController(String rmiUrl) {
try {
daemon = (DaemonRmiInterface) Naming.lookup(rmiUrl);
System.out.println(!daemon.getHasBeenToldToQuit());
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/GenericEmailParser.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/GenericEmailParser.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/GenericEmailParser.java
index e9c6318..3f74407 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/GenericEmailParser.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/GenericEmailParser.java
@@ -108,7 +108,7 @@ public class GenericEmailParser implements Parser {
return emailText.toString();
}
- private List<String> generateFilePaths(String emailText) throws ParserException {
+ private List<String> generateFilePaths(String emailText) {
List<String> filePaths = Lists.newArrayList();
Pattern pattern = Pattern.compile(filePattern);
Matcher m = pattern.matcher(emailText);
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolHandler.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolHandler.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolHandler.java
index 3bc9a3c..6a41dbb 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolHandler.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolHandler.java
@@ -122,7 +122,7 @@ public class ProtocolHandler {
}
private Protocol getAppropriateProtocol(RemoteSiteFile pFile,
- boolean allowReuse) throws ProtocolException, MalformedURLException {
+ boolean allowReuse) throws ProtocolException {
return this.getAppropriateProtocolBySite(pFile.getSite(), allowReuse);
}
@@ -238,8 +238,7 @@ public class ProtocolHandler {
}
private boolean passesDynamicDetection(PagingInfo pgInfo,
- List<RemoteSiteFile> newLS) throws MalformedURLException,
- ProtocolException {
+ List<RemoteSiteFile> newLS) {
return !(pgInfo.getSizeOfLastLS() != -1
&& (pgInfo.getSizeOfLastLS() != newLS.size() || (newLS.size() != 0
&& pgInfo.getPageLoc() < newLS.size() && (newLS.get(pgInfo
@@ -381,8 +380,7 @@ public class ProtocolHandler {
protocol.cdHome();
}
- public boolean isProtocolConnected(Protocol protocol)
- throws ProtocolException {
+ public boolean isProtocolConnected(Protocol protocol) {
return protocol.connected();
}
@@ -396,8 +394,7 @@ public class ProtocolHandler {
return this.getProtocolFileByProtocol(site, protocol, file, isDir);
}
- public synchronized boolean delete(Protocol protocol, RemoteSiteFile file)
- throws MalformedURLException, ProtocolException {
+ public synchronized boolean delete(Protocol protocol, RemoteSiteFile file) {
try {
PagingInfo pgInfo = this.getPagingInfo(file.getRemoteParent());
List<RemoteSiteFile> fileList = this.ls(protocol, file.getRemoteParent());
@@ -565,8 +562,7 @@ public class ProtocolHandler {
this.pFileAtPageLoc = null;
}
- synchronized void updatePageInfo(int newPageLoc, List<RemoteSiteFile> ls)
- throws MalformedURLException, ProtocolException {
+ synchronized void updatePageInfo(int newPageLoc, List<RemoteSiteFile> ls) {
this.sizeOfLastLS = ls.size();
this.pageLoc = newPageLoc < 0 ? 0 : newPageLoc;
this.pFileAtPageLoc = (this.sizeOfLastLS > 0 && newPageLoc < ls.size()) ? ls
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolPath.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolPath.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolPath.java
index d2aaf8e..7235e82 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolPath.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolPath.java
@@ -116,7 +116,7 @@ public class ProtocolPath implements Serializable {
return false;
}
- public String getParentDirPath() throws MalformedURLException {
+ public String getParentDirPath() {
if (path.length() <= 1)
return null;
return path.substring(0, path.lastIndexOf("/"));
@@ -126,7 +126,7 @@ public class ProtocolPath implements Serializable {
return (path + " isDir=" + this.isDir);
}
- public ProtocolPath getParentPath() throws MalformedURLException {
+ public ProtocolPath getParentPath() {
return new ProtocolPath(path.substring(0, path.lastIndexOf("/")), true);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/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 4dcaf97..3ccb510 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
@@ -226,7 +226,7 @@ public class FileRetrievalSystem {
*
* @throws ThreadEvaluatorException
*/
- void resetVariables() throws ThreadEvaluatorException {
+ void resetVariables() {
numberOfSessions = 0;
stagingAreas = new HashSet<File>();
avaliableSessions = new Vector<Protocol>();
@@ -277,7 +277,7 @@ public class FileRetrievalSystem {
}
public void changeToRoot(RemoteSite remoteSite) throws
- MalformedURLException, org.apache.oodt.cas.protocol.exceptions.ProtocolException {
+ org.apache.oodt.cas.protocol.exceptions.ProtocolException {
if (validate(remoteSite))
protocolHandler.cdToROOT(protocolHandler
.getAppropriateProtocolBySite(remoteSite, true));
@@ -285,8 +285,7 @@ public class FileRetrievalSystem {
throw new ProtocolException("Not a valid remote site " + remoteSite);
}
- public void changeToHOME(RemoteSite remoteSite) throws ProtocolException,
- MalformedURLException {
+ public void changeToHOME(RemoteSite remoteSite) throws ProtocolException {
if (validate(remoteSite))
protocolHandler.cdToHOME(protocolHandler
.getAppropriateProtocolBySite(remoteSite, true));
@@ -305,8 +304,7 @@ public class FileRetrievalSystem {
throw new ProtocolException("Not a valid remote site " + remoteSite);
}
- public void changeToDir(RemoteSiteFile pFile) throws ProtocolException,
- MalformedURLException {
+ public void changeToDir(RemoteSiteFile pFile) throws ProtocolException {
RemoteSite remoteSite = pFile.getSite();
if (validate(remoteSite))
protocolHandler.cd(protocolHandler.getAppropriateProtocolBySite(
@@ -335,8 +333,7 @@ public class FileRetrievalSystem {
}
public ProtocolFile getCurrentFile(RemoteSite remoteSite)
- throws ProtocolFileException, ProtocolException,
- MalformedURLException {
+ throws ProtocolException {
if (validate(remoteSite))
return protocolHandler.pwd(remoteSite, protocolHandler
.getAppropriateProtocolBySite(remoteSite, true));
@@ -349,7 +346,7 @@ public class FileRetrievalSystem {
String renamingString, File downloadToDir,
String uniqueMetadataElement, boolean deleteAfterDownload, Metadata fileMetadata)
throws ToManyFailedDownloadsException, RemoteConnectionException,
- ProtocolFileException, ProtocolException,
+ ProtocolException,
AlreadyInDatabaseException, UndefinedTypeException,
CatalogException, IOException {
if (validate(remoteSite)) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RetrievalSetup.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RetrievalSetup.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RetrievalSetup.java
index c74ff20..147781e 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RetrievalSetup.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RetrievalSetup.java
@@ -71,8 +71,7 @@ public class RetrievalSetup {
linker = new DataFileToPropFileLinker();
}
- public void retrieveFiles(PropFilesInfo pfi, final DataFilesInfo dfi)
- throws RetrievalMethodException {
+ public void retrieveFiles(PropFilesInfo pfi, final DataFilesInfo dfi) {
FileRetrievalSystem dataFilesFRS = null;
try {
@@ -147,8 +146,7 @@ public class RetrievalSetup {
}
}
- private void startPropFileDownload(final PropFilesInfo pfi)
- throws IOException {
+ private void startPropFileDownload(final PropFilesInfo pfi) {
if (pfi.needsToBeDownloaded()) {
this.downloadingProps = true;
new Thread(new Runnable() {
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobQueue.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobQueue.java b/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobQueue.java
index 41ff6f4..8c6cdbc 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobQueue.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobQueue.java
@@ -65,7 +65,7 @@ public interface JobQueue {
* @throws JobQueueException
* If there is any error obtaining the queued jobs.
*/
- List getQueuedJobs() throws JobQueueException;
+ List getQueuedJobs();
/**
* Purges all {@link JobSpec}s from the queue.
@@ -73,7 +73,7 @@ public interface JobQueue {
* @throws JobQueueException
* If there is any error purging all the {@link JobSpec}s.
*/
- void purge() throws JobQueueException;
+ void purge();
/**
* Returns a boolean value representing whether or not the queue is empty.
@@ -90,7 +90,7 @@ public interface JobQueue {
* @throws JobQueueException
* If there is any error getting the next {@link JobSpec}.
*/
- JobSpec getNextJob() throws JobQueueException;
+ JobSpec getNextJob();
/**
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobStack.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobStack.java b/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobStack.java
index bc95c23..5118a72 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobStack.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobStack.java
@@ -102,7 +102,7 @@ public class JobStack implements JobQueue {
*
* @see org.apache.oodt.cas.resource.jobqueue.JobQueue#getQueuedJobs()
*/
- public List getQueuedJobs() throws JobQueueException {
+ public List getQueuedJobs() {
return queue;
}
@@ -111,7 +111,7 @@ public class JobStack implements JobQueue {
*
* @see org.apache.oodt.cas.resource.jobqueue.JobQueue#purge()
*/
- public void purge() throws JobQueueException {
+ public void purge() {
queue.removeAllElements();
//TODO: think about whether or not it makes
//sense to do something with the JobRepository
@@ -128,7 +128,7 @@ public class JobStack implements JobQueue {
/* (non-Javadoc)
* @see org.apache.oodt.cas.resource.jobqueue.JobQueue#getNextJob()
*/
- public JobSpec getNextJob() throws JobQueueException {
+ public JobSpec getNextJob() {
JobSpec spec = (JobSpec)queue.remove(0);
// update its status since getNextJob is
// called by the scheduler when it is going
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/resource/src/main/java/org/apache/oodt/cas/resource/monitor/ganglia/GangliaResourceMonitor.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/monitor/ganglia/GangliaResourceMonitor.java b/resource/src/main/java/org/apache/oodt/cas/resource/monitor/ganglia/GangliaResourceMonitor.java
index 60343c9..5725a83 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/monitor/ganglia/GangliaResourceMonitor.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/monitor/ganglia/GangliaResourceMonitor.java
@@ -238,8 +238,7 @@ public class GangliaResourceMonitor implements Monitor {
return node;
}
- private void initGmetaNodes(String host, int port)
- throws MalformedURLException {
+ private void initGmetaNodes(String host, int port) {
this.addGmetadNode(host, port);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/QueueManager.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/QueueManager.java b/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/QueueManager.java
index d05430f..c6a7522 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/QueueManager.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/QueueManager.java
@@ -62,7 +62,7 @@ public class QueueManager {
this.queueToNodesMapping.put(queueName, nodes);
}
- public synchronized void addQueue(String queueName) throws QueueManagerException {
+ public synchronized void addQueue(String queueName) {
if (queueName != null && !this.queueToNodesMapping.containsKey(queueName))
this.queueToNodesMapping.put(queueName, new LinkedHashSet<String>());
}
@@ -74,11 +74,11 @@ public class QueueManager {
throw new QueueManagerException("Queue '" + queueName + "' does not exist");
}
- public synchronized List<String> getQueues() throws QueueManagerException {
+ public synchronized List<String> getQueues() {
return new Vector<String>(this.queueToNodesMapping.keySet());
}
- public synchronized List<String> getQueues(String nodeId) throws QueueManagerException {
+ public synchronized List<String> getQueues(String nodeId) {
Vector<String> queueNames = new Vector<String>();
for (String queueName : this.queueToNodesMapping.keySet())
if (this.queueToNodesMapping.get(queueName).contains(nodeId))
@@ -93,7 +93,7 @@ public class QueueManager {
throw new QueueManagerException("Queue '" + queueName + "' does not exist");
}
- public synchronized void removeQueue(String queueName) throws QueueManagerException {
+ public synchronized void removeQueue(String queueName) {
if (queueName != null)
this.queueToNodesMapping.remove(queueName);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/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 5e614ae..835aba9 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
@@ -62,7 +62,7 @@ public class XmlRpcBatchStub {
private static Map jobThreadMap = null;
- public XmlRpcBatchStub(int port) throws Exception {
+ public XmlRpcBatchStub(int port) {
webServerPort = port;
// start up the web server
@@ -129,8 +129,7 @@ public class XmlRpcBatchStub {
return true;
}
- private boolean genericExecuteJob(Hashtable jobHash, Object jobInput)
- throws JobException {
+ private boolean genericExecuteJob(Hashtable jobHash, Object jobInput) {
JobInstance exec = null;
JobInput in = null;
try {
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java
index edcdd19..7de8e20 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java
@@ -105,7 +105,7 @@ public class CASProductHandler implements LargeProductQueryHandler {
*
* @see org.apache.product.LargeProductQueryHandler#close(java.lang.String)
*/
- public void close(String id) throws ProductException {
+ public void close(String id) {
// doesn't really have to do anything b/c we're not going
// to keep anything open
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/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 58aba8d..5b4eb3b 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
@@ -140,7 +140,7 @@ public class RDFDatasetServlet extends HttpServlet {
}
public void doIt(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, java.io.IOException {
+ throws ServletException {
// need to know the type of product to get products for
String productTypeName = req.getParameter("type");
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/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 00f3293..d2fb2ac 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
@@ -144,7 +144,7 @@ public class RDFProductServlet extends HttpServlet {
}
public void doIt(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, java.io.IOException {
+ throws ServletException {
// need to know the type of product to get products for
String productTypeName = req.getParameter("type");
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java
index 6c9dff8..4cd8121 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java
@@ -126,8 +126,7 @@ public class WorkflowProcessorQueue {
}
}
- private WorkflowProcessor fromWorkflowInstance(WorkflowInstance inst)
- throws EngineException {
+ private WorkflowProcessor fromWorkflowInstance(WorkflowInstance inst) {
WorkflowProcessor processor = null;
if (processorCache.containsKey(inst.getId())) {
return processorCache.get(inst.getId());
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java
index eb99322..595c43a 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java
@@ -69,7 +69,7 @@ public class AsynchronousLocalEngineRunner extends AbstractEngineRunnerBase {
* .oodt.cas.workflow.engine.processor.TaskProcessor)
*/
@Override
- public void execute(final TaskProcessor taskProcessor) throws Exception {
+ public void execute(final TaskProcessor taskProcessor) {
Thread worker = new Thread() {
@Override
@@ -129,7 +129,7 @@ public class AsynchronousLocalEngineRunner extends AbstractEngineRunnerBase {
* @see org.apache.oodt.cas.workflow.engine.EngineRunner#shutdown()
*/
@Override
- public void shutdown() throws Exception {
+ public void shutdown() {
for (Thread worker : this.workerMap.values()) {
if (worker != null) {
worker.interrupt();
@@ -147,7 +147,7 @@ public class AsynchronousLocalEngineRunner extends AbstractEngineRunnerBase {
* .apache.oodt.cas.workflow.engine.processor.TaskProcessor)
*/
@Override
- public boolean hasOpenSlots(TaskProcessor taskProcessor) throws Exception {
+ public boolean hasOpenSlots(TaskProcessor taskProcessor) {
// TODO Auto-generated method stub
return true;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/EngineRunner.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/EngineRunner.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/EngineRunner.java
index 9bf4f94..cb1d17e 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/EngineRunner.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/EngineRunner.java
@@ -44,7 +44,7 @@ public abstract class EngineRunner {
* If any error occurs.
*/
public abstract void execute(TaskProcessor taskProcessor)
- throws Exception;
+ ;
/**
* Shuts this runner down and frees its resources.
@@ -53,7 +53,7 @@ public abstract class EngineRunner {
* If any error occurs while freeing resources.
*
*/
- public abstract void shutdown() throws Exception;
+ public abstract void shutdown();
/**
* Decides whether or not there are available slots within this runner
@@ -63,7 +63,7 @@ public abstract class EngineRunner {
* @return True if there is an open slot, false otherwise.
* @throws Exception If any error occurs.
*/
- public abstract boolean hasOpenSlots(TaskProcessor taskProcessor) throws Exception;
+ public abstract boolean hasOpenSlots(TaskProcessor taskProcessor);
public abstract void setInstanceRepository(WorkflowInstanceRepository instRep);
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/ResourceRunner.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/ResourceRunner.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/ResourceRunner.java
index 4366d2d..1f5267a 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/ResourceRunner.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/ResourceRunner.java
@@ -63,7 +63,7 @@ public class ResourceRunner extends AbstractEngineRunnerBase implements CoreMetK
* @see org.apache.oodt.cas.workflow.engine.runner.EngineRunner#execute(org.apache.oodt.cas.workflow.engine.processor.TaskProcessor)
*/
@Override
- public void execute(TaskProcessor taskProcessor) throws Exception {
+ public void execute(TaskProcessor taskProcessor) {
Job workflowTaskJob = new Job();
WorkflowTask workflowTask = getTaskFromProcessor(taskProcessor);
workflowTaskJob.setName(workflowTask.getTaskId());
@@ -102,7 +102,7 @@ public class ResourceRunner extends AbstractEngineRunnerBase implements CoreMetK
* @see org.apache.oodt.cas.workflow.engine.EngineRunner#shutdown()
*/
@Override
- public void shutdown() throws Exception {
+ public void shutdown() {
// TODO Auto-generated method stub
}
@@ -112,7 +112,7 @@ public class ResourceRunner extends AbstractEngineRunnerBase implements CoreMetK
* @see org.apache.oodt.cas.workflow.engine.runner.EngineRunner#hasOpenSlots(org.apache.oodt.cas.workflow.engine.processor.TaskProcessor)
*/
@Override
- public boolean hasOpenSlots(TaskProcessor taskProcessor) throws Exception {
+ public boolean hasOpenSlots(TaskProcessor taskProcessor) {
// TODO Auto-generated method stub
return false;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java
index dd90b60..a93bb73 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java
@@ -390,7 +390,7 @@ public class PackagedWorkflowRepository implements WorkflowRepository {
}
}
- private void computeWorkflowConditions() throws Exception {
+ private void computeWorkflowConditions() {
if (this.workflows != null && this.workflows.values().size() > 0) {
for (ParentChildWorkflow w : this.workflows.values()) {
if (w.getConditions() != null && w.getConditions().size() > 0) {
@@ -579,7 +579,7 @@ public class PackagedWorkflowRepository implements WorkflowRepository {
}
private void expandWorkflowTasksAndConditions(Graph graph,
- Metadata staticMetadata) throws Exception {
+ Metadata staticMetadata) {
if (graph.getExecutionType().equals("workflow")
|| graph.getExecutionType().equals("sequential")
|| graph.getExecutionType().equals("parallel")) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/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 8945059..2d4c9db 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
@@ -108,8 +108,7 @@ public class XmlRpcWorkflowManager {
return false;
}
- public boolean refreshRepository()
- throws RepositoryException {
+ public boolean refreshRepository() {
repo = getWorkflowRepositoryFromProperty();
return true;
}
@@ -318,8 +317,7 @@ public class XmlRpcWorkflowManager {
return false;
}
- public Hashtable getWorkflowInstanceById(String wInstId)
- throws EngineException {
+ public Hashtable getWorkflowInstanceById(String wInstId) {
WorkflowInstance inst = null;
try {
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/MockWorkflowRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/MockWorkflowRepository.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/MockWorkflowRepository.java
index 7d8bea5..1265f2f 100644
--- a/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/MockWorkflowRepository.java
+++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/MockWorkflowRepository.java
@@ -272,8 +272,7 @@ public class MockWorkflowRepository implements WorkflowRepository {
return tasks.get(taskId);
}
- public WorkflowTask getWorkflowTaskByName(String taskName)
- throws RepositoryException {
+ public WorkflowTask getWorkflowTaskByName(String taskName) {
Validate.notNull(taskName);
for (WorkflowTask task : tasks.values()) {
[07/16] oodt git commit: OODT-904 remove redundant throws
Posted by ma...@apache.org.
OODT-904 remove redundant throws
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/ed6be8c7
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/ed6be8c7
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/ed6be8c7
Branch: refs/heads/master
Commit: ed6be8c7c9cf14d22c50d6639ef36c79f965ba8d
Parents: 1781060
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Oct 25 15:44:55 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Oct 25 15:44:55 2015 +0000
----------------------------------------------------------------------
.../model/repo/XmlWorkflowModelRepository.java | 6 ++--
.../gui/perspective/build/BuildPerspective.java | 31 +++++++++---------
.../catalog/mapping/DataSourceIngestMapper.java | 2 +-
.../conv/AsciiSortableVersionConverter.java | 2 +-
.../filter/time/conv/VersionConverter.java | 2 +-
.../catalog/repository/CatalogRepository.java | 2 +-
.../MemoryBasedCatalogRepository.java | 9 ++----
.../repository/SerializedCatalogRepository.java | 6 ++--
.../repository/SpringCatalogRepository.java | 2 +-
.../server/CatalogServiceServerLauncher.java | 2 +-
.../channel/CommunicationChannelServer.java | 6 ++--
.../RmiCommunicationChannelClientInterface.java | 2 +-
.../rmi/RmiCommunicationChannelServer.java | 8 ++---
.../XmlRpcCommunicationChannelServer.java | 2 +-
.../oodt/cas/catalog/struct/Dictionary.java | 6 ++--
.../apache/oodt/cas/catalog/struct/Index.java | 8 ++---
.../dictionary/WorkflowManagerDictionary.java | 9 ++----
.../struct/impl/index/DataSourceIndex.java | 9 +++---
.../index/WorkflowManagerDataSourceIndex.java | 11 +++----
.../apache/oodt/cas/catalog/system/Catalog.java | 3 +-
.../system/impl/CatalogServiceLocal.java | 3 +-
.../system/impl/TestCatalogServiceLocal.java | 5 ++-
.../cli/option/store/CmdLineOptionStore.java | 2 +-
.../store/spring/SpringCmdLineOptionStore.java | 3 +-
.../oodt/cas/cli/parser/CmdLineParser.java | 2 +-
.../oodt/cas/cli/parser/StdCmdLineParser.java | 2 +-
.../org/apache/oodt/commons/Initializer.java | 2 +-
.../activity/XMLStandardOutputStorage.java | 34 ++++++++++----------
.../oodt/commons/activity/XMLStorage.java | 34 ++++++++++----------
.../apache/oodt/commons/database/SqlScript.java | 4 +--
.../org/apache/oodt/commons/date/DateUtils.java | 4 +--
.../oodt/commons/io/LoggerOutputStream.java | 2 +-
.../org/apache/oodt/commons/util/DOMParser.java | 12 +++----
.../org/apache/oodt/commons/util/JDBC_DB.java | 6 ++--
.../org/apache/oodt/commons/util/SAXParser.java | 10 +++---
.../java/org/apache/oodt/commons/util/XML.java | 2 +-
.../oodt/cas/crawl/action/ExternAction.java | 2 +-
.../oodt/cas/crawl/action/FileBasedAction.java | 2 +-
.../oodt/cas/crawl/action/IngestAncillary.java | 3 +-
.../cas/curation/service/MetadataResource.java | 2 +-
.../oodt/cas/filemgr/catalog/Catalog.java | 2 +-
.../cas/filemgr/catalog/DataSourceCatalog.java | 2 +-
.../oodt/cas/filemgr/catalog/LuceneCatalog.java | 2 +-
.../cas/filemgr/catalog/ScienceDataCatalog.java | 2 +-
.../cas/filemgr/catalog/solr/SolrCatalog.java | 2 +-
.../datatransfer/RemoteDataTransferFactory.java | 2 +-
.../oodt/cas/filemgr/ingest/Ingester.java | 2 +-
.../oodt/cas/filemgr/ingest/StdIngester.java | 2 +-
.../DataSourceRepositoryManagerFactory.java | 2 +-
.../cas/filemgr/system/XmlRpcFileManager.java | 4 +--
.../cas/filemgr/system/auth/Dispatcher.java | 2 +-
.../filemgr/system/auth/SecureWebServer.java | 2 +-
.../filemgr/tools/OptimizeLuceneCatalog.java | 2 +-
.../oodt/cas/filemgr/tools/SolrIndexer.java | 6 ++--
.../DataSourceValidationLayerFactory.java | 2 +-
.../filemgr/validation/XMLValidationLayer.java | 9 ++----
.../oodt/cas/filemgr/catalog/MockCatalog.java | 2 +-
.../apache/oodt/grid/ProductQueryServlet.java | 2 +-
.../apache/oodt/grid/ProfileQueryServlet.java | 2 +-
.../java/org/apache/oodt/grid/QueryServlet.java | 2 +-
.../metadata/extractors/ExternMetExtractor.java | 2 +-
.../apache/oodt/pcs/input/PGEXMLFileUtils.java | 5 ++-
.../java/org/apache/oodt/cas/pge/PGETask.java | 4 +--
.../apache/oodt/cas/pge/PGETaskInstance.java | 15 ++++-----
.../apache/oodt/cas/pge/staging/FileStager.java | 2 +-
.../org/apache/oodt/cas/pge/util/XmlHelper.java | 6 ++--
.../oodt/product/LargeProductQueryHandler.java | 2 +-
.../product/handlers/ofsn/OFSNFileHandler.java | 4 +--
.../handlers/DatabaseProfileManager.java | 30 ++++++++---------
.../oodt/profile/handlers/ProfileManager.java | 10 +++---
.../protocol/cli/action/DownloadCliAction.java | 2 +-
.../oodt/cas/protocol/imaps/ImapsProtocol.java | 4 +--
.../apache/oodt/cas/pushpull/config/Config.java | 5 ++-
.../apache/oodt/cas/pushpull/daemon/Daemon.java | 6 ++--
.../cas/pushpull/daemon/DaemonController.java | 2 +-
.../parsers/GenericEmailParser.java | 2 +-
.../cas/pushpull/protocol/ProtocolHandler.java | 14 +++-----
.../cas/pushpull/protocol/ProtocolPath.java | 4 +--
.../retrievalsystem/FileRetrievalSystem.java | 15 ++++-----
.../retrievalsystem/RetrievalSetup.java | 6 ++--
.../oodt/cas/resource/jobqueue/JobQueue.java | 6 ++--
.../oodt/cas/resource/jobqueue/JobStack.java | 6 ++--
.../monitor/ganglia/GangliaResourceMonitor.java | 3 +-
.../cas/resource/scheduler/QueueManager.java | 8 ++---
.../resource/system/extern/XmlRpcBatchStub.java | 5 ++-
.../oodt/cas/product/CASProductHandler.java | 2 +-
.../oodt/cas/product/rdf/RDFDatasetServlet.java | 2 +-
.../oodt/cas/product/rdf/RDFProductServlet.java | 2 +-
.../processor/WorkflowProcessorQueue.java | 3 +-
.../runner/AsynchronousLocalEngineRunner.java | 6 ++--
.../workflow/engine/runner/EngineRunner.java | 6 ++--
.../workflow/engine/runner/ResourceRunner.java | 6 ++--
.../repository/PackagedWorkflowRepository.java | 4 +--
.../workflow/system/XmlRpcWorkflowManager.java | 6 ++--
.../repository/MockWorkflowRepository.java | 3 +-
95 files changed, 242 insertions(+), 283 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/model/repo/XmlWorkflowModelRepository.java
----------------------------------------------------------------------
diff --git a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/model/repo/XmlWorkflowModelRepository.java b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/model/repo/XmlWorkflowModelRepository.java
index 2767d60..f1d663b 100644
--- a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/model/repo/XmlWorkflowModelRepository.java
+++ b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/model/repo/XmlWorkflowModelRepository.java
@@ -196,8 +196,7 @@ public class XmlWorkflowModelRepository {
}
}
- private void saveGraph(ModelGraph graph, Element parentElem, Document document)
- throws FileNotFoundException, ParserConfigurationException {
+ private void saveGraph(ModelGraph graph, Element parentElem, Document document) {
ModelNode node = graph.getModel();
Element workflowElem = document.createElement(node.getExecutionType());
@@ -496,8 +495,7 @@ public class XmlWorkflowModelRepository {
}
private Metadata loadConfiguration(List<FileBasedElement> rootElements,
- Node configNode, HashMap<String, ConfigGroup> globalConfGroups)
- throws Exception {
+ Node configNode, HashMap<String, ConfigGroup> globalConfGroups) {
Metadata curMetadata = new Metadata();
NodeList curGrandChildren = configNode.getChildNodes();
for (int k = 0; k < curGrandChildren.getLength(); k++) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/build/BuildPerspective.java
----------------------------------------------------------------------
diff --git a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/build/BuildPerspective.java b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/build/BuildPerspective.java
index 2d7416b..cace96e 100644
--- a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/build/BuildPerspective.java
+++ b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/build/BuildPerspective.java
@@ -18,6 +18,20 @@
package org.apache.oodt.cas.workflow.gui.perspective.build;
//JDK imports
+import org.apache.oodt.cas.workflow.gui.model.ModelGraph;
+import org.apache.oodt.cas.workflow.gui.perspective.MultiStatePerspective;
+import org.apache.oodt.cas.workflow.gui.perspective.view.MultiStateView;
+import org.apache.oodt.cas.workflow.gui.perspective.view.View;
+import org.apache.oodt.cas.workflow.gui.perspective.view.ViewChange;
+import org.apache.oodt.cas.workflow.gui.perspective.view.ViewListener;
+import org.apache.oodt.cas.workflow.gui.perspective.view.ViewState;
+import org.apache.oodt.cas.workflow.gui.perspective.view.impl.DefaultPropView;
+import org.apache.oodt.cas.workflow.gui.perspective.view.impl.DefaultTreeView;
+import org.apache.oodt.cas.workflow.gui.perspective.view.impl.GlobalConfigView;
+import org.apache.oodt.cas.workflow.gui.perspective.view.impl.GraphView;
+import org.apache.oodt.cas.workflow.gui.perspective.view.impl.TreeProjectView;
+import org.apache.oodt.cas.workflow.gui.util.GuiUtils;
+
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.event.ActionEvent;
@@ -28,6 +42,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
+
import javax.swing.JMenuItem;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
@@ -37,19 +52,6 @@ import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
//OODT imports
-import org.apache.oodt.cas.workflow.gui.model.ModelGraph;
-import org.apache.oodt.cas.workflow.gui.perspective.MultiStatePerspective;
-import org.apache.oodt.cas.workflow.gui.perspective.view.MultiStateView;
-import org.apache.oodt.cas.workflow.gui.perspective.view.View;
-import org.apache.oodt.cas.workflow.gui.perspective.view.ViewChange;
-import org.apache.oodt.cas.workflow.gui.perspective.view.ViewListener;
-import org.apache.oodt.cas.workflow.gui.perspective.view.ViewState;
-import org.apache.oodt.cas.workflow.gui.perspective.view.impl.DefaultPropView;
-import org.apache.oodt.cas.workflow.gui.perspective.view.impl.DefaultTreeView;
-import org.apache.oodt.cas.workflow.gui.perspective.view.impl.GlobalConfigView;
-import org.apache.oodt.cas.workflow.gui.perspective.view.impl.GraphView;
-import org.apache.oodt.cas.workflow.gui.perspective.view.impl.TreeProjectView;
-import org.apache.oodt.cas.workflow.gui.util.GuiUtils;
/**
*
@@ -91,8 +93,7 @@ public class BuildPerspective extends MultiStatePerspective {
public BuildPerspective(Class<? extends View> projectViewClass,
Class<? extends View> mainViewClass, Class<? extends View> treeViewClass,
- Class<? extends View> propViewClass, Class<? extends View> globalViewClass)
- throws InstantiationException, IllegalAccessException {
+ Class<? extends View> propViewClass, Class<? extends View> globalViewClass) {
super("Build");
this.projectViewClass = projectViewClass;
this.mainViewClass = mainViewClass;
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapper.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapper.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapper.java
index 2f77735..081b6d6 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapper.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapper.java
@@ -51,7 +51,7 @@ public class DataSourceIngestMapper implements IngestMapper {
protected DataSource dataSource;
public DataSourceIngestMapper(String user, String pass, String driver,
- String jdbcUrl) throws InstantiationException {
+ String jdbcUrl) {
this.dataSource = DatabaseConnectionBuilder.buildDataSource(user, pass,
driver, jdbcUrl);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/AsciiSortableVersionConverter.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/AsciiSortableVersionConverter.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/AsciiSortableVersionConverter.java
index 0268930..80a649d 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/AsciiSortableVersionConverter.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/AsciiSortableVersionConverter.java
@@ -27,7 +27,7 @@ package org.apache.oodt.cas.catalog.query.filter.time.conv;
*/
public class AsciiSortableVersionConverter implements VersionConverter {
- public double convertToPriority(String version) throws Exception {
+ public double convertToPriority(String version) {
double priority = 0;
char[] versionCharArray = version.toCharArray();
for (int i = 0, j = versionCharArray.length - 1; i < versionCharArray.length; i++, j--)
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/VersionConverter.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/VersionConverter.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/VersionConverter.java
index 7f19ac8..69ac864 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/VersionConverter.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/VersionConverter.java
@@ -27,6 +27,6 @@ package org.apache.oodt.cas.catalog.query.filter.time.conv;
*/
public interface VersionConverter {
- double convertToPriority(String version) throws Exception;
+ double convertToPriority(String version);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepository.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepository.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepository.java
index b83c4ad..5fdc1f7 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepository.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepository.java
@@ -100,6 +100,6 @@ public interface CatalogRepository {
List<PluginURL> deserializePluginURLs()
throws CatalogRepositoryException;
- boolean isModifiable() throws CatalogRepositoryException;
+ boolean isModifiable();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/MemoryBasedCatalogRepository.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/MemoryBasedCatalogRepository.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/MemoryBasedCatalogRepository.java
index 4a82e98..16bbadb 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/MemoryBasedCatalogRepository.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/MemoryBasedCatalogRepository.java
@@ -77,8 +77,7 @@ public class MemoryBasedCatalogRepository implements CatalogRepository {
* org.apache.oodt.cas.catalog.repository.CatalogRepository#deserializeCatalog
* (java.lang.String)
*/
- public Catalog deserializeCatalog(String catalogUrn)
- throws CatalogRepositoryException {
+ public Catalog deserializeCatalog(String catalogUrn) {
return this.catalogMap.get(catalogUrn);
}
@@ -88,8 +87,7 @@ public class MemoryBasedCatalogRepository implements CatalogRepository {
* @seeorg.apache.oodt.cas.catalog.repository.CatalogRepository#
* isCatalogSerialized(java.lang.String)
*/
- public boolean isCatalogSerialized(String catalogUrn)
- throws CatalogRepositoryException {
+ public boolean isCatalogSerialized(String catalogUrn) {
return this.catalogMap.containsKey(catalogUrn);
}
@@ -115,8 +113,7 @@ public class MemoryBasedCatalogRepository implements CatalogRepository {
return new Vector<PluginURL>(this.classLoaderUrls);
}
- public boolean isModifiable()
- throws CatalogRepositoryException {
+ public boolean isModifiable() {
return true;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SerializedCatalogRepository.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SerializedCatalogRepository.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SerializedCatalogRepository.java
index b130280..7cbb8ff 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SerializedCatalogRepository.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SerializedCatalogRepository.java
@@ -111,8 +111,7 @@ public class SerializedCatalogRepository implements CatalogRepository {
* (non-Javadoc)
* @see org.apache.oodt.cas.catalog.repository.MemoryBasedCatalogRepository#isCatalogSerialized(java.lang.String)
*/
- public boolean isCatalogSerialized(String catalogUrn)
- throws CatalogRepositoryException {
+ public boolean isCatalogSerialized(String catalogUrn) {
return this.getCatalogFile(catalogUrn).exists();
}
@@ -177,8 +176,7 @@ public class SerializedCatalogRepository implements CatalogRepository {
}
}
- public boolean isModifiable()
- throws CatalogRepositoryException {
+ public boolean isModifiable() {
return true;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SpringCatalogRepository.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SpringCatalogRepository.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SpringCatalogRepository.java
index c78f7fb..029d235 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SpringCatalogRepository.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SpringCatalogRepository.java
@@ -64,7 +64,7 @@ public class SpringCatalogRepository implements CatalogRepository {
throw new CatalogRepositoryException("Modification not allowed during runtime");
}
- public boolean isModifiable() throws CatalogRepositoryException {
+ public boolean isModifiable() {
return false;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/server/CatalogServiceServerLauncher.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/CatalogServiceServerLauncher.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/CatalogServiceServerLauncher.java
index 4b911af..163bdca 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/CatalogServiceServerLauncher.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/CatalogServiceServerLauncher.java
@@ -32,7 +32,7 @@ import org.apache.oodt.cas.cli.CmdLineUtility;
*/
public class CatalogServiceServerLauncher {
- private CatalogServiceServerLauncher() throws InstantiationException {}
+ private CatalogServiceServerLauncher() {}
public static void main(String[] args) throws Exception {
// Load Catalog Service properties.
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServer.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServer.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServer.java
index 681208d..bfd43a1 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServer.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServer.java
@@ -43,13 +43,13 @@ import java.util.Set;
*/
public interface CommunicationChannelServer {
- void setCatalogService(CatalogService catalogService) throws Exception;
+ void setCatalogService(CatalogService catalogService);
- void setPort(int port) throws Exception;
+ void setPort(int port);
int getPort();
- void startup() throws Exception;
+ void startup();
void shutdown() throws Exception;
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientInterface.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientInterface.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientInterface.java
index 28a2d1a..97f261b 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientInterface.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientInterface.java
@@ -43,7 +43,7 @@ public interface RmiCommunicationChannelClientInterface extends Remote {
void setCatalogRepository(CatalogRepository catalogRepository);
- CatalogRepository getCatalogRepository() throws Exception;
+ CatalogRepository getCatalogRepository();
IngestMapper getIngestMapper() throws RemoteException;
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelServer.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelServer.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelServer.java
index 32a0610..c03000b 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelServer.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelServer.java
@@ -54,8 +54,7 @@ public class RmiCommunicationChannelServer implements
}
- public void startup()
- throws IOException {
+ public void startup() {
// TODO Auto-generated method stub
}
@@ -261,13 +260,12 @@ public class RmiCommunicationChannelServer implements
}
- public void setCatalogService(CatalogService catalogService)
- throws Exception {
+ public void setCatalogService(CatalogService catalogService) {
// TODO Auto-generated method stub
}
- public void setPort(int port) throws Exception {
+ public void setPort(int port) {
// TODO Auto-generated method stub
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/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 d26458d..77018b3 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
@@ -53,7 +53,7 @@ public class XmlRpcCommunicationChannelServer extends
super();
}
- public void startup() throws Exception {
+ public void startup() {
this.webServer = new WebServer(this.port);
this.webServer.addHandler(this.getClass().getSimpleName(), this);
this.webServer.start();
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Dictionary.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Dictionary.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Dictionary.java
index e5281fd..f415346 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Dictionary.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Dictionary.java
@@ -41,7 +41,7 @@ public interface Dictionary {
* @return TermBucket representing the given Metadata for this Dictionary or
* null if Metadata is not recognized by this Dictionary
*/
- TermBucket lookup(Metadata metadata) throws CatalogDictionaryException;
+ TermBucket lookup(Metadata metadata);
/**
* Generates Metadata for the given TermBucket. A call to lookup(Metadata) and
@@ -52,7 +52,7 @@ public interface Dictionary {
* @return Metadata for the given TermBucket. If the TermBucket is not understood,
* then an empty Metadata object should be returned.
*/
- Metadata reverseLookup(TermBucket termBucket) throws CatalogDictionaryException;
+ Metadata reverseLookup(TermBucket termBucket);
/**
*
@@ -60,6 +60,6 @@ public interface Dictionary {
* @return
* @throws CatalogDictionaryException
*/
- boolean understands(QueryExpression queryExpression) throws CatalogDictionaryException;
+ boolean understands(QueryExpression queryExpression);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Index.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Index.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Index.java
index 80fe4c1..1a8723f 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Index.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Index.java
@@ -36,9 +36,9 @@ import org.apache.oodt.cas.catalog.page.IndexPager;
*/
public interface Index {
- Properties getProperties() throws CatalogIndexException;
+ Properties getProperties();
- String getProperty(String key) throws CatalogIndexException;
+ String getProperty(String key);
/**
* Returns a list of TransactionIds associated with the
@@ -47,13 +47,13 @@ public interface Index {
* @return A page of TransactionIds, if page does not exist,
* then returns null.
*/
- List<TransactionId<?>> getPage(IndexPager indexPage) throws CatalogIndexException;
+ List<TransactionId<?>> getPage(IndexPager indexPage);
/**
*
* @return
*/
- TransactionIdFactory getTransactionIdFactory() throws CatalogIndexException;
+ TransactionIdFactory getTransactionIdFactory();
/**
*
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionary.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionary.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionary.java
index 5ffdf6d..4506dff 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionary.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionary.java
@@ -36,8 +36,7 @@ import java.util.Set;
*/
public class WorkflowManagerDictionary implements Dictionary {
- public TermBucket lookup(Metadata metadata)
- throws CatalogDictionaryException {
+ public TermBucket lookup(Metadata metadata) {
if (metadata.getMetadata("ProductType") != null && metadata.getAllMetadata("ProductType").contains("Workflows")) {
TermBucket workflowBucket = new TermBucket("Workflows");
for (Object key : metadata.getHashtable().keySet())
@@ -48,8 +47,7 @@ public class WorkflowManagerDictionary implements Dictionary {
}
}
- public Metadata reverseLookup(TermBucket termBucket)
- throws CatalogDictionaryException {
+ public Metadata reverseLookup(TermBucket termBucket) {
Metadata metadata = new Metadata();
if (termBucket.getName().equals("Workflows")) {
for (Term term : termBucket.getTerms())
@@ -58,8 +56,7 @@ public class WorkflowManagerDictionary implements Dictionary {
return metadata;
}
- public boolean understands(QueryExpression queryExpression)
- throws CatalogDictionaryException {
+ public boolean understands(QueryExpression queryExpression) {
Set<String> bucketNames = queryExpression.getBucketNames();
if (bucketNames == null || bucketNames.contains("Workflows")) {
return queryExpression instanceof NotQueryExpression
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndex.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndex.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndex.java
index e7083ed..8335de9 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndex.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndex.java
@@ -99,7 +99,7 @@ public class DataSourceIndex implements Index, IngestService, QueryService {
/**
* {@inheritDoc}
*/
- public List<TransactionId<?>> getPage(IndexPager indexPage) throws CatalogIndexException {
+ public List<TransactionId<?>> getPage(IndexPager indexPage) {
// Connection conn = null;
// Statement stmt = null;
// ResultSet rs = null;
@@ -133,22 +133,21 @@ public class DataSourceIndex implements Index, IngestService, QueryService {
/**
* {@inheritDoc}
*/
- public Properties getProperties() throws CatalogIndexException {
+ public Properties getProperties() {
return new Properties();
}
/**
* {@inheritDoc}
*/
- public String getProperty(String key) throws CatalogIndexException {
+ public String getProperty(String key) {
return null;
}
/**
* {@inheritDoc}
*/
- public TransactionIdFactory getTransactionIdFactory()
- throws CatalogIndexException {
+ public TransactionIdFactory getTransactionIdFactory() {
return new UuidTransactionIdFactory();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/WorkflowManagerDataSourceIndex.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/WorkflowManagerDataSourceIndex.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/WorkflowManagerDataSourceIndex.java
index 0facced..aaebda5 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/WorkflowManagerDataSourceIndex.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/WorkflowManagerDataSourceIndex.java
@@ -62,25 +62,24 @@ public class WorkflowManagerDataSourceIndex implements Index, QueryService {
protected DataSource dataSource;
- public WorkflowManagerDataSourceIndex(String user, String pass, String driver, String jdbcUrl) throws InstantiationException {
+ public WorkflowManagerDataSourceIndex(String user, String pass, String driver, String jdbcUrl) {
this.dataSource = DatabaseConnectionBuilder.buildDataSource(user, pass, driver, jdbcUrl);
}
- public List<TransactionId<?>> getPage(IndexPager indexPage)
- throws CatalogIndexException {
+ public List<TransactionId<?>> getPage(IndexPager indexPage) {
// TODO Auto-generated method stub
return null;
}
- public Properties getProperties() throws CatalogIndexException {
+ public Properties getProperties() {
return new Properties();
}
- public String getProperty(String key) throws CatalogIndexException {
+ public String getProperty(String key) {
return null;
}
- public TransactionIdFactory getTransactionIdFactory() throws CatalogIndexException {
+ public TransactionIdFactory getTransactionIdFactory() {
return new LongTransactionIdFactory();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/system/Catalog.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/Catalog.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/Catalog.java
index 2708e01..7a16067 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/Catalog.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/Catalog.java
@@ -111,7 +111,8 @@ public class Catalog {
return this.index.getPage(indexPage);
}
- public TransactionId<?> getTransactionIdFromString(String catalogTransactionId) throws IllegalArgumentException, SecurityException, InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException, CatalogIndexException {
+ public TransactionId<?> getTransactionIdFromString(String catalogTransactionId) throws IllegalArgumentException, SecurityException,
+ CatalogIndexException {
return this.getTransactionIdFactory().createTransactionId(catalogTransactionId);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
index 25fbac2..b67447b 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
@@ -1103,7 +1103,8 @@ TR: for (CatalogReceipt catalogReceipt : qr.getCatalogReceipts()) {
return catalogReceipts;
}
- protected QueryExpression reduceToUnderstoodExpressions(Catalog catalog, QueryExpression queryExpression) throws CatalogDictionaryException, CatalogException {
+ protected QueryExpression reduceToUnderstoodExpressions(Catalog catalog, QueryExpression queryExpression) throws
+ CatalogException {
if (queryExpression instanceof QueryLogicalGroup) {
QueryLogicalGroup queryLogicalGroup = (QueryLogicalGroup) queryExpression;
List<QueryExpression> restrictedExpressions = new Vector<QueryExpression>();
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/test/java/org/apache/oodt/cas/catalog/system/impl/TestCatalogServiceLocal.java
----------------------------------------------------------------------
diff --git a/catalog/src/test/java/org/apache/oodt/cas/catalog/system/impl/TestCatalogServiceLocal.java b/catalog/src/test/java/org/apache/oodt/cas/catalog/system/impl/TestCatalogServiceLocal.java
index 5bdaaf4..1a9fd24 100644
--- a/catalog/src/test/java/org/apache/oodt/cas/catalog/system/impl/TestCatalogServiceLocal.java
+++ b/catalog/src/test/java/org/apache/oodt/cas/catalog/system/impl/TestCatalogServiceLocal.java
@@ -168,7 +168,7 @@ public class TestCatalogServiceLocal extends TestCase {
}
private InMemoryIngestMapperFactory getOracleIngestMapperFactory(
- String tmpDirPath) throws SQLException, IOException {
+ String tmpDirPath) {
String user = "sa";
String pass = "";
String driver = "org.hsqldb.jdbcDriver";
@@ -183,8 +183,7 @@ public class TestCatalogServiceLocal extends TestCase {
return factory;
}
- private DataSourceIndexFactory getInMemoryDSFactory(String tmpDirPath)
- throws IOException, SQLException {
+ private DataSourceIndexFactory getInMemoryDSFactory(String tmpDirPath) {
String user = "sa";
String pass = "";
String driver = "org.hsqldb.jdbcDriver";
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/cli/src/main/java/org/apache/oodt/cas/cli/option/store/CmdLineOptionStore.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/option/store/CmdLineOptionStore.java b/cli/src/main/java/org/apache/oodt/cas/cli/option/store/CmdLineOptionStore.java
index 8e5b374..d6342d9 100644
--- a/cli/src/main/java/org/apache/oodt/cas/cli/option/store/CmdLineOptionStore.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/option/store/CmdLineOptionStore.java
@@ -31,6 +31,6 @@ import org.apache.oodt.cas.cli.option.CmdLineOption;
public interface CmdLineOptionStore {
Set<CmdLineOption> loadSupportedOptions()
- throws CmdLineOptionStoreException;
+ ;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/cli/src/main/java/org/apache/oodt/cas/cli/option/store/spring/SpringCmdLineOptionStore.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/option/store/spring/SpringCmdLineOptionStore.java b/cli/src/main/java/org/apache/oodt/cas/cli/option/store/spring/SpringCmdLineOptionStore.java
index f0b1b15..3af6a0d 100644
--- a/cli/src/main/java/org/apache/oodt/cas/cli/option/store/spring/SpringCmdLineOptionStore.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/option/store/spring/SpringCmdLineOptionStore.java
@@ -46,8 +46,7 @@ public class SpringCmdLineOptionStore implements CmdLineOptionStore {
}
@Override
- public Set<CmdLineOption> loadSupportedOptions()
- throws CmdLineOptionStoreException {
+ public Set<CmdLineOption> loadSupportedOptions() {
@SuppressWarnings("unchecked")
Map<String, CmdLineOption> optionsMap = appContext
.getBeansOfType(CmdLineOption.class);
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/cli/src/main/java/org/apache/oodt/cas/cli/parser/CmdLineParser.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/parser/CmdLineParser.java b/cli/src/main/java/org/apache/oodt/cas/cli/parser/CmdLineParser.java
index c8284f1..9a3be89 100644
--- a/cli/src/main/java/org/apache/oodt/cas/cli/parser/CmdLineParser.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/parser/CmdLineParser.java
@@ -31,6 +31,6 @@ import org.apache.oodt.cas.cli.util.ParsedArg;
*/
public interface CmdLineParser {
- List<ParsedArg> parse(String[] args) throws CmdLineParserException;
+ List<ParsedArg> parse(String[] args);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/cli/src/main/java/org/apache/oodt/cas/cli/parser/StdCmdLineParser.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/parser/StdCmdLineParser.java b/cli/src/main/java/org/apache/oodt/cas/cli/parser/StdCmdLineParser.java
index abb028e..2a77bb8 100755
--- a/cli/src/main/java/org/apache/oodt/cas/cli/parser/StdCmdLineParser.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/parser/StdCmdLineParser.java
@@ -51,7 +51,7 @@ import com.google.common.collect.Lists;
*/
public class StdCmdLineParser implements CmdLineParser {
- public List<ParsedArg> parse(String[] args) throws CmdLineParserException {
+ public List<ParsedArg> parse(String[] args) {
List<ParsedArg> parsedArgs = Lists.newArrayList();
for (String arg : args) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/commons/src/main/java/org/apache/oodt/commons/Initializer.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/Initializer.java b/commons/src/main/java/org/apache/oodt/commons/Initializer.java
index 1bb0301..67c2c4b 100644
--- a/commons/src/main/java/org/apache/oodt/commons/Initializer.java
+++ b/commons/src/main/java/org/apache/oodt/commons/Initializer.java
@@ -29,5 +29,5 @@ public interface Initializer {
*
* @throws EDAException if an error occurs.
*/
- void initialize() throws EDAException;
+ void initialize();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/commons/src/main/java/org/apache/oodt/commons/activity/XMLStandardOutputStorage.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/activity/XMLStandardOutputStorage.java b/commons/src/main/java/org/apache/oodt/commons/activity/XMLStandardOutputStorage.java
index 4449877..828c61e 100644
--- a/commons/src/main/java/org/apache/oodt/commons/activity/XMLStandardOutputStorage.java
+++ b/commons/src/main/java/org/apache/oodt/commons/activity/XMLStandardOutputStorage.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;
@@ -40,7 +40,7 @@ public class XMLStandardOutputStorage extends XMLStorage {
factory = TransformerFactory.newInstance();
}
- protected void saveDocument(Document doc) throws IOException {
+ protected void saveDocument(Document doc) {
try {
Transformer transformer = factory.newTransformer();
DOMSource source = new DOMSource(doc);
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.java b/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.java
index d171ac1..9d0c189 100644
--- a/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.java
+++ b/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.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;
@@ -71,7 +71,7 @@ public abstract class XMLStorage implements Storage {
* @param doc XML document containing the activity's incidents.
* @throws IOException if an error occurs.
*/
- protected abstract void saveDocument(Document doc) throws IOException;
+ protected abstract void saveDocument(Document doc);
/** Factory for document builders which we use to create XML documents. */
protected DocumentBuilderFactory factory;
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/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 d23f2d3..3a856be 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
@@ -56,7 +56,7 @@ public class SqlScript {
* @throws SQLException
*/
- public SqlScript(String scriptFileName, DataSource ds) throws SQLException {
+ public SqlScript(String scriptFileName, DataSource ds) {
script = new File(scriptFileName);
statementList = new Vector();
this.ds = ds;
@@ -132,7 +132,7 @@ public class SqlScript {
}
}
- public void execute() throws SQLException {
+ public void execute() {
if (useBatch) {
doExecuteBatch();
} else {
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java b/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java
index 4f31a67..cd22509 100644
--- a/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java
+++ b/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java
@@ -110,7 +110,7 @@ public class DateUtils {
return taiCal;
}
- private static synchronized Calendar taiToUtc(Calendar taiCal) throws Exception {
+ private static synchronized Calendar taiToUtc(Calendar taiCal) {
Calendar calUtc = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
calUtc.setTimeInMillis(taiCal.getTimeInMillis() - taiCal.getTimeZone().getRawOffset());
return calUtc;
@@ -144,7 +144,7 @@ public class DateUtils {
return toUtc(getCurrentLocalTime());
}
- public static Calendar getCurrentLocalTime() throws Exception {
+ public static Calendar getCurrentLocalTime() {
return Calendar.getInstance();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/commons/src/main/java/org/apache/oodt/commons/io/LoggerOutputStream.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/io/LoggerOutputStream.java b/commons/src/main/java/org/apache/oodt/commons/io/LoggerOutputStream.java
index fede09e..074e55c 100644
--- a/commons/src/main/java/org/apache/oodt/commons/io/LoggerOutputStream.java
+++ b/commons/src/main/java/org/apache/oodt/commons/io/LoggerOutputStream.java
@@ -54,7 +54,7 @@ public class LoggerOutputStream extends OutputStream {
}
public LoggerOutputStream(Logger logger, int numOfBytesPerWrite,
- Level logLevel) throws InstantiationException {
+ Level logLevel) {
this.logger = logger;
this.buffer = CharBuffer.wrap(new char[numOfBytesPerWrite]);
this.logLevel = logLevel;
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/commons/src/main/java/org/apache/oodt/commons/util/DOMParser.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/util/DOMParser.java b/commons/src/main/java/org/apache/oodt/commons/util/DOMParser.java
index 8f12bfb..38ee748 100644
--- a/commons/src/main/java/org/apache/oodt/commons/util/DOMParser.java
+++ b/commons/src/main/java/org/apache/oodt/commons/util/DOMParser.java
@@ -68,7 +68,7 @@ public class DOMParser {
}
/** Resets the parser. */
- public void reset() throws Exception {
+ public void reset() {
document = null;
}
@@ -91,7 +91,7 @@ public class DOMParser {
* known, but the requested state
* is not supported.
*/
- public void setFeature(String featureId, boolean state) throws SAXNotRecognizedException, SAXNotSupportedException {
+ public void setFeature(String featureId, boolean state) throws SAXNotSupportedException {
throw new SAXNotSupportedException("This parser supports no features");
}
@@ -107,7 +107,7 @@ public class DOMParser {
* @exception SAXNotRecognizedException If the requested feature is
* not known.
*/
- public boolean getFeature(String featureId) throws SAXNotRecognizedException, SAXNotSupportedException {
+ public boolean getFeature(String featureId) throws SAXNotSupportedException {
throw new SAXNotSupportedException("This parser supports no features");
}
@@ -126,7 +126,7 @@ public class DOMParser {
* known, but the requested
* value is not supported.
*/
- public void setProperty(String propertyId, Object value) throws SAXNotRecognizedException, SAXNotSupportedException {
+ public void setProperty(String propertyId, Object value) throws SAXNotSupportedException {
throw new SAXNotSupportedException("This parser supports no properties");
}
@@ -143,7 +143,7 @@ public class DOMParser {
* not known.
*
*/
- public Object getProperty(String propertyId) throws SAXNotRecognizedException, SAXNotSupportedException {
+ public Object getProperty(String propertyId) throws SAXNotSupportedException {
throw new SAXNotSupportedException("This parser supports no properties");
}
@@ -253,7 +253,7 @@ public class DOMParser {
* @exception SAXException An exception thrown if the parser does not
* support the specified locale.
*/
- public void setLocale(Locale locale) throws SAXException {
+ public void setLocale(Locale locale) {
throw new IllegalStateException("This parser does not support localized error messages");
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/commons/src/main/java/org/apache/oodt/commons/util/JDBC_DB.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/util/JDBC_DB.java b/commons/src/main/java/org/apache/oodt/commons/util/JDBC_DB.java
index 86b21ff..d9ecebe 100644
--- a/commons/src/main/java/org/apache/oodt/commons/util/JDBC_DB.java
+++ b/commons/src/main/java/org/apache/oodt/commons/util/JDBC_DB.java
@@ -52,8 +52,7 @@ public class JDBC_DB
*******************************************************************/
public JDBC_DB(
- java.util.Properties sys_props) throws SQLException
- {
+ java.util.Properties sys_props) {
serverProps = sys_props;
keep_connect_open = true;
@@ -62,8 +61,7 @@ public class JDBC_DB
public JDBC_DB(
java.util.Properties sys_props,
- Connection srv_connect) throws SQLException
- {
+ Connection srv_connect) {
serverProps = sys_props;
connect = srv_connect;
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/commons/src/main/java/org/apache/oodt/commons/util/SAXParser.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/util/SAXParser.java b/commons/src/main/java/org/apache/oodt/commons/util/SAXParser.java
index 949dc08..cff407c 100644
--- a/commons/src/main/java/org/apache/oodt/commons/util/SAXParser.java
+++ b/commons/src/main/java/org/apache/oodt/commons/util/SAXParser.java
@@ -72,7 +72,7 @@ public class SAXParser {
* known, but the requested state
* is not supported.
*/
- public void setFeature(String featureId, boolean state) throws SAXNotRecognizedException, SAXNotSupportedException {
+ public void setFeature(String featureId, boolean state) throws SAXNotSupportedException {
throw new SAXNotSupportedException("This parser supports no features");
}
@@ -88,7 +88,7 @@ public class SAXParser {
* @exception SAXNotRecognizedException If the requested feature is
* not known.
*/
- public boolean getFeature(String featureId) throws SAXNotRecognizedException, SAXNotSupportedException {
+ public boolean getFeature(String featureId) throws SAXNotSupportedException {
throw new SAXNotSupportedException("This parser supports no features");
}
@@ -107,7 +107,7 @@ public class SAXParser {
* known, but the requested
* value is not supported.
*/
- public void setProperty(String propertyId, Object value) throws SAXNotRecognizedException, SAXNotSupportedException {
+ public void setProperty(String propertyId, Object value) throws SAXNotSupportedException {
throw new SAXNotSupportedException("This parser supports no properties");
}
@@ -124,7 +124,7 @@ public class SAXParser {
* not known.
*
*/
- public Object getProperty(String propertyId) throws SAXNotRecognizedException, SAXNotSupportedException {
+ public Object getProperty(String propertyId) throws SAXNotSupportedException {
throw new SAXNotSupportedException("This parser supports no properties");
}
@@ -238,7 +238,7 @@ public class SAXParser {
* @exception SAXException An exception thrown if the parser does not
* support the specified locale.
*/
- public void setLocale(Locale locale) throws SAXException {
+ public void setLocale(Locale locale) {
throw new IllegalStateException("This parser doesn't support localized error messages");
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/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 6239946..e49c967 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
@@ -235,7 +235,7 @@ public class XML {
* @param omitXMLDeclaration True if we should omit the XML declaration, false to keep the XML declaration.
* @throws IOException If an I/O error occurs.
*/
- public static void serialize(Document doc, Writer writer, boolean omitXMLDeclaration) throws IOException {
+ public static void serialize(Document doc, Writer writer, boolean omitXMLDeclaration) {
try {
TransformerFactory factory = TransformerFactory.newInstance();
Transformer transformer = factory.newTransformer();
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/crawler/src/main/java/org/apache/oodt/cas/crawl/action/ExternAction.java
----------------------------------------------------------------------
diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/ExternAction.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/ExternAction.java
index bfbe5bb..f8713b4 100644
--- a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/ExternAction.java
+++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/ExternAction.java
@@ -73,7 +73,7 @@ public class ExternAction extends CrawlerAction {
this.executeCommand = executeCommand;
}
- public void setWorkingDir(String workingDir) throws Exception {
+ public void setWorkingDir(String workingDir) {
this.workingDir = workingDir;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/crawler/src/main/java/org/apache/oodt/cas/crawl/action/FileBasedAction.java
----------------------------------------------------------------------
diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/FileBasedAction.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/FileBasedAction.java
index e6d7da6..32e2648 100755
--- a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/FileBasedAction.java
+++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/FileBasedAction.java
@@ -109,5 +109,5 @@ public abstract class FileBasedAction extends CrawlerAction {
}
public abstract boolean performFileAction(File actionFile, Metadata metadata)
- throws CrawlerActionException;
+ ;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/crawler/src/main/java/org/apache/oodt/cas/crawl/action/IngestAncillary.java
----------------------------------------------------------------------
diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/IngestAncillary.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/IngestAncillary.java
index 7cacd66..905f51e 100755
--- a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/IngestAncillary.java
+++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/IngestAncillary.java
@@ -63,8 +63,7 @@ public class IngestAncillary extends FileBasedAction {
}
@Override
- public boolean performFileAction(File actionFile, Metadata metadata)
- throws CrawlerActionException {
+ public boolean performFileAction(File actionFile, Metadata metadata) {
Metadata ingestMetadata = new Metadata();
if (ancillaryMetadata != null) {
for (String key : this.ancillaryMetadata.keySet()) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/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 3d3ec1a..9e3a2c6 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
@@ -672,7 +672,7 @@ public class MetadataResource extends CurationService {
* If any error occurs during this delete operation.
*/
public void deleteCatalogProduct(Product product)
- throws IOException, CatalogException {
+ throws CatalogException {
CurationService.config.getFileManagerClient().removeProduct(product);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/Catalog.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/Catalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/Catalog.java
index 0a10fed..f056336 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/Catalog.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/Catalog.java
@@ -324,7 +324,7 @@ public interface Catalog extends Pagination {
* @throws CatalogException
* If any error occurs (e.g., the layer isn't initialized).
*/
- ValidationLayer getValidationLayer() throws CatalogException;
+ ValidationLayer getValidationLayer();
/**
*
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
index 896dbcd..44fd309 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
@@ -1325,7 +1325,7 @@ public class DataSourceCatalog implements Catalog {
*
* @see org.apache.oodt.cas.filemgr.catalog.Catalog#getValidationLayer()
*/
- public ValidationLayer getValidationLayer() throws CatalogException {
+ public ValidationLayer getValidationLayer() {
// note that validationLayer may be null to allow for leniency in subclasses
return validationLayer;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/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 843d226..89b8f1b 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
@@ -735,7 +735,7 @@ public class LuceneCatalog implements Catalog {
*
* @see org.apache.oodt.cas.filemgr.catalog.Catalog#getValidationLayer()
*/
- public ValidationLayer getValidationLayer() throws CatalogException {
+ public ValidationLayer getValidationLayer() {
return valLayer;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalog.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalog.java
index cf8268f..94b9868 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalog.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalog.java
@@ -732,7 +732,7 @@ public class ScienceDataCatalog implements Catalog {
return products;
}
- public ValidationLayer getValidationLayer() throws CatalogException {
+ public ValidationLayer getValidationLayer() {
return this.validationLayer;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/SolrCatalog.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/SolrCatalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/SolrCatalog.java
index 67c6532..9812605 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/SolrCatalog.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/SolrCatalog.java
@@ -468,7 +468,7 @@ public class SolrCatalog implements Catalog {
}
@Override
- public ValidationLayer getValidationLayer() throws CatalogException {
+ public ValidationLayer getValidationLayer() {
// FIXME: must parse Solr schema.xmnl from:
// http://localhost:8080/solr/admin/file/?contentType=text/xml;charset=utf-8&file=schema.xml
throw new RuntimeException("Method 'getValidationLayer' not yet implemented");
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/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 ecd89ab..a830781 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
@@ -42,7 +42,7 @@ public class RemoteDataTransferFactory implements DataTransferFactory {
/**
*
*/
- public RemoteDataTransferFactory() throws InstantiationException {
+ public RemoteDataTransferFactory() {
chunkSize = Integer.getInteger(
"org.apache.oodt.cas.filemgr.datatransfer.remote.chunkSize",
1024);
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Ingester.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Ingester.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Ingester.java
index c2251ea..b12dfd4 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Ingester.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Ingester.java
@@ -97,7 +97,7 @@ public interface Ingester {
* If there is an error ingesting the {@link Product}s.
*/
void ingest(URL fmUrl, List<String> prodFiles, MetExtractor extractor,
- File metConfFile) throws IngestException;
+ File metConfFile);
/**
* Checks the file manager at the given {@link URL} to see whether or not it
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java
index adc9b69..09ffe22 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java
@@ -116,7 +116,7 @@ public class StdIngester implements Ingester, CoreMetKeys {
* java.util.List, org.apache.oodt.cas.metadata.MetExtractor, java.io.File)
*/
public void ingest(URL fmUrl, List<String> prodFiles,
- MetExtractor extractor, File metConfFile) throws IngestException {
+ MetExtractor extractor, File metConfFile) {
if (prodFiles != null && prodFiles.size() > 0) {
for (Iterator<String> i = prodFiles.iterator(); i.hasNext();) {
String prodFilePath = i.next();
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/DataSourceRepositoryManagerFactory.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/DataSourceRepositoryManagerFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/DataSourceRepositoryManagerFactory.java
index d369bc9..9e36863 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/DataSourceRepositoryManagerFactory.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/DataSourceRepositoryManagerFactory.java
@@ -43,7 +43,7 @@ public class DataSourceRepositoryManagerFactory implements
* Default Constructor
* </p>.
*/
- public DataSourceRepositoryManagerFactory() throws Exception {
+ public DataSourceRepositoryManagerFactory() {
String jdbcUrl = null, user = null, pass = null, driver = null;
jdbcUrl = System
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
index 0adb7bf..04ad7c3 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
@@ -699,8 +699,8 @@ public class XmlRpcFileManager {
public String ingestProduct(Hashtable<String, Object> productHash,
Hashtable<String, String> metadata, boolean clientTransfer)
- throws VersioningException, RepositoryManagerException,
- DataTransferException, CatalogException {
+ throws
+ CatalogException {
Product p = XmlRpcStructFactory.getProductFromXmlRpc(productHash);
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/Dispatcher.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/Dispatcher.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/Dispatcher.java
index 5e5e564..94740f4 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/Dispatcher.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/Dispatcher.java
@@ -46,5 +46,5 @@ public interface Dispatcher {
* If any error occurs.
*/
Result handleRequest(String methodSpecifier, List params,
- String user, String password) throws Exception;
+ String user, String password);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/SecureWebServer.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/SecureWebServer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/SecureWebServer.java
index c6fc861..2008c8e 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/SecureWebServer.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/SecureWebServer.java
@@ -44,7 +44,7 @@ public final class SecureWebServer extends org.apache.xmlrpc.WebServer
* @throws IOException
* If any error occurs.
*/
- public SecureWebServer(int port) throws IOException {
+ public SecureWebServer(int port) {
super(port);
addHandler("$default", this);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/OptimizeLuceneCatalog.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/OptimizeLuceneCatalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/OptimizeLuceneCatalog.java
index d490e29..0b535e8 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/OptimizeLuceneCatalog.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/OptimizeLuceneCatalog.java
@@ -55,7 +55,7 @@ public class OptimizeLuceneCatalog {
this.mergeFactor = mf;
}
- public void doOptimize() throws Exception {
+ public void doOptimize() {
IndexWriter writer = null;
boolean createIndex = false;
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
index 609b6af..90d708e 100755
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
@@ -204,8 +204,8 @@ public class SolrIndexer {
* When an error occurs communicating with the Solr server instance.
*/
public void indexMetFile(File file, boolean delete)
- throws InstantiationException, IOException,
- SolrServerException {
+ throws
+ SolrServerException {
LOG.info("Attempting to index product from metadata file.");
try {
SerializableMetadata metadata = new SerializableMetadata("UTF-8", false);
@@ -497,7 +497,7 @@ public class SolrIndexer {
* @throws IOException
* @throws SolrServerException
*/
- public void deleteProductByName(String productName) throws IOException, SolrServerException {
+ public void deleteProductByName(String productName) {
LOG.info("Attempting to delete product: " + productName);
try {
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayerFactory.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayerFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayerFactory.java
index ee9547f..ef5ab15 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayerFactory.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayerFactory.java
@@ -44,7 +44,7 @@ public class DataSourceValidationLayerFactory implements ValidationLayerFactory
* Default Constructor
* </p>
*/
- public DataSourceValidationLayerFactory() throws Exception {
+ public DataSourceValidationLayerFactory() {
String jdbcUrl = null, user = null, pass = null, driver = null;
jdbcUrl = System
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java
index 81d5c2f..8627952 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java
@@ -221,8 +221,7 @@ public class XMLValidationLayer implements ValidationLayer {
* @throws ValidationLayerException
* If any error occurs
*/
- public List<Element> getElements(ProductType type, boolean direct)
- throws ValidationLayerException {
+ public List<Element> getElements(ProductType type, boolean direct) {
List<Element> elems = new Vector<Element>();
String currType = type.getProductTypeId();
if (productTypeElementMap.containsKey(currType)) {
@@ -257,8 +256,7 @@ public class XMLValidationLayer implements ValidationLayer {
* @throws ValidationLayerException
* If any error occurs
*/
- public void addParentForProductType(ProductType type, String parentId)
- throws ValidationLayerException {
+ public void addParentForProductType(ProductType type, String parentId) {
subToSuperMap.put(type.getProductTypeId(), parentId);
saveElementsAndMappings();
}
@@ -269,8 +267,7 @@ public class XMLValidationLayer implements ValidationLayer {
* @throws ValidationLayerException
* If any error occurs
*/
- public void removeParentForProductType(ProductType type)
- throws ValidationLayerException {
+ public void removeParentForProductType(ProductType type) {
subToSuperMap.remove(type.getProductTypeId());
saveElementsAndMappings();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/MockCatalog.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/MockCatalog.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/MockCatalog.java
index 6d8131c..a9bcbd7 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/MockCatalog.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/MockCatalog.java
@@ -176,7 +176,7 @@ public class MockCatalog implements Catalog {
}
@Override
- public ValidationLayer getValidationLayer() throws CatalogException {
+ public ValidationLayer getValidationLayer() {
return null;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/grid/src/main/java/org/apache/oodt/grid/ProductQueryServlet.java
----------------------------------------------------------------------
diff --git a/grid/src/main/java/org/apache/oodt/grid/ProductQueryServlet.java b/grid/src/main/java/org/apache/oodt/grid/ProductQueryServlet.java
index de411bf..8229e75 100755
--- a/grid/src/main/java/org/apache/oodt/grid/ProductQueryServlet.java
+++ b/grid/src/main/java/org/apache/oodt/grid/ProductQueryServlet.java
@@ -49,7 +49,7 @@ public class ProductQueryServlet extends QueryServlet {
/** {@inheritDoc} */
protected void handleQuery(XMLQuery query, List handlers, HttpServletRequest req, HttpServletResponse res)
- throws IOException, ServletException {
+ throws IOException {
if (handlers.isEmpty()) {
res.sendError(HttpServletResponse.SC_NOT_FOUND, "no query handlers available to handle query");
return;
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java
----------------------------------------------------------------------
diff --git a/grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java b/grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java
index b6dea55..80b1592 100755
--- a/grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java
+++ b/grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java
@@ -52,7 +52,7 @@ public class ProfileQueryServlet extends QueryServlet {
/** {@inheritDoc} */
protected void handleQuery(XMLQuery query, List handlers, HttpServletRequest req, HttpServletResponse res)
- throws IOException, ServletException {
+ throws IOException {
// Find if the query should be targeted to specific handlers.
Set ids = new HashSet();
if (query.getFromElementSet() != null) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/grid/src/main/java/org/apache/oodt/grid/QueryServlet.java
----------------------------------------------------------------------
diff --git a/grid/src/main/java/org/apache/oodt/grid/QueryServlet.java b/grid/src/main/java/org/apache/oodt/grid/QueryServlet.java
index a3a7ad3..f22c6a9 100755
--- a/grid/src/main/java/org/apache/oodt/grid/QueryServlet.java
+++ b/grid/src/main/java/org/apache/oodt/grid/QueryServlet.java
@@ -61,7 +61,7 @@ public abstract class QueryServlet extends GridServlet {
* @throws ServletException if a servlet error occurs.
*/
protected abstract void handleQuery(XMLQuery query, List handlers, HttpServletRequest req, HttpServletResponse res)
- throws IOException, ServletException;
+ throws IOException;
/**
* Treat GETs as POSTs.
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java
index 095f3d2..e151366 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java
@@ -52,7 +52,7 @@ public class ExternMetExtractor extends CmdLineMetExtractor implements
private static ExternConfigReader reader = new ExternConfigReader();
- public ExternMetExtractor() throws InstantiationException {
+ public ExternMetExtractor() {
super(reader);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEXMLFileUtils.java
----------------------------------------------------------------------
diff --git a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEXMLFileUtils.java b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEXMLFileUtils.java
index 815f63f..6d69d26 100644
--- a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEXMLFileUtils.java
+++ b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEXMLFileUtils.java
@@ -183,8 +183,7 @@ public final class PGEXMLFileUtils {
return matrixList;
}
- public static Map getScalarsAsMap(Element group)
- throws PGEConfigFileException {
+ public static Map getScalarsAsMap(Element group) {
// get the nodelist for scalars
NodeList scalars = group.getElementsByTagName("scalar");
@@ -212,7 +211,7 @@ public final class PGEXMLFileUtils {
return scalarMap;
}
- public static List getScalars(Element group) throws PGEConfigFileException {
+ public static List getScalars(Element group) {
// get the nodelist for scalars
NodeList scalars = group.getElementsByTagName("scalar");
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/pge/src/main/java/org/apache/oodt/cas/pge/PGETask.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/PGETask.java b/pge/src/main/java/org/apache/oodt/cas/pge/PGETask.java
index 0ef8a63..eb8242d 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/PGETask.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/PGETask.java
@@ -50,8 +50,8 @@ public class PGETask {
}
public void run(String pgeTaskInstanceClasspath)
- throws InstantiationException, IllegalAccessException,
- ClassNotFoundException, WorkflowTaskInstanceException {
+ throws
+ WorkflowTaskInstanceException {
PGETaskInstance pgeTaskInst = createPGETaskInstance(
pgeTaskInstanceClasspath, LOGGER);
pgeTaskInst.run(this.metadata, this.wftConfig);
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java b/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java
index 108892c..609b198 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java
@@ -176,7 +176,7 @@ public class PGETaskInstance implements WorkflowTaskInstance {
return logger;
}
- protected String createLogFileName() throws Exception {
+ protected String createLogFileName() {
String filenamePattern = pgeMetadata.getMetadata(LOG_FILENAME_PATTERN);
if (filenamePattern != null) {
return filenamePattern;
@@ -187,7 +187,7 @@ public class PGETaskInstance implements WorkflowTaskInstance {
}
protected PgeMetadata createPgeMetadata(Metadata dynMetadata,
- WorkflowTaskConfiguration config) throws Exception {
+ WorkflowTaskConfiguration config) {
logger.info("Converting workflow configuration to static metadata...");
Metadata staticMetadata = new Metadata();
for (Object objKey : config.getProperties().keySet()) {
@@ -251,13 +251,12 @@ public class PGETaskInstance implements WorkflowTaskInstance {
}
protected ConfigFilePropertyAdder loadPropertyAdder(
- String propertyAdderClasspath) throws Exception {
+ String propertyAdderClasspath) {
logger.fine("Loading property adder: " + propertyAdderClasspath);
return createConfigFilePropertyAdder(propertyAdderClasspath, logger);
}
- protected void runPropertyAdder(ConfigFilePropertyAdder propAdder)
- throws Exception {
+ protected void runPropertyAdder(ConfigFilePropertyAdder propAdder) {
logger.info("Running property adder: "
+ propAdder.getClass().getCanonicalName());
propAdder.addConfigProperties(pgeMetadata,
@@ -272,7 +271,7 @@ public class PGETaskInstance implements WorkflowTaskInstance {
return new XmlRpcWorkflowManagerClient(new URL(url));
}
- protected String getWorkflowInstanceId() throws Exception {
+ protected String getWorkflowInstanceId() {
String instanceId = pgeMetadata.getMetadata(CoreMetKeys.WORKFLOW_INST_ID);
logger.info("Workflow instanceId is [" + instanceId + "]");
Validate.notNull(instanceId, "Must specify "
@@ -294,7 +293,7 @@ public class PGETaskInstance implements WorkflowTaskInstance {
+ getDumpMetadataName();
}
- protected String getDumpMetadataName() throws Exception {
+ protected String getDumpMetadataName() {
return "pgetask-metadata.xml";
}
@@ -333,7 +332,7 @@ public class PGETaskInstance implements WorkflowTaskInstance {
}
}
- protected FileStager getFileStager() throws Exception {
+ protected FileStager getFileStager() {
String fileStagerClass = pgeMetadata.getMetadata(FILE_STAGER);
if (fileStagerClass != null) {
logger.info("Loading FileStager [" + fileStagerClass + "]");
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileStager.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileStager.java b/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileStager.java
index 19b22a0..3ee5c2d 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileStager.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileStager.java
@@ -108,7 +108,7 @@ public abstract class FileStager {
}
@VisibleForTesting
- static URI asURI(String path) throws URISyntaxException {
+ static URI asURI(String path) {
Validate.notNull(path, "path must not be null");
URI uri = URI.create(path);
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java b/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java
index 532e607..0fd6d61 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java
@@ -178,8 +178,7 @@ public class XmlHelper {
return key;
}
- public static boolean isEnvReplaceNoRecur(Element elem, Metadata metadata)
- throws Exception {
+ public static boolean isEnvReplaceNoRecur(Element elem, Metadata metadata) {
String isEnvReplaceNoRecur = elem
.getAttribute(ENV_REPLACE_NO_RECUR_ATTR);
if (Strings.isNullOrEmpty(isEnvReplaceNoRecur)) {
@@ -189,8 +188,7 @@ public class XmlHelper {
}
}
- public static boolean isEnvReplace(Element elem, Metadata metadata)
- throws Exception {
+ public static boolean isEnvReplace(Element elem, Metadata metadata) {
String isEnvReplace = elem.getAttribute(ENV_REPLACE_ATTR);
if (Strings.isNullOrEmpty(isEnvReplace)) {
return true;
[16/16] oodt git commit: OODT-904 remove redundant throws
Posted by ma...@apache.org.
OODT-904 remove redundant throws
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/dd7577b5
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/dd7577b5
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/dd7577b5
Branch: refs/heads/master
Commit: dd7577b50690dd7fbf4aecf8057372b21ed8ba40
Parents: 0cc60d1
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Oct 25 16:21:18 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Oct 25 16:21:18 2015 +0000
----------------------------------------------------------------------
.../org/apache/oodt/commons/ExecServer.java | 3 -
.../oodt/commons/activity/XMLStorage.java | 11 +-
.../apache/oodt/commons/database/SqlScript.java | 5 +-
.../java/org/apache/oodt/commons/util/XML.java | 7 +-
.../cas/curation/service/MetadataResource.java | 64 +-
.../handlers/DatabaseProfileManager.java | 18 +-
.../oodt/cas/pushpull/config/RemoteSpecs.java | 591 ++++++++++---------
.../apache/oodt/cas/pushpull/daemon/Daemon.java | 142 ++---
.../oodt/cas/resource/mux/QueueMuxMonitor.java | 19 +-
.../cas/resource/mux/QueueMuxScheduler.java | 19 +-
.../resource/system/extern/XmlRpcBatchStub.java | 11 +-
11 files changed, 426 insertions(+), 464 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/dd7577b5/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 0d12531..3c6f1d5 100644
--- a/commons/src/main/java/org/apache/oodt/commons/ExecServer.java
+++ b/commons/src/main/java/org/apache/oodt/commons/ExecServer.java
@@ -431,9 +431,6 @@ public class ExecServer {
} catch (IllegalAccessException ex) {
System.err.println("Initializer \"" + iname + "\" isn't public; aborting");
throw new EDAException(ex);
- } catch (EDAException ex) {
- System.err.println("Initializer \"" + iname + "\" failed: " + ex.getMessage());
- throw new EDAException(ex);
}
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/dd7577b5/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.java b/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.java
index 6d77e51..a573c80 100644
--- a/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.java
+++ b/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.java
@@ -17,14 +17,15 @@
package org.apache.oodt.commons.activity;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
import java.io.IOException;
-import java.util.Iterator;
import java.util.List;
+
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
/**
* Storage that saves activities as XML documents.
@@ -58,10 +59,6 @@ public abstract class XMLStorage implements Storage {
saveDocument(doc);
} catch (ParserConfigurationException ex) {
throw new IllegalStateException("Unexpected ParserConfigurationException: " + ex.getMessage());
- } catch (IOException ex) {
- System.err.println("Unable to save activity " + id + " due to " + ex.getClass().getName() + ": "
- + ex.getMessage());
- ex.printStackTrace();
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/dd7577b5/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 1a9e48b..ee3f9bf 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
@@ -26,9 +26,9 @@ import java.io.IOException;
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
-import java.util.Iterator;
import java.util.List;
import java.util.Vector;
+
import javax.sql.DataSource;
/**
@@ -98,9 +98,6 @@ public class SqlScript {
sqlScript.loadScript();
sqlScript.execute();
- } catch (SQLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
http://git-wip-us.apache.org/repos/asf/oodt/blob/dd7577b5/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 e631962..2c862a8 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
@@ -82,7 +82,6 @@ import java.io.StringWriter;
import java.io.Writer;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
import javax.xml.parsers.DocumentBuilder;
@@ -207,10 +206,8 @@ public class XML {
*/
public static String serialize(Document doc, boolean omitXMLDeclaration) {
StringWriter writer = new StringWriter();
- try {
- serialize(doc, writer, omitXMLDeclaration);
- } catch (IOException cantHappen) {}
- return writer.getBuffer().toString();
+ serialize(doc, writer, omitXMLDeclaration);
+ return writer.getBuffer().toString();
}
/** Serialize an XML DOM document into a String.
http://git-wip-us.apache.org/repos/asf/oodt/blob/dd7577b5/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 4322ee1..2cef366 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
@@ -19,14 +19,40 @@
package org.apache.oodt.cas.curation.service;
//JDK imports
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+import net.sf.json.JSONSerializer;
+
+import org.apache.oodt.cas.curation.structs.ExtractorConfig;
+import org.apache.oodt.cas.curation.util.CurationXmlStructFactory;
+import org.apache.oodt.cas.curation.util.ExtractorConfigReader;
+import org.apache.oodt.cas.filemgr.catalog.Catalog;
+import org.apache.oodt.cas.filemgr.repository.XMLRepositoryManager;
+import org.apache.oodt.cas.filemgr.structs.Element;
+import org.apache.oodt.cas.filemgr.structs.Product;
+import org.apache.oodt.cas.filemgr.structs.ProductType;
+import org.apache.oodt.cas.filemgr.structs.Reference;
+import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException;
+import org.apache.oodt.cas.filemgr.structs.exceptions.RepositoryManagerException;
+import org.apache.oodt.cas.filemgr.structs.exceptions.ValidationLayerException;
+import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
+import org.apache.oodt.cas.filemgr.util.GenericFileManagerObjectFactory;
+import org.apache.oodt.cas.filemgr.validation.XMLValidationLayer;
+import org.apache.oodt.cas.metadata.MetExtractor;
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.metadata.SerializableMetadata;
+import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
+import org.apache.oodt.cas.metadata.util.GenericMetadataObjectFactory;
+import org.springframework.util.StringUtils;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.net.MalformedURLException;
-import java.util.Arrays;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
@@ -36,8 +62,6 @@ import java.util.Set;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
-//JAX-RS imports
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
@@ -54,40 +78,10 @@ import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
-
-
+//JAX-RS imports
//JSON imports
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-import net.sf.json.JSONSerializer;
-
-
-
//OODT imports
-import org.apache.oodt.cas.curation.service.CurationService;
-import org.apache.oodt.cas.curation.structs.ExtractorConfig;
-import org.apache.oodt.cas.curation.util.CurationXmlStructFactory;
-import org.apache.oodt.cas.curation.util.ExtractorConfigReader;
-import org.apache.oodt.cas.filemgr.catalog.Catalog;
-import org.apache.oodt.cas.filemgr.repository.XMLRepositoryManager;
-import org.apache.oodt.cas.filemgr.structs.Element;
-import org.apache.oodt.cas.filemgr.structs.Product;
-import org.apache.oodt.cas.filemgr.structs.ProductType;
-import org.apache.oodt.cas.filemgr.structs.Reference;
-import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException;
-import org.apache.oodt.cas.filemgr.structs.exceptions.RepositoryManagerException;
-import org.apache.oodt.cas.filemgr.structs.exceptions.ValidationLayerException;
-import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
-import org.apache.oodt.cas.filemgr.util.GenericFileManagerObjectFactory;
-import org.apache.oodt.cas.filemgr.validation.XMLValidationLayer;
-import org.apache.oodt.cas.metadata.MetExtractor;
-import org.apache.oodt.cas.metadata.Metadata;
-import org.apache.oodt.cas.metadata.SerializableMetadata;
-import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
-import org.apache.oodt.cas.metadata.util.GenericMetadataObjectFactory;
-
//SPRING imports
-import org.springframework.util.StringUtils;
@Path("metadata")
/**
@@ -776,8 +770,6 @@ public class MetadataResource extends CurationService {
return true;
} catch (RepositoryManagerException e) {
e.printStackTrace();
- } catch (ValidationLayerException e) {
- e.printStackTrace();
}
return false;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/dd7577b5/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java b/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java
index 28a9b9c..f630417 100755
--- a/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java
+++ b/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java
@@ -173,14 +173,7 @@ public abstract class DatabaseProfileManager implements ProfileManager
public Profile get(String profId) throws ProfileException {
// Create database connection
- try
- {
- return(get(conn, profId));
- }
- catch (ProfileException e)
- {
- throw e;
- }
+ return(get(conn, profId));
}
public Collection getAll() {
@@ -231,14 +224,7 @@ public abstract class DatabaseProfileManager implements ProfileManager
}
public int size() throws ProfileException {
- try
- {
- return(size(conn));
- }
- catch (ProfileException e)
- {
- throw e;
- }
+ return(size(conn));
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/dd7577b5/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java
index 6359fcd..b39eb20 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java
@@ -47,310 +47,311 @@ import java.util.LinkedList;
*/
public class RemoteSpecs implements ConfigParserMetKeys {
- LinkedList<Parser> parsers;
-
- LinkedList<RenamingConvention> renamingConvs;
-
- LinkedList<DaemonInfo> daemonInfoList;
-
- SiteInfo siteInfo;
-
- public RemoteSpecs() {
- this.parsers = new LinkedList<Parser>();
- this.renamingConvs = new LinkedList<RenamingConvention>();
- daemonInfoList = new LinkedList<DaemonInfo>();
- siteInfo = new SiteInfo();
- }
+ LinkedList<Parser> parsers;
+
+ LinkedList<RenamingConvention> renamingConvs;
+
+ LinkedList<DaemonInfo> daemonInfoList;
+
+ SiteInfo siteInfo;
+
+ public RemoteSpecs() {
+ this.parsers = new LinkedList<Parser>();
+ this.renamingConvs = new LinkedList<RenamingConvention>();
+ daemonInfoList = new LinkedList<DaemonInfo>();
+ siteInfo = new SiteInfo();
+ }
+
+ public void loadRemoteSpecs(File remoteSpecsFile) throws ConfigException {
+ try {
+
+ Element root = XMLUtils.getDocumentRoot(
+ new FileInputStream(remoteSpecsFile)).getDocumentElement();
+ NodeList aliasSpecList = root.getElementsByTagName(ALIAS_SPEC_TAG);
+ for (int i = 0; i < aliasSpecList.getLength(); i++) {
+ this.parseAndStoreLoginInfo(new File(PathUtils
+ .replaceEnvVariables(((Element) aliasSpecList.item(i))
+ .getAttribute(FILE_ATTR))));
+ }
+
+ // get DAEMON elements
+ NodeList daemonList = root.getElementsByTagName(DAEMON_TAG);
+ for (int i = 0; i < daemonList.getLength(); i++) {
+ Node daemonNode = daemonList.item(i);
+
+ // check if set to active (skip otherwise)
+ if (PathUtils.replaceEnvVariables(
+ ((Element) daemonNode).getAttribute(ACTIVE_ATTR))
+ .equals("no"))
+ continue;
+
+ DaemonInfo di = null;
+
+ // get site alias
+ String siteAlias = PathUtils
+ .replaceEnvVariables(((Element) daemonNode)
+ .getAttribute(ALIAS_ATTR));
+ RemoteSite dataFilesRemoteSite = this.siteInfo
+ .getSiteByAlias(siteAlias);
+ if (dataFilesRemoteSite == null)
+ throw new ConfigException("Alias '" + siteAlias
+ + "' in SiteInfo file '"
+ + remoteSpecsFile.getAbsolutePath()
+ + "' has not been defined");
- public void loadRemoteSpecs(File remoteSpecsFile) throws ConfigException {
- try {
+ // get RUNINFO element
+ NodeList runInfoList = ((Element) daemonNode)
+ .getElementsByTagName(RUN_INFO_TAG);
+ String firstRunDateTimeString = null, period = null, epsilon = null;
+ boolean runOnReboot = false;
+ if (runInfoList.getLength() > 0) {
+ Element runInfo = (Element) runInfoList.item(0);
+ firstRunDateTimeString = runInfo
+ .getAttribute(FIRSTRUN_DATETIME_ATTR);
+ period = runInfo.getAttribute(PERIOD_ATTR);
+ runOnReboot = (runInfo.getAttribute(RUNONREBOOT_ATTR)
+ .toLowerCase().equals("yes")) ? true : false;
+ epsilon = runInfo.getAttribute(EPSILON_ATTR);
+ if (epsilon.equals(""))
+ epsilon = "0s";
+ }
- Element root = XMLUtils.getDocumentRoot(
- new FileInputStream(remoteSpecsFile)).getDocumentElement();
- NodeList aliasSpecList = root.getElementsByTagName(ALIAS_SPEC_TAG);
- for (int i = 0; i < aliasSpecList.getLength(); i++) {
- this.parseAndStoreLoginInfo(new File(PathUtils
- .replaceEnvVariables(((Element) aliasSpecList.item(i))
- .getAttribute(FILE_ATTR))));
+ // get PROPINFO elements
+ NodeList propInfoList = ((Element) daemonNode)
+ .getElementsByTagName(PROP_INFO_TAG);
+ LinkedList<PropFilesInfo> pfiList = new LinkedList<PropFilesInfo>();
+ PropFilesInfo pfi = null;
+ if (propInfoList.getLength() > 0) {
+ Node propInfoNode = propInfoList.item(0);
+
+ // get directory where the property files are
+ File propertyFilesDir = new File(PathUtils
+ .replaceEnvVariables(((Element) propInfoNode)
+ .getAttribute(DIR_ATTR)));
+
+ pfi = new PropFilesInfo(propertyFilesDir);
+
+ // get PROPFILES elements
+ NodeList propFilesList = ((Element) propInfoNode)
+ .getElementsByTagName(PROP_FILES_TAG);
+ String propFilesRegExp = null;
+ if (propFilesList.getLength() > 0) {
+ for (int k = 0; k < propFilesList.getLength(); k++) {
+ Node propFilesNode = propFilesList.item(k);
+ propFilesRegExp = ((Element) propFilesNode)
+ .getAttribute(REG_EXP_ATTR);
+ pfi
+ .addPropFiles(
+ propFilesRegExp,
+ PushPullObjectFactory
+ .createNewInstance((Class<Parser>) Class
+ .forName(PathUtils
+ .replaceEnvVariables(((Element) propFilesNode)
+ .getAttribute(PARSER_ATTR)))));
}
-
- // get DAEMON elements
- NodeList daemonList = root.getElementsByTagName(DAEMON_TAG);
- for (int i = 0; i < daemonList.getLength(); i++) {
- Node daemonNode = daemonList.item(i);
-
- // check if set to active (skip otherwise)
- if (PathUtils.replaceEnvVariables(
- ((Element) daemonNode).getAttribute(ACTIVE_ATTR))
- .equals("no"))
- continue;
-
- DaemonInfo di = null;
-
- // get site alias
- String siteAlias = PathUtils
- .replaceEnvVariables(((Element) daemonNode)
- .getAttribute(ALIAS_ATTR));
- RemoteSite dataFilesRemoteSite = this.siteInfo
- .getSiteByAlias(siteAlias);
- if (dataFilesRemoteSite == null)
- throw new ConfigException("Alias '" + siteAlias
- + "' in SiteInfo file '"
- + remoteSpecsFile.getAbsolutePath()
- + "' has not been defined");
-
- // get RUNINFO element
- NodeList runInfoList = ((Element) daemonNode)
- .getElementsByTagName(RUN_INFO_TAG);
- String firstRunDateTimeString = null, period = null, epsilon = null;
- boolean runOnReboot = false;
- if (runInfoList.getLength() > 0) {
- Element runInfo = (Element) runInfoList.item(0);
- firstRunDateTimeString = runInfo
- .getAttribute(FIRSTRUN_DATETIME_ATTR);
- period = runInfo.getAttribute(PERIOD_ATTR);
- runOnReboot = (runInfo.getAttribute(RUNONREBOOT_ATTR)
- .toLowerCase().equals("yes"));
- epsilon = runInfo.getAttribute(EPSILON_ATTR);
- if (epsilon.equals(""))
- epsilon = "0s";
- }
-
- // get PROPINFO elements
- NodeList propInfoList = ((Element) daemonNode)
- .getElementsByTagName(PROP_INFO_TAG);
- LinkedList<PropFilesInfo> pfiList = new LinkedList<PropFilesInfo>();
- PropFilesInfo pfi;
- if (propInfoList.getLength() > 0) {
- Node propInfoNode = propInfoList.item(0);
-
- // get directory where the property files are
- File propertyFilesDir = new File(PathUtils
- .replaceEnvVariables(((Element) propInfoNode)
- .getAttribute(DIR_ATTR)));
-
- pfi = new PropFilesInfo(propertyFilesDir);
-
- // get PROPFILES elements
- NodeList propFilesList = ((Element) propInfoNode)
- .getElementsByTagName(PROP_FILES_TAG);
- String propFilesRegExp = null;
- if (propFilesList.getLength() > 0) {
- for (int k = 0; k < propFilesList.getLength(); k++) {
- Node propFilesNode = propFilesList.item(k);
- propFilesRegExp = ((Element) propFilesNode)
- .getAttribute(REG_EXP_ATTR);
- pfi
- .addPropFiles(
- propFilesRegExp,
- PushPullObjectFactory
- .createNewInstance((Class<Parser>) Class
- .forName(PathUtils
- .replaceEnvVariables(((Element) propFilesNode)
- .getAttribute(PARSER_ATTR)))));
- }
- } else
- throw new ConfigException(
- "No propFiles element specified for deamon with alias '"
- + siteAlias + "' in RemoteSpecs file '"
+ } else
+ throw new ConfigException(
+ "No propFiles element specified for deamon with alias '"
+ + siteAlias + "' in RemoteSpecs file '"
+ + remoteSpecsFile.getAbsolutePath()
+ + "'");
+
+ // get DOWNLOADINFO element if given
+ NodeList downloadInfoList = ((Element) propInfoNode)
+ .getElementsByTagName(DOWNLOAD_INFO_TAG);
+ if (downloadInfoList.getLength() > 0) {
+ Node downloadInfo = downloadInfoList.item(0);
+ String propFilesAlias = PathUtils
+ .replaceEnvVariables(((Element) downloadInfo)
+ .getAttribute(ALIAS_ATTR));
+ String propFilesRenamingConv = ((Element) downloadInfo)
+ .getAttribute(RENAMING_CONV_ATTR);
+ boolean allowAliasOverride = PathUtils
+ .replaceEnvVariables(
+ ((Element) downloadInfo)
+ .getAttribute(ALLOW_ALIAS_OVERRIDE_ATTR))
+ .equals("yes");
+ boolean deleteFromServer = PathUtils
+ .replaceEnvVariables(
+ ((Element) downloadInfo)
+ .getAttribute(DELETE_FROM_SERVER_ATTR))
+ .equals("yes");
+ RemoteSite propFilesRemoteSite = this.siteInfo
+ .getSiteByAlias(propFilesAlias);
+ if (propFilesRemoteSite == null)
+ throw new ConfigException("Alias '"
+ + propFilesAlias
+ + "' in RemoteSpecs file '"
+ remoteSpecsFile.getAbsolutePath()
- + "'");
-
- // get DOWNLOADINFO element if given
- NodeList downloadInfoList = ((Element) propInfoNode)
- .getElementsByTagName(DOWNLOAD_INFO_TAG);
- if (downloadInfoList.getLength() > 0) {
- Node downloadInfo = downloadInfoList.item(0);
- String propFilesAlias = PathUtils
- .replaceEnvVariables(((Element) downloadInfo)
- .getAttribute(ALIAS_ATTR));
- String propFilesRenamingConv = ((Element) downloadInfo)
- .getAttribute(RENAMING_CONV_ATTR);
- boolean allowAliasOverride = PathUtils
- .replaceEnvVariables(
- ((Element) downloadInfo)
- .getAttribute(ALLOW_ALIAS_OVERRIDE_ATTR))
- .equals("yes");
- boolean deleteFromServer = PathUtils
- .replaceEnvVariables(
- ((Element) downloadInfo)
- .getAttribute(DELETE_FROM_SERVER_ATTR))
- .equals("yes");
- RemoteSite propFilesRemoteSite = this.siteInfo
- .getSiteByAlias(propFilesAlias);
- if (propFilesRemoteSite == null)
- throw new ConfigException("Alias '"
- + propFilesAlias
- + "' in RemoteSpecs file '"
- + remoteSpecsFile.getAbsolutePath()
- + "' has not been defined");
- String regExp = ((Element) downloadInfo)
- .getAttribute(REG_EXP_ATTR);
- if (regExp.equals(""))
- NodeList propsList = ((Element) propInfoNode)
- .getElementsByTagName(PROP_FILE_TAG);
- HashMap<File, Parser> propFileToParserMap = new HashMap<File, Parser>();
- for (int p = 0; p < propsList.getLength(); p++) {
- Element propElem = (Element) propsList.item(p);
- propFileToParserMap
- .put(
- new File(
- PathUtils
- .replaceEnvVariables(propElem
- .getAttribute(PATH_ATTR))),
- PushPullObjectFactory
- .createNewInstance((Class<Parser>) Class
- .forName(PathUtils
- .replaceEnvVariables(propElem
- .getAttribute(PARSER_ATTR)))));
- }
- pfi.setDownloadInfo(new DownloadInfo(
- propFilesRemoteSite, propFilesRenamingConv,
- deleteFromServer, propertyFilesDir,
- allowAliasOverride), propFileToParserMap);
- }
-
- // get AFTERUSE element
- NodeList afterUseList = ((Element) propInfoNode)
- .getElementsByTagName(AFTER_USE_TAG);
- if (afterUseList.getLength() > 0) {
- Element afterUse = (Element) afterUseList.item(0);
- File onSuccessDir = new File(PathUtils
- .replaceEnvVariables(afterUse
- .getAttribute(MOVEON_TO_SUCCESS_ATTR)));
- File onFailDir = new File(PathUtils
- .replaceEnvVariables(afterUse
- .getAttribute(MOVEON_TO_FAIL_ATTR)));
- pfi.setAfterUseEffects(onSuccessDir, onFailDir);
- boolean deleteOnSuccess = Boolean.parseBoolean(PathUtils
- .replaceEnvVariables(afterUse
- .getAttribute(DELETE_ON_SUCCESS_ATTR)));
- pfi.setDeleteOnSuccess(deleteOnSuccess);
- }
-
- } else
- throw new ConfigException(
- "No propInfo element specified for deamon with alias '"
- + siteAlias + "' in RemoteSpecs file '"
- + remoteSpecsFile.getAbsolutePath() + "'");
-
- // get DATAINFO elements
- NodeList dataInfoList = ((Element) daemonNode)
- .getElementsByTagName(DATA_INFO_TAG);
- DataFilesInfo dfi;
- if (dataInfoList.getLength() > 0) {
- Node dataInfo = dataInfoList.item(0);
- String queryElement = ((Element) dataInfo)
- .getAttribute(QUERY_ELEM_ATTR);
- if (Strings.isNullOrEmpty(queryElement)) {
- queryElement = null;
- } else {
- queryElement = PathUtils.replaceEnvVariables(queryElement);
- }
- String renamingConv = ((Element) dataInfo)
- .getAttribute(RENAMING_CONV_ATTR);
- if (Strings.isNullOrEmpty(renamingConv)) {
- renamingConv = null;
- }
- boolean allowAliasOverride = PathUtils.replaceEnvVariables(
- ((Element) dataInfo)
- .getAttribute(ALLOW_ALIAS_OVERRIDE_ATTR))
- .equals("yes");
- File stagingArea = new File(PathUtils
- .replaceEnvVariables(((Element) dataInfo)
- .getAttribute(STAGING_AREA_ATTR)));
- boolean deleteFromServer = PathUtils.replaceEnvVariables(
- ((Element) dataInfo)
- .getAttribute(DELETE_FROM_SERVER_ATTR))
- .equals("yes");
- dfi = new DataFilesInfo(queryElement, new DownloadInfo(
- dataFilesRemoteSite, renamingConv,
- deleteFromServer, stagingArea, allowAliasOverride));
- } else
- throw new ConfigException(
- "No dataInfo element specified for deamon with alias '"
- + siteAlias + "' in RemoteSpecs file '"
- + remoteSpecsFile.getAbsolutePath() + "'");
-
- daemonInfoList.add(new DaemonInfo(firstRunDateTimeString,
- period, epsilon, runOnReboot, pfi, dfi));
+ + "' has not been defined");
+ String regExp = ((Element) downloadInfo)
+ .getAttribute(REG_EXP_ATTR);
+ if (regExp.equals(""))
+ regExp = propFilesRegExp;
+ NodeList propsList = ((Element) propInfoNode)
+ .getElementsByTagName(PROP_FILE_TAG);
+ HashMap<File, Parser> propFileToParserMap = new HashMap<File, Parser>();
+ for (int p = 0; p < propsList.getLength(); p++) {
+ Element propElem = (Element) propsList.item(p);
+ propFileToParserMap
+ .put(
+ new File(
+ PathUtils
+ .replaceEnvVariables(propElem
+ .getAttribute(PATH_ATTR))),
+ PushPullObjectFactory
+ .createNewInstance((Class<Parser>) Class
+ .forName(PathUtils
+ .replaceEnvVariables(propElem
+ .getAttribute(PARSER_ATTR)))));
}
- } catch (Exception e) {
- e.printStackTrace();
- throw new ConfigException("Failed to load crawl elements : "
- + e.getMessage());
- }
+ pfi.setDownloadInfo(new DownloadInfo(
+ propFilesRemoteSite, propFilesRenamingConv,
+ deleteFromServer, propertyFilesDir,
+ allowAliasOverride), propFileToParserMap);
+ }
+
+ // get AFTERUSE element
+ NodeList afterUseList = ((Element) propInfoNode)
+ .getElementsByTagName(AFTER_USE_TAG);
+ if (afterUseList.getLength() > 0) {
+ Element afterUse = (Element) afterUseList.item(0);
+ File onSuccessDir = new File(PathUtils
+ .replaceEnvVariables(afterUse
+ .getAttribute(MOVEON_TO_SUCCESS_ATTR)));
+ File onFailDir = new File(PathUtils
+ .replaceEnvVariables(afterUse
+ .getAttribute(MOVEON_TO_FAIL_ATTR)));
+ pfi.setAfterUseEffects(onSuccessDir, onFailDir);
+ boolean deleteOnSuccess = Boolean.parseBoolean(PathUtils
+ .replaceEnvVariables(afterUse
+ .getAttribute(DELETE_ON_SUCCESS_ATTR)));
+ pfi.setDeleteOnSuccess(deleteOnSuccess);
+ }
+
+ } else
+ throw new ConfigException(
+ "No propInfo element specified for deamon with alias '"
+ + siteAlias + "' in RemoteSpecs file '"
+ + remoteSpecsFile.getAbsolutePath() + "'");
+
+ // get DATAINFO elements
+ NodeList dataInfoList = ((Element) daemonNode)
+ .getElementsByTagName(DATA_INFO_TAG);
+ DataFilesInfo dfi = null;
+ if (dataInfoList.getLength() > 0) {
+ Node dataInfo = dataInfoList.item(0);
+ String queryElement = ((Element) dataInfo)
+ .getAttribute(QUERY_ELEM_ATTR);
+ if (Strings.isNullOrEmpty(queryElement)) {
+ queryElement = null;
+ } else {
+ queryElement = PathUtils.replaceEnvVariables(queryElement);
+ }
+ String renamingConv = ((Element) dataInfo)
+ .getAttribute(RENAMING_CONV_ATTR);
+ if (Strings.isNullOrEmpty(renamingConv)) {
+ renamingConv = null;
+ }
+ boolean allowAliasOverride = PathUtils.replaceEnvVariables(
+ ((Element) dataInfo)
+ .getAttribute(ALLOW_ALIAS_OVERRIDE_ATTR))
+ .equals("yes");
+ File stagingArea = new File(PathUtils
+ .replaceEnvVariables(((Element) dataInfo)
+ .getAttribute(STAGING_AREA_ATTR)));
+ boolean deleteFromServer = PathUtils.replaceEnvVariables(
+ ((Element) dataInfo)
+ .getAttribute(DELETE_FROM_SERVER_ATTR))
+ .equals("yes");
+ dfi = new DataFilesInfo(queryElement, new DownloadInfo(
+ dataFilesRemoteSite, renamingConv,
+ deleteFromServer, stagingArea, allowAliasOverride));
+ } else
+ throw new ConfigException(
+ "No dataInfo element specified for deamon with alias '"
+ + siteAlias + "' in RemoteSpecs file '"
+ + remoteSpecsFile.getAbsolutePath() + "'");
+
+ daemonInfoList.add(new DaemonInfo(firstRunDateTimeString,
+ period, epsilon, runOnReboot, pfi, dfi));
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new ConfigException("Failed to load crawl elements : "
+ + e.getMessage());
}
-
- void parseAndStoreLoginInfo(File loginInfoFile) throws ConfigException {
- try {
- NodeList sourceList = XMLUtils.getDocumentRoot(new FileInputStream(loginInfoFile))
- .getElementsByTagName(SOURCE_TAG);
- for (int i = 0; i < sourceList.getLength(); i++) {
-
- // get source element
- Node sourceNode = sourceList.item(i);
-
- // get host of this source
- String host = PathUtils
- .replaceEnvVariables(((Element) sourceNode)
- .getAttribute(HOST_ATTR));
-
- // get all login info for this source
- NodeList loginList = ((Element) sourceNode)
- .getElementsByTagName(LOGIN_ATTR);
- for (int j = 0; j < loginList.getLength(); j++) {
-
- // get a single login info
- Node loginNode = loginList.item(j);
- String type = PathUtils
- .replaceEnvVariables(((Element) loginNode)
- .getAttribute(TYPE_ATTR));
- String alias = PathUtils
- .replaceEnvVariables(((Element) loginNode)
- .getAttribute(ALIAS_ATTR));
- String username = null, password = null, cdTestDir = null;
- int maxConnections = -1;
-
- // parse this login info
- NodeList loginInfo = loginNode.getChildNodes();
- for (int k = 0; k < loginInfo.getLength(); k++) {
-
- // get a single login info element
- Node node = loginInfo.item(k);
-
- // determine what element type it is
- if (node.getNodeName().equals(USERNAME_TAG)) {
- username = PathUtils.replaceEnvVariables(
- XMLUtils.getSimpleElementText((Element) node, true));
- } else if (node.getNodeName().equals(PASSWORD_TAG)) {
- password = PathUtils.replaceEnvVariables(
- XMLUtils.getSimpleElementText((Element) node, true));
- } else if (node.getNodeName().equals(CD_TEST_DIR_TAG)) {
- cdTestDir = PathUtils.replaceEnvVariables(
- XMLUtils.getSimpleElementText((Element) node, true));
- } else if (node.getNodeName().equals(MAX_CONN_TAG)) {
- maxConnections = Integer.parseInt(PathUtils.replaceEnvVariables(
- XMLUtils.getSimpleElementText((Element) node, true)));
- }
- }
-
- this.siteInfo.addSite(new RemoteSite(alias, new URL(type
- + "://" + host), username, password, cdTestDir, maxConnections));
- }
+ }
+
+ void parseAndStoreLoginInfo(File loginInfoFile) throws ConfigException {
+ try {
+ NodeList sourceList = XMLUtils.getDocumentRoot(new FileInputStream(loginInfoFile))
+ .getElementsByTagName(SOURCE_TAG);
+ for (int i = 0; i < sourceList.getLength(); i++) {
+
+ // get source element
+ Node sourceNode = sourceList.item(i);
+
+ // get host of this source
+ String host = PathUtils
+ .replaceEnvVariables(((Element) sourceNode)
+ .getAttribute(HOST_ATTR));
+
+ // get all login info for this source
+ NodeList loginList = ((Element) sourceNode)
+ .getElementsByTagName(LOGIN_ATTR);
+ for (int j = 0; j < loginList.getLength(); j++) {
+
+ // get a single login info
+ Node loginNode = loginList.item(j);
+ String type = PathUtils
+ .replaceEnvVariables(((Element) loginNode)
+ .getAttribute(TYPE_ATTR));
+ String alias = PathUtils
+ .replaceEnvVariables(((Element) loginNode)
+ .getAttribute(ALIAS_ATTR));
+ String username = null, password = null, cdTestDir = null;
+ int maxConnections = -1;
+
+ // parse this login info
+ NodeList loginInfo = loginNode.getChildNodes();
+ for (int k = 0; k < loginInfo.getLength(); k++) {
+
+ // get a single login info element
+ Node node = loginInfo.item(k);
+
+ // determine what element type it is
+ if (node.getNodeName().equals(USERNAME_TAG)) {
+ username = PathUtils.replaceEnvVariables(
+ XMLUtils.getSimpleElementText((Element) node, true));
+ } else if (node.getNodeName().equals(PASSWORD_TAG)) {
+ password = PathUtils.replaceEnvVariables(
+ XMLUtils.getSimpleElementText((Element) node, true));
+ } else if (node.getNodeName().equals(CD_TEST_DIR_TAG)) {
+ cdTestDir = PathUtils.replaceEnvVariables(
+ XMLUtils.getSimpleElementText((Element) node, true));
+ } else if (node.getNodeName().equals(MAX_CONN_TAG)) {
+ maxConnections = Integer.parseInt(PathUtils.replaceEnvVariables(
+ XMLUtils.getSimpleElementText((Element) node, true)));
}
- } catch (Exception e) {
- throw new ConfigException("Failed to load external source info : "
- + e.getMessage(), e);
+ }
+
+ this.siteInfo.addSite(new RemoteSite(alias, new URL(type
+ + "://" + host), username, password, cdTestDir, maxConnections));
}
+ }
+ } catch (Exception e) {
+ throw new ConfigException("Failed to load external source info : "
+ + e.getMessage(), e);
}
+ }
- public LinkedList<DaemonInfo> getDaemonInfoList() {
- return this.daemonInfoList;
- }
+ public LinkedList<DaemonInfo> getDaemonInfoList() {
+ return this.daemonInfoList;
+ }
- public SiteInfo getSiteInfo() {
- return this.siteInfo;
- }
+ public SiteInfo getSiteInfo() {
+ return this.siteInfo;
+ }
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/oodt/blob/dd7577b5/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java
index 805b900..cee0373 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java
@@ -51,11 +51,11 @@ import javax.management.ObjectName;
* specified by the properties file passed in. A Crawler will be created per the
* properties file and executed at six hour intervals. This class can be
* controlled by CrawlDaemonController after is has been started up.
- *
+ *
* @author bfoster
*/
public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
- DaemonMBean {
+ DaemonMBean {
private static final long serialVersionUID = 7660972939723142802L;
@@ -107,7 +107,7 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
/**
* Constructor
- *
+ *
* @throws RemoteException
* @throws RemoteException
* @throws InstantiationException
@@ -115,7 +115,8 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
* @throws SecurityException
*/
public Daemon(int rmiRegPort, int daemonID, Config config,
- DaemonInfo daemonInfo, SiteInfo siteInfo) throws RemoteException {
+ DaemonInfo daemonInfo, SiteInfo siteInfo) throws RemoteException,
+ InstantiationException {
super();
this.rmiRegPort = rmiRegPort;
@@ -133,20 +134,20 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
registerRMIServer();
} catch (Exception e) {
LOG.log(Level.SEVERE, "Failed to bind to RMI server : "
- + e.getMessage());
+ + e.getMessage());
}
try {
// registry CrawlDaemon as MBean so it can be used with jconsole
mbs = ManagementFactory.getPlatformMBeanServer();
ObjectName name = new ObjectName(
- "org.apache.oodt.cas.pushpull.daemon:type=Daemon"
- + this.getDaemonID());
+ "org.apache.oodt.cas.pushpull.daemon:type=Daemon"
+ + this.getDaemonID());
mbs.registerMBean(this, name);
} catch (Exception e) {
LOG.log(Level.SEVERE,
- "Failed to register CrawlDaemon as a MBean Object : "
- + e.getMessage());
+ "Failed to register CrawlDaemon as a MBean Object : "
+ + e.getMessage());
}
}
@@ -154,17 +155,18 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
return "Daemon" + this.getDaemonID();
}
- private void registerRMIServer() throws RemoteException {
+ private void registerRMIServer() throws RemoteException,
+ MalformedURLException, NotBoundException, AlreadyBoundException {
try {
Naming.bind("//localhost:" + this.rmiRegPort + "/daemon"
- + this.getDaemonID(), this);
+ + this.getDaemonID(), this);
LOG.log(Level.INFO, "Created Daemon ID = " + this.getDaemonID()
- + " on RMI registry port " + this.rmiRegPort);
+ + " on RMI registry port " + this.rmiRegPort);
} catch (Exception e) {
e.printStackTrace();
throw new RemoteException("Failed to bind Daemon with ID = "
- + this.getDaemonID() + " to RMI registry at port "
- + this.rmiRegPort);
+ + this.getDaemonID() + " to RMI registry at port "
+ + this.rmiRegPort);
}
}
@@ -177,7 +179,7 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
* Loads and executes the Crawler specified by the properties file. It will
* crawl the URLs specified in the properties file in the sequence
* given--one at a time.
- *
+ *
* @throws DirStructException
*/
public void startDaemon() {
@@ -188,9 +190,9 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
// check if Daemon should sleep first
long timeTilNextRun;
if ((timeTilNextRun = Daemon.this.calculateTimeTilNextRun()) != 0
- && !(Daemon.this.beforeToday(daemonInfo
- .getFirstRunDateTime()) && daemonInfo
- .runOnReboot()))
+ && !(Daemon.this.beforeToday(daemonInfo
+ .getFirstRunDateTime()) && daemonInfo
+ .runOnReboot()))
sleep(timeTilNextRun);
for (keepRunning = true; keepRunning;) {
@@ -209,7 +211,7 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
try {
rs.retrieveFiles(daemonInfo.getPropFilesInfo(),
- daemonInfo.getDataFilesInfo());
+ daemonInfo.getDataFilesInfo());
} catch (Exception e) {
e.printStackTrace();
} finally {
@@ -222,15 +224,15 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
Daemon.this.notifyDaemonListenerOfFinish();
Daemon.this.calculateAndStoreElapsedTime(startTime);
if (Daemon.this.keepRunning
- && daemonInfo.getTimeIntervalInMilliseconds() >= 0) {
+ && daemonInfo.getTimeIntervalInMilliseconds() >= 0) {
sleep(Daemon.this.calculateTimeTilNextRun());
} else {
break;
}
}
LOG.log(Level.INFO, "Daemon with ID = "
- + Daemon.this.getDaemonID() + " on RMI registry port "
- + Daemon.this.rmiRegPort + " is shutting down");
+ + Daemon.this.getDaemonID() + " on RMI registry port "
+ + Daemon.this.rmiRegPort + " is shutting down");
Daemon.this.unregister();
}
}).start();
@@ -240,10 +242,10 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
try {
// unregister CrawlDaemon from RMI registry
Naming.unbind("//localhost:" + this.rmiRegPort + "/daemon"
- + this.getDaemonID());
+ + this.getDaemonID());
this.mbs.unregisterMBean(new ObjectName(
- "org.apache.oodt.cas.pushpull.daemon:type=Daemon"
- + this.getDaemonID()));
+ "org.apache.oodt.cas.pushpull.daemon:type=Daemon"
+ + this.getDaemonID()));
UnicastRemoteObject.unexportObject(this, true);
this.daemonListener.wasUnregisteredWith(this);
} catch (Exception e) {
@@ -268,10 +270,10 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
return 0;
} else {
int numOfPeriods = (int) (diff / daemonInfo
- .getTimeIntervalInMilliseconds());
+ .getTimeIntervalInMilliseconds());
long nextRunTime = gcStartDateTime.getTimeInMillis()
- + ((numOfPeriods + 1) * daemonInfo
- .getTimeIntervalInMilliseconds());
+ + ((numOfPeriods + 1) * daemonInfo
+ .getTimeIntervalInMilliseconds());
return nextRunTime - now.getTimeInMillis();
}
}
@@ -293,9 +295,9 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
private void sleep(long length) {
if (length > 0) {
LOG.log(Level.INFO, "Daemon with ID = " + this.getDaemonID()
- + " on RMI registry port " + this.rmiRegPort
- + " is going to sleep until "
- + new Date(System.currentTimeMillis() + length));
+ + " on RMI registry port " + this.rmiRegPort
+ + " is going to sleep until "
+ + new Date(System.currentTimeMillis() + length));
synchronized (this) {
try {
wait(length);
@@ -314,13 +316,13 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
public synchronized void pauseDaemon() {
try {
LOG.log(Level.INFO, "Daemon with ID = " + this.getDaemonID()
- + " on RMI registry port " + this.rmiRegPort
- + " has been stopped");
+ + " on RMI registry port " + this.rmiRegPort
+ + " has been stopped");
this.wait(0);
} catch (Exception e) {
}
LOG.log(Level.INFO, "Daemon with ID = " + this.getDaemonID()
- + " on RMI registry port " + this.rmiRegPort + " has resumed");
+ + " on RMI registry port " + this.rmiRegPort + " has resumed");
}
/**
@@ -342,7 +344,7 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
/**
* Can be used to determine if Crawler is presently running
- *
+ *
* @return true if Crawler is runnning
* @uml.property name="isRunning"
*/
@@ -352,7 +354,7 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
/**
* Average runtime for the Crawler
- *
+ *
* @return average runtime for the Crawler
*/
public long getAverageRunTime() {
@@ -361,7 +363,7 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
/**
* Gets the total crawling time of the Crawler
- *
+ *
* @return Total crawling time of Crawler
*/
public long getMillisCrawling() {
@@ -370,7 +372,7 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
/**
* Gets the time between the start of Crawler executions
- *
+ *
* @return Time interval between Crawler start times
*/
public long getTimeInterval() {
@@ -379,7 +381,7 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
/**
* Gets the total number of times the Crawler has been run
- *
+ *
* @return The number of times Crawler has run
*/
public int getNumCrawls() {
@@ -388,24 +390,24 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
public String[] downloadedFilesInStagingArea() {
return this.daemonInfo.getDataFilesInfo().getDownloadInfo()
- .getStagingArea().list(new FilenameFilter() {
- public boolean accept(File dir, String name) {
- return !name.startsWith("Downloading_")
- && !(name.endsWith("info.tmp") || name
- .endsWith("cas"));
- }
- });
+ .getStagingArea().list(new FilenameFilter() {
+ public boolean accept(File dir, String name) {
+ return !name.startsWith("Downloading_")
+ && !(name.endsWith("info.tmp") || name
+ .endsWith("cas"));
+ }
+ });
}
public String[] downloadingFilesInStagingArea() {
return this.daemonInfo.getDataFilesInfo().getDownloadInfo()
- .getStagingArea().list(new FilenameFilter() {
- public boolean accept(File dir, String name) {
- return name.startsWith("Downloading_")
- && !(name.endsWith("info.tmp") || name
- .endsWith("cas"));
- }
- });
+ .getStagingArea().list(new FilenameFilter() {
+ public boolean accept(File dir, String name) {
+ return name.startsWith("Downloading_")
+ && !(name.endsWith("info.tmp") || name
+ .endsWith("cas"));
+ }
+ });
}
public int numberOfFilesDownloadingInStagingArea() {
@@ -438,35 +440,36 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
// ***************DataFilesInfo*******************
public String getDataFilesRemoteSite() {
RemoteSite remoteSite = this.daemonInfo.getDataFilesInfo()
- .getDownloadInfo().getRemoteSite();
+ .getDownloadInfo().getRemoteSite();
return (remoteSite == null) ? "" : remoteSite.toString();
}
public String getDataFilesRenamingConv() {
return this.daemonInfo.getDataFilesInfo().getDownloadInfo()
- .getRenamingConv();
+ .getRenamingConv();
}
public boolean getDeleteDataFilesFromServer() {
return this.daemonInfo.getDataFilesInfo().getDownloadInfo()
- .deleteFromServer();
+ .deleteFromServer();
}
public String getQueryMetadataElementName() {
String element = this.daemonInfo.getDataFilesInfo()
- .getQueryMetadataElementName();
+ .getQueryMetadataElementName();
if (element == null || element.equals(""))
+ element = "Filename";
return this.daemonInfo.getDataFilesInfo().getQueryMetadataElementName();
}
public File getDataFilesStagingArea() {
return this.daemonInfo.getDataFilesInfo().getDownloadInfo()
- .getStagingArea();
+ .getStagingArea();
}
public boolean getAllowAliasOverride() {
return this.daemonInfo.getDataFilesInfo().getDownloadInfo()
- .isAllowAliasOverride();
+ .isAllowAliasOverride();
}
// **************DataFilesInfo********************
@@ -474,18 +477,18 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
// **************PropFilesInfo********************
public String getPropertyFilesRemoteSite() {
RemoteSite remoteSite = this.daemonInfo.getPropFilesInfo()
- .getDownloadInfo().getRemoteSite();
+ .getDownloadInfo().getRemoteSite();
return (remoteSite == null) ? "" : remoteSite.toString();
}
public String getPropertyFilesRenamingConv() {
return this.daemonInfo.getPropFilesInfo().getDownloadInfo()
- .getRenamingConv();
+ .getRenamingConv();
}
public boolean getDeletePropertyFilesFromServer() {
return this.daemonInfo.getPropFilesInfo().getDownloadInfo()
- .deleteFromServer();
+ .deleteFromServer();
}
public String getPropertyFilesOnSuccessDir() {
@@ -507,7 +510,7 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
/**
* Gets the time in milliseconds for when the CrawlDaemon constructor was
* invoked.
- *
+ *
* @return
* @uml.property name="daemonCreationTime"
*/
@@ -525,7 +528,7 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
/**
* Starts the program
- *
+ *
* @param args
* Not Used
* @throws IOException
@@ -541,6 +544,7 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
if (args[i].equals("--rmiPort"))
rmiPort = Integer.parseInt(args[++i]);
else if (args[i].equals("--waitForNotification"))
+ waitForCrawlNotification = true;
}
LocateRegistry.createRegistry(rmiPort);
@@ -549,16 +553,16 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
// registry CrawlDaemon as MBean so it can be used with jconsole
MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
ObjectName name = new ObjectName(
- "org.apache.oodt.cas.pushpull.daemon:type=Daemon");
+ "org.apache.oodt.cas.pushpull.daemon:type=Daemon");
} catch (Exception e) {
LOG.log(Level.SEVERE,
- "Failed to register CrawlDaemon as a MBean Object : "
- + e.getMessage());
+ "Failed to register CrawlDaemon as a MBean Object : "
+ + e.getMessage());
}
} catch (Exception e) {
LOG.log(Level.SEVERE, "Failed to create CrawlDaemon : "
- + e.getMessage());
+ + e.getMessage());
} finally {
// terminate the CrawlDaemon
LOG.log(Level.INFO, "Terminating CrawlDaemon");
@@ -566,4 +570,4 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
}
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/oodt/blob/dd7577b5/resource/src/main/java/org/apache/oodt/cas/resource/mux/QueueMuxMonitor.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/mux/QueueMuxMonitor.java b/resource/src/main/java/org/apache/oodt/cas/resource/mux/QueueMuxMonitor.java
index 4063b20..073a723 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/mux/QueueMuxMonitor.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/mux/QueueMuxMonitor.java
@@ -16,6 +16,12 @@
*/
package org.apache.oodt.cas.resource.mux;
+import org.apache.oodt.cas.resource.monitor.Monitor;
+import org.apache.oodt.cas.resource.scheduler.QueueManager;
+import org.apache.oodt.cas.resource.structs.ResourceNode;
+import org.apache.oodt.cas.resource.structs.exceptions.MonitorException;
+import org.apache.oodt.cas.resource.structs.exceptions.QueueManagerException;
+
import java.net.URL;
import java.util.Iterator;
import java.util.LinkedHashSet;
@@ -25,12 +31,6 @@ import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.oodt.cas.resource.monitor.Monitor;
-import org.apache.oodt.cas.resource.scheduler.QueueManager;
-import org.apache.oodt.cas.resource.structs.ResourceNode;
-import org.apache.oodt.cas.resource.structs.exceptions.MonitorException;
-import org.apache.oodt.cas.resource.structs.exceptions.QueueManagerException;
-
/**
* @author starchmd
* @version $Revision$
@@ -185,12 +185,7 @@ public class QueueMuxMonitor implements Monitor {
List<String> ret = new LinkedList<String>();
//Get list of queues
List<String> queues = null;
- try
- {
- queues = qManager.getQueues();
- } catch (QueueManagerException e) {
- LOG.log(Level.SEVERE, "Cannot list queues.");
- }
+ queues = qManager.getQueues();
//Search each queu to see if it contains given node
for (String queue : queues) {
try
http://git-wip-us.apache.org/repos/asf/oodt/blob/dd7577b5/resource/src/main/java/org/apache/oodt/cas/resource/mux/QueueMuxScheduler.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/mux/QueueMuxScheduler.java b/resource/src/main/java/org/apache/oodt/cas/resource/mux/QueueMuxScheduler.java
index 951a7ae..faa6014 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/mux/QueueMuxScheduler.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/mux/QueueMuxScheduler.java
@@ -19,18 +19,9 @@
package org.apache.oodt.cas.resource.mux;
//JDKimports
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-
-
-
-
-
-//OODT imports
+import org.apache.oodt.cas.resource.batchmgr.Batchmgr;
import org.apache.oodt.cas.resource.jobqueue.JobQueue;
import org.apache.oodt.cas.resource.monitor.Monitor;
-import org.apache.oodt.cas.resource.batchmgr.Batchmgr;
import org.apache.oodt.cas.resource.scheduler.QueueManager;
import org.apache.oodt.cas.resource.scheduler.Scheduler;
import org.apache.oodt.cas.resource.structs.JobSpec;
@@ -39,6 +30,11 @@ import org.apache.oodt.cas.resource.structs.exceptions.JobQueueException;
import org.apache.oodt.cas.resource.structs.exceptions.QueueManagerException;
import org.apache.oodt.cas.resource.structs.exceptions.SchedulerException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+//OODT imports
+
/**
* This scheduler multiplexes between multiple schedulers based on the "queue" .
*
@@ -94,9 +90,6 @@ public class QueueMuxScheduler implements Scheduler {
job = queue.getNextJob();
LOG.log(Level.INFO, "Scheduling job: ["+ job.getJob().getId()+ "] for execution");
schedule(job);
- } catch (JobQueueException je) {
- LOG.log(Level.WARNING,"Error getting job from queue: "
- + je.getLocalizedMessage());
} catch (SchedulerException se) {
LOG.log(Level.WARNING,"Error occured scheduling job: "+se.getLocalizedMessage());
try {
http://git-wip-us.apache.org/repos/asf/oodt/blob/dd7577b5/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 5add384..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
@@ -62,7 +62,7 @@ public class XmlRpcBatchStub {
private static Map jobThreadMap = null;
- public XmlRpcBatchStub(int port) {
+ public XmlRpcBatchStub(int port) throws Exception {
webServerPort = port;
// start up the web server
@@ -129,9 +129,10 @@ public class XmlRpcBatchStub {
return true;
}
- private boolean genericExecuteJob(Hashtable jobHash, Object jobInput) {
- JobInstance exec;
- JobInput in;
+ private boolean genericExecuteJob(Hashtable jobHash, Object jobInput)
+ throws JobException {
+ JobInstance exec = null;
+ JobInput in = null;
try {
Job job = XmlRpcStructFactory.getJobFromXmlRpc(jobHash);
@@ -162,6 +163,7 @@ public class XmlRpcBatchStub {
synchronized (jobThreadMap) {
Thread endThread = (Thread) jobThreadMap.get(job.getId());
if (endThread != null)
+ endThread = null;
}
return false;
}
@@ -169,6 +171,7 @@ public class XmlRpcBatchStub {
synchronized (jobThreadMap) {
Thread endThread = (Thread) jobThreadMap.get(job.getId());
if (endThread != null)
+ endThread = null;
}
return runner.wasSuccessful();