Repository: oodt Updated Branches: refs/heads/master d9141ec42 -> 5c5f0cbb9
remove empty if statements Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/5c5f0cbb Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/5c5f0cbb Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/5c5f0cbb Branch: refs/heads/master Commit: 5c5f0cbb92f5e099780b1d61fe40ba41dd551a82 Parents: d9141ec Author: Tom Barber <[email protected]> Authored: Sun Jan 10 22:09:46 2016 +0000 Committer: Tom Barber <[email protected]> Committed: Sun Jan 10 22:09:46 2016 +0000 ---------------------------------------------------------------------- .../cas/filemgr/util/XmlRpcStructFactory.java | 2 -- .../preconditions/MimeTypeComparator.java | 2 +- .../extractors/DasMetadataExtractor.java | 26 +++++++++----------- .../engine/processor/WorkflowProcessor.java | 2 -- .../org/apache/oodt/xmlquery/QueryHeader.java | 2 -- 5 files changed, 12 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/5c5f0cbb/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlRpcStructFactory.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlRpcStructFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlRpcStructFactory.java index bf15529..6094320 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlRpcStructFactory.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlRpcStructFactory.java @@ -704,8 +704,6 @@ public final class XmlRpcStructFactory { } criteriaHash.put("terms", termsHash); - } else { - //should not happen } return criteriaHash; } http://git-wip-us.apache.org/repos/asf/oodt/blob/5c5f0cbb/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/MimeTypeComparator.java ---------------------------------------------------------------------- diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/MimeTypeComparator.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/MimeTypeComparator.java index b9ad353..738c267 100644 --- a/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/MimeTypeComparator.java +++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/MimeTypeComparator.java @@ -61,7 +61,7 @@ public class MimeTypeComparator extends PreConditionComparator<String> { .getMimeTypeByMagic(MimeTypeUtils .readMagicHeader(new FileInputStream(product))); } - return tikaMimeType.compareTo(mimeType); + return tikaMimeType != null ? tikaMimeType.compareTo(mimeType) : 0; } catch (Exception e) { LOG.log(Level.SEVERE, e.getMessage()); throw new PreconditionComparatorException( http://git-wip-us.apache.org/repos/asf/oodt/blob/5c5f0cbb/opendapps/src/main/java/org/apache/oodt/opendapps/extractors/DasMetadataExtractor.java ---------------------------------------------------------------------- diff --git a/opendapps/src/main/java/org/apache/oodt/opendapps/extractors/DasMetadataExtractor.java b/opendapps/src/main/java/org/apache/oodt/opendapps/extractors/DasMetadataExtractor.java index 635b15f..7b01ed1 100644 --- a/opendapps/src/main/java/org/apache/oodt/opendapps/extractors/DasMetadataExtractor.java +++ b/opendapps/src/main/java/org/apache/oodt/opendapps/extractors/DasMetadataExtractor.java @@ -18,6 +18,15 @@ package org.apache.oodt.opendapps.extractors; //JDK imports +import org.apache.oodt.cas.metadata.Metadata; +import org.apache.oodt.opendapps.config.OpendapConfig; +import org.apache.oodt.opendapps.config.OpendapConfigMetKeys; +import org.apache.oodt.opendapps.config.OpendapProfileMetKeys; +import org.apache.oodt.opendapps.config.ProcessingInstructions; +import org.apache.oodt.opendapps.util.ProfileUtils; + +import org.springframework.util.StringUtils; + import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -27,21 +36,13 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; - -//OPENDAP imports import opendap.dap.Attribute; import opendap.dap.AttributeTable; import opendap.dap.DAS; import opendap.dap.DConnect; +//OPENDAP imports //OODT imports -import org.apache.oodt.cas.metadata.Metadata; -import org.apache.oodt.opendapps.config.OpendapConfig; -import org.apache.oodt.opendapps.config.OpendapConfigMetKeys; -import org.apache.oodt.opendapps.config.OpendapProfileMetKeys; -import org.apache.oodt.opendapps.config.ProcessingInstructions; -import org.apache.oodt.opendapps.util.ProfileUtils; -import org.springframework.util.StringUtils; /** * Implementation of {@link MetadataExtractor} to extract metadata from an @@ -154,12 +155,7 @@ public class DasMetadataExtractor implements MetadataExtractor { ProfileUtils.addIfNotNull(metadata, OpendapProfileMetKeys.COORDINATES, attName); } - } else if (attName.toLowerCase().startsWith("time_") || attName.toLowerCase().endsWith("_time")) { - - // ignore for now - it's not a coordinate neither a variable you would want to search on - - // NetCDF variables - } else { + } else { if (!excludedVariables.contains(attName)) { // store variable name http://git-wip-us.apache.org/repos/asf/oodt/blob/5c5f0cbb/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessor.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessor.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessor.java index 2e76972..2efa9d2 100755 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessor.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessor.java @@ -236,8 +236,6 @@ public abstract class WorkflowProcessor implements WorkflowProcessorListener, } } - } else if (this.isDone().getName().equals("ResultsFailure")) { - // do nothing -- this workflow failed!!! } else if (this.isDone().getName().equals("ResultsBail")) { for (WorkflowProcessor subProcessor : this.getRunnableSubProcessors()) { runnableTasks.addAll(subProcessor.getRunnableWorkflowProcessors()); http://git-wip-us.apache.org/repos/asf/oodt/blob/5c5f0cbb/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryHeader.java ---------------------------------------------------------------------- diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryHeader.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryHeader.java index 8505cbe..7e4cb6b 100755 --- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryHeader.java +++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryHeader.java @@ -89,8 +89,6 @@ public class QueryHeader implements Serializable, Cloneable, Documentable { statusID = XML.unwrappedText(child); } else if ("querySecurityType".equals(child.getNodeName())) { securityType = XML.unwrappedText(child); - } else if ("queryParentId".equals(child.getNodeName())) { - } else if ("queryChildId".equals(child.getNodeName())) { } else if ("queryRevisionNote".equals(child.getNodeName())) { revisionNote = XML.unwrappedText(child); } else if ("queryDataDictId".equals(child.getNodeName())) {
