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 <[email protected]> Authored: Sun Oct 25 15:38:24 2015 +0000 Committer: Tom Barber <[email protected]> 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.
