OODT-886 fix unused imports
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/c8699aba Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/c8699aba Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/c8699aba Branch: refs/heads/master Commit: c8699aba132702e3070b55b587013ed47489d131 Parents: 7c96832 Author: Tom Barber <[email protected]> Authored: Fri Oct 9 16:04:43 2015 +0100 Committer: Tom Barber <[email protected]> Committed: Fri Oct 9 16:04:43 2015 +0100 ---------------------------------------------------------------------- .../validation/ScienceDataValidationLayer.java | 3 +-- .../exceptions/PreconditionComparatorException.java | 4 +--- .../cas/metadata/preconditions/PreCondEvalUtils.java | 9 ++++----- .../preconditions/PreConditionComparator.java | 3 +-- .../apache/oodt/cas/install/CASInstallDistMojo.java | 4 +--- .../oodt/cas/pge/util/GenericPgeObjectFactory.java | 10 +++++----- .../cas/protocol/cli/action/BasicVerifyCliAction.java | 3 +-- .../cli/action/DeleteEmptyDirectoriesCliAction.java | 1 - .../cas/product/jaxrs/resources/DatasetResource.java | 14 ++++---------- .../product/jaxrs/resources/TransfersResource.java | 3 +-- .../org/apache/oodt/cas/product/rdf/RDFConfig.java | 6 ++---- 11 files changed, 21 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/c8699aba/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 083a6b7..e9807ed 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 @@ -19,7 +19,6 @@ package org.apache.oodt.cas.filemgr.validation; //OODT imports -import org.apache.oodt.cas.filemgr.catalog.ScienceDataCatalog; import org.apache.oodt.cas.filemgr.structs.Element; import org.apache.oodt.cas.filemgr.structs.ProductType; import org.apache.oodt.cas.filemgr.structs.exceptions.ValidationLayerException; @@ -39,7 +38,7 @@ import javax.sql.DataSource; /** * * Determines the mapping of {@Element}s to {@link ProductType}s by - * reading the {@link ScienceDataCatalog} catalog schema tables concerning parameters and datasets. + * reading the {@link org.apache.oodt.cas.filemgr.catalog.ScienceDataCatalog} catalog schema tables concerning parameters and datasets. * * @author mattmann * @version $Revision$ http://git-wip-us.apache.org/repos/asf/oodt/blob/c8699aba/metadata/src/main/java/org/apache/oodt/cas/metadata/exceptions/PreconditionComparatorException.java ---------------------------------------------------------------------- diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/exceptions/PreconditionComparatorException.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/exceptions/PreconditionComparatorException.java index 6a6b340..18219ee 100644 --- a/metadata/src/main/java/org/apache/oodt/cas/metadata/exceptions/PreconditionComparatorException.java +++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/exceptions/PreconditionComparatorException.java @@ -18,8 +18,6 @@ package org.apache.oodt.cas.metadata.exceptions; -//OODT imports -import org.apache.oodt.cas.metadata.preconditions.PreConditionComparator; //for javadoc /** * @@ -27,7 +25,7 @@ import org.apache.oodt.cas.metadata.preconditions.PreConditionComparator; //for * @version $Revision$ * * <p> - * An exception throw by a {@link PreConditionComparator} + * An exception throw by a {@link org.apache.oodt.cas.metadata.preconditions.PreConditionComparator} * </p>. */ public class PreconditionComparatorException extends Exception { http://git-wip-us.apache.org/repos/asf/oodt/blob/c8699aba/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 6191b99..9d6ac12 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 @@ -19,16 +19,15 @@ package org.apache.oodt.cas.metadata.preconditions; //JDK imports +import org.springframework.context.ApplicationContext; + import java.io.File; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; //Spring imports -import org.springframework.context.ApplicationContext; -//OODT imports -import org.apache.oodt.cas.metadata.MetExtractor; // for javadoc /** * @@ -54,12 +53,12 @@ public class PreCondEvalUtils implements PreConditionOperatorMetKeys { /** * Evaluates whether all preconditions pass or not * - * @param preconditions + * @param preCondComparatorIds * The String identifiers of the {@link PreConditionComparator}s * in question * @param product * the {@link File} to test the preconditions against to - * determine whether or not the {@link MetExtractor} should be + * determine whether or not the {@link org.apache.oodt.cas.metadata.MetExtractor} should be * run or not. * @return True if all preconditions pass and false otherwise */ http://git-wip-us.apache.org/repos/asf/oodt/blob/c8699aba/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionComparator.java ---------------------------------------------------------------------- diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionComparator.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionComparator.java index d457e30..66dfd66 100644 --- a/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionComparator.java +++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionComparator.java @@ -23,7 +23,6 @@ import java.io.File; //OODT imports import org.apache.oodt.commons.spring.SpringSetIdInjectionType; -import org.apache.oodt.cas.metadata.MetExtractor; import org.apache.oodt.cas.metadata.exceptions.MetExtractionException; import org.apache.oodt.cas.metadata.exceptions.PreconditionComparatorException; import static org.apache.oodt.cas.metadata.preconditions.PreConditionOperatorMetKeys.*; @@ -39,7 +38,7 @@ import org.springframework.beans.factory.annotation.Required; * * <p> * The abstract base class for evaluating {@link PreCondition} checks for - * running a {@link MetExtractor} + * running a {@link org.apache.oodt.cas.metadata.MetExtractor} * </p>. */ public abstract class PreConditionComparator<CompareType> implements SpringSetIdInjectionType { http://git-wip-us.apache.org/repos/asf/oodt/blob/c8699aba/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 150a312..b789368 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 @@ -25,8 +25,6 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; //JDK imports -import org.apache.oodt.cas.metadata.util.PathUtils; - import java.io.File; import java.io.IOException; @@ -89,7 +87,7 @@ public class CASInstallDistMojo extends AbstractMojo { private File[] customLibs; /** - * Files to do dynamic {@link PathUtils#replaceEnvVariables(String)} on. + * Files to do dynamic {@link org.apache.oodt.cas.metadata.util.PathUtils#replaceEnvVariables(String)} on. * * @parameter */ http://git-wip-us.apache.org/repos/asf/oodt/blob/c8699aba/pge/src/main/java/org/apache/oodt/cas/pge/util/GenericPgeObjectFactory.java ---------------------------------------------------------------------- diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/util/GenericPgeObjectFactory.java b/pge/src/main/java/org/apache/oodt/cas/pge/util/GenericPgeObjectFactory.java index 50359e0..6df7975 100644 --- a/pge/src/main/java/org/apache/oodt/cas/pge/util/GenericPgeObjectFactory.java +++ b/pge/src/main/java/org/apache/oodt/cas/pge/util/GenericPgeObjectFactory.java @@ -16,19 +16,19 @@ */ package org.apache.oodt.cas.pge.util; -//JDK imports -import java.util.logging.Level; -import java.util.logging.Logger; - //OODT imports import org.apache.oodt.cas.pge.ConfigFilePropertyAdder; import org.apache.oodt.cas.pge.PGETaskInstance; import org.apache.oodt.cas.pge.config.PgeConfigBuilder; import org.apache.oodt.cas.pge.staging.FileStager; -import org.apache.oodt.cas.pge.writers.DynamicConfigFileWriter; import org.apache.oodt.cas.pge.writers.SciPgeConfigFileWriter; +//JDK imports +import java.util.logging.Level; +import java.util.logging.Logger; + + /** * Factory for creating {@link Object}s. * http://git-wip-us.apache.org/repos/asf/oodt/blob/c8699aba/protocol/api/src/main/java/org/apache/oodt/cas/protocol/cli/action/BasicVerifyCliAction.java ---------------------------------------------------------------------- diff --git a/protocol/api/src/main/java/org/apache/oodt/cas/protocol/cli/action/BasicVerifyCliAction.java b/protocol/api/src/main/java/org/apache/oodt/cas/protocol/cli/action/BasicVerifyCliAction.java index 113fa9e..f76dc0e 100644 --- a/protocol/api/src/main/java/org/apache/oodt/cas/protocol/cli/action/BasicVerifyCliAction.java +++ b/protocol/api/src/main/java/org/apache/oodt/cas/protocol/cli/action/BasicVerifyCliAction.java @@ -20,12 +20,11 @@ package org.apache.oodt.cas.protocol.cli.action; import org.apache.oodt.cas.cli.exception.CmdLineActionException; import org.apache.oodt.cas.protocol.Protocol; import org.apache.oodt.cas.protocol.ProtocolFactory; -import org.apache.oodt.cas.protocol.system.ProtocolManager; import org.apache.oodt.cas.protocol.verify.ProtocolVerifier; /** * Action for determining whether a given {@link Protocol} or auto-determined - * {@link Protocol} via {@link ProtocolManager} can connect and pass + * {@link Protocol} via {@link org.apache.oodt.cas.protocol.system.ProtocolManager} can connect and pass * verification of the given {@link Verifier} for given site. * * @author bfoster (Brian Foster) http://git-wip-us.apache.org/repos/asf/oodt/blob/c8699aba/protocol/api/src/main/java/org/apache/oodt/cas/protocol/cli/action/DeleteEmptyDirectoriesCliAction.java ---------------------------------------------------------------------- diff --git a/protocol/api/src/main/java/org/apache/oodt/cas/protocol/cli/action/DeleteEmptyDirectoriesCliAction.java b/protocol/api/src/main/java/org/apache/oodt/cas/protocol/cli/action/DeleteEmptyDirectoriesCliAction.java index 664c8d7..5464164 100644 --- a/protocol/api/src/main/java/org/apache/oodt/cas/protocol/cli/action/DeleteEmptyDirectoriesCliAction.java +++ b/protocol/api/src/main/java/org/apache/oodt/cas/protocol/cli/action/DeleteEmptyDirectoriesCliAction.java @@ -25,7 +25,6 @@ import java.util.regex.Pattern; // OODT imports import org.apache.oodt.cas.cli.exception.CmdLineActionException; import org.apache.oodt.cas.protocol.Protocol; -import org.apache.oodt.cas.protocol.ProtocolFactory; import org.apache.oodt.cas.protocol.ProtocolFile; import org.apache.oodt.cas.protocol.verify.ProtocolVerifierFactory; http://git-wip-us.apache.org/repos/asf/oodt/blob/c8699aba/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/resources/DatasetResource.java ---------------------------------------------------------------------- diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/resources/DatasetResource.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/resources/DatasetResource.java index cbb26ce..f3e33b3 100755 --- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/resources/DatasetResource.java +++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/resources/DatasetResource.java @@ -17,22 +17,16 @@ package org.apache.oodt.cas.product.jaxrs.resources; +import org.apache.oodt.cas.metadata.Metadata; + import java.io.File; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -import org.apache.oodt.cas.filemgr.structs.Product; -import org.apache.oodt.cas.metadata.Metadata; +import javax.xml.bind.annotation.*; /** - * A JAX-RS resource representing a dataset - a set of {@link Product products} + * A JAX-RS resource representing a dataset - a set of {@link org.apache.oodt.cas.filemgr.structs.Product products} * maintained by the file manager. * @author rlaidlaw * @version $Revision$ http://git-wip-us.apache.org/repos/asf/oodt/blob/c8699aba/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/resources/TransfersResource.java ---------------------------------------------------------------------- diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/resources/TransfersResource.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/resources/TransfersResource.java index 3e0f734..b3240dd 100644 --- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/resources/TransfersResource.java +++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/resources/TransfersResource.java @@ -26,10 +26,9 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.oodt.cas.filemgr.structs.FileTransferStatus; /** - * A JAX-RS resource representing currently active {@link FileTransferStatus + * A JAX-RS resource representing currently active {@link org.apache.oodt.cas.filemgr.structs.FileTransferStatus * file transfers} as {@link TransferResource transfer resources}. * @author rlaidlaw * @version $Revision$ http://git-wip-us.apache.org/repos/asf/oodt/blob/c8699aba/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFConfig.java ---------------------------------------------------------------------- diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFConfig.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFConfig.java index 37b5705..e62f0d4 100644 --- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFConfig.java +++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFConfig.java @@ -18,8 +18,6 @@ package org.apache.oodt.cas.product.rdf; -//JDK imports -import org.apache.oodt.cas.filemgr.structs.ProductType; import java.util.HashMap; import java.util.Map; @@ -183,11 +181,11 @@ public class RDFConfig { /** * Convenience method. First checks to see if there is a declared type - * namespace for this {@link ProductType}, otherwise, returns + * namespace for this {@link org.apache.oodt.cas.filemgr.structs.ProductType}, otherwise, returns * {@link #getDefaultTypeNs()}. * * @param type - * The {@link ProductType#getName()} to find the namespace for. + * The {@link org.apache.oodt.cas.filemgr.structs.ProductType#getName()} to find the namespace for. * @return Either the type's declared namespace, or * {@link #getDefaultTypeNs()}. */
