fix merge
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/92768b49 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/92768b49 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/92768b49 Branch: refs/heads/development Commit: 92768b4956cfaba0d51dfa7d8ccf093721c1de4c Parents: 6d4acaf Author: Tom Barber <[email protected]> Authored: Fri Jul 1 22:10:04 2016 +0100 Committer: Tom Barber <[email protected]> Committed: Fri Jul 1 22:10:04 2016 +0100 ---------------------------------------------------------------------- filemgr/pom.xml | 48 +++++++++++++++++ .../cli/action/DeleteProductByIdCliAction.java | 1 + .../cli/action/IngestProductCliAction.java | 1 + .../datatransfer/LocalDataTransferer.java | 2 + .../oodt/cas/filemgr/system/FileManager.java | 2 +- .../filemgr/system/XmlRpcFileManagerServer.java | 57 ++++++++++---------- .../oodt/cas/filemgr/tools/CatalogSearch.java | 1 + .../oodt/cas/filemgr/tools/DeleteProduct.java | 3 +- .../oodt/cas/filemgr/tools/ExpImpCatalog.java | 2 + .../tools/MetadataBasedProductMover.java | 2 + .../oodt/cas/filemgr/tools/QueryTool.java | 1 + .../oodt/cas/filemgr/util/AvroTypeFactory.java | 2 +- .../filemgr/structs/type/TestTypeHandler.java | 3 ++ .../system/TestRpcFileManagerClient.java | 6 +-- 14 files changed, 97 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/92768b49/filemgr/pom.xml ---------------------------------------------------------------------- diff --git a/filemgr/pom.xml b/filemgr/pom.xml index 5f19743..daa5bf4 100644 --- a/filemgr/pom.xml +++ b/filemgr/pom.xml @@ -221,6 +221,54 @@ </testResources> <plugins> <plugin> + <groupId>org.apache.avro</groupId> + <artifactId>avro-maven-plugin</artifactId> + <version>1.7.7</version> + <configuration> + <stringType>String</stringType> + <detail>true</detail> + </configuration> + <executions> + <execution> + <id>schemas</id> + <configuration> + <imports> + <import>${basedir}/src/main/avro/types/AvroMimeType.avsc</import> + <import>${basedir}/src/main/avro/types/AvroReference.avsc</import> + <import>${basedir}/src/main/avro/types/AvroExtractorSpec.avsc</import> + <import>${basedir}/src/main/avro/types/AvroMetadata.avsc</import> + <import>${basedir}/src/main/avro/types/AvroTypeHandler.avsc</import> + <import>${basedir}/src/main/avro/types/AvroProductType.avsc</import> + <import>${basedir}/src/main/avro/types/AvroProduct.avsc</import> + <import>${basedir}/src/main/avro/types/AvroFileTransferStatus.avsc</import> + <import>${basedir}/src/main/avro/types/AvroQueryCriteria.avsc</import> + <import>${basedir}/src/main/avro/types/AvroQuery.avsc</import> + <import>${basedir}/src/main/avro/types/AvroProductPage.avsc</import> + <import>${basedir}/src/main/avro/types/AvroElement.avsc</import> + <import>${basedir}/src/main/avro/types/AvroQueryResult.avsc</import> + <import>${basedir}/src/main/avro/types/AvroFilterAlgor.avsc</import> + <import>${basedir}/src/main/avro/types/AvroQueryFilter.avsc</import> + <import>${basedir}/src/main/avro/types/AvroComplexQuery.avsc</import> + </imports> + </configuration> + <goals> + <goal>schema</goal> + </goals> + </execution> + <execution> + <id>protocol</id> + <configuration> + <imports> + <import>${basedir}/src/main/avro/types</import> + </imports> + </configuration> + <goals> + <goal>idl-protocol</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> http://git-wip-us.apache.org/repos/asf/oodt/blob/92768b49/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/DeleteProductByIdCliAction.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/DeleteProductByIdCliAction.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/DeleteProductByIdCliAction.java index 8d97b8d..a202a0c 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/DeleteProductByIdCliAction.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/DeleteProductByIdCliAction.java @@ -22,6 +22,7 @@ import org.apache.commons.lang.Validate; import org.apache.oodt.cas.filemgr.structs.Product; import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException; import org.apache.oodt.cas.filemgr.structs.exceptions.ConnectionException; +import org.apache.oodt.cas.filemgr.system.FileManagerClient; import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/oodt/blob/92768b49/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/IngestProductCliAction.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/IngestProductCliAction.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/IngestProductCliAction.java index 27e3843..4bc326b 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/IngestProductCliAction.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/IngestProductCliAction.java @@ -22,6 +22,7 @@ import org.apache.commons.lang.Validate; import org.apache.oodt.cas.cli.exception.CmdLineActionException; import org.apache.oodt.cas.filemgr.structs.Product; import org.apache.oodt.cas.filemgr.structs.ProductType; +import org.apache.oodt.cas.filemgr.system.FileManagerClient; import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient; import org.apache.oodt.cas.metadata.SerializableMetadata; http://git-wip-us.apache.org/repos/asf/oodt/blob/92768b49/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/LocalDataTransferer.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/LocalDataTransferer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/LocalDataTransferer.java index 430b758..b6f2beb 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/LocalDataTransferer.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/LocalDataTransferer.java @@ -23,7 +23,9 @@ import org.apache.oodt.cas.filemgr.structs.Product; 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; +import org.apache.oodt.cas.filemgr.system.FileManagerClient; import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient; +import org.apache.oodt.cas.filemgr.util.RpcCommunicationFactory; import org.apache.oodt.cas.filemgr.versioning.VersioningUtils; import org.apache.tika.mime.MimeTypeException; import org.apache.tika.mime.MimeTypes; http://git-wip-us.apache.org/repos/asf/oodt/blob/92768b49/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/FileManager.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/FileManager.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/FileManager.java index b5d5906..6e706ab 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/FileManager.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/FileManager.java @@ -849,7 +849,7 @@ public class FileManager { } Metadata met = new Metadata(); - met.addMetadata(metadata.getHashtable()); + met.addMetadata(metadata.getHashTable()); if (product.getProductType().getExtractors() != null) { for (ExtractorSpec spec: product.getProductType().getExtractors()) { http://git-wip-us.apache.org/repos/asf/oodt/blob/92768b49/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerServer.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerServer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerServer.java index be18a89..52cd12f 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerServer.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerServer.java @@ -39,6 +39,7 @@ import java.io.IOException; import java.net.URL; import java.util.Hashtable; import java.util.List; +import java.util.Map; import java.util.Vector; public class XmlRpcFileManagerServer implements FileManagerServer { @@ -124,7 +125,7 @@ public class XmlRpcFileManagerServer implements FileManagerServer { return fileManager.transferringProduct(XmlRpcStructFactory.getProductFromXmlRpc(productHash)); } - public Hashtable<String, Object> getCurrentFileTransfer() { + public Map<String, Object> getCurrentFileTransfer() { FileTransferStatus status = fileManager.getCurrentFileTransfer(); if (status == null) { return new Hashtable<String, Object>(); @@ -132,14 +133,14 @@ public class XmlRpcFileManagerServer implements FileManagerServer { return XmlRpcStructFactory.getXmlRpcFileTransferStatus(status); } - public Vector<Hashtable<String, Object>> getCurrentFileTransfers() { + public Vector<Map<String, Object>> getCurrentFileTransfers() { List<FileTransferStatus> currentTransfers = fileManager.getCurrentFileTransfers(); if (currentTransfers != null && currentTransfers.size() > 0) { return XmlRpcStructFactory .getXmlRpcFileTransferStatuses(currentTransfers); } else - return new Vector<Hashtable<String, Object>>(); + return new Vector<>(); } public double getRefPctTransferred(Hashtable<String, Object> refHash) { @@ -155,7 +156,7 @@ public class XmlRpcFileManagerServer implements FileManagerServer { return fileManager.isTransferComplete(XmlRpcStructFactory.getProductFromXmlRpc(productHash)) ; } - public Hashtable<String, Object> pagedQuery( + public Map<String, Object> pagedQuery( Hashtable<String, Object> queryHash, Hashtable<String, Object> productTypeHash, int pageNum) throws CatalogException { @@ -168,7 +169,7 @@ public class XmlRpcFileManagerServer implements FileManagerServer { } - public Hashtable<String, Object> getFirstPage( + public Map<String, Object> getFirstPage( Hashtable<String, Object> productTypeHash) { ProductType type = XmlRpcStructFactory .getProductTypeFromXmlRpc(productTypeHash); @@ -176,7 +177,7 @@ public class XmlRpcFileManagerServer implements FileManagerServer { return XmlRpcStructFactory.getXmlRpcProductPage(fileManager.getFirstPage(type)); } - public Hashtable<String, Object> getLastPage( + public Map<String, Object> getLastPage( Hashtable<String, Object> productTypeHash) { ProductType type = XmlRpcStructFactory .getProductTypeFromXmlRpc(productTypeHash); @@ -184,7 +185,7 @@ public class XmlRpcFileManagerServer implements FileManagerServer { return XmlRpcStructFactory.getXmlRpcProductPage(fileManager.getLastPage(type)); } - public Hashtable<String, Object> getNextPage( + public Map<String, Object> getNextPage( Hashtable<String, Object> productTypeHash, Hashtable<String, Object> currentPageHash) { ProductType type = XmlRpcStructFactory @@ -200,7 +201,7 @@ public class XmlRpcFileManagerServer implements FileManagerServer { } - public Hashtable<String, Object> getPrevPage( + public Map<String, Object> getPrevPage( Hashtable<String, Object> productTypeHash, Hashtable<String, Object> currentPageHash) { ProductType type = XmlRpcStructFactory @@ -236,14 +237,14 @@ public class XmlRpcFileManagerServer implements FileManagerServer { return fileManager.getNumProducts(type); } - public Vector<Hashtable<String, Object>> getTopNProducts(int n) + public Vector<Map<String, Object>> getTopNProducts(int n) throws CatalogException { return XmlRpcStructFactory.getXmlRpcProductList(fileManager.getTopNProducts(n)); } - public Vector<Hashtable<String, Object>> getTopNProducts(int n, - Hashtable<String, Object> productTypeHash) + public Vector<Map<String, Object>> getTopNProducts(int n, + Hashtable<String, Object> productTypeHash) throws CatalogException { ProductType type = XmlRpcStructFactory .getProductTypeFromXmlRpc(productTypeHash); @@ -258,73 +259,73 @@ public class XmlRpcFileManagerServer implements FileManagerServer { public Hashtable<String, Object> getMetadata( Hashtable<String, Object> productHash) throws CatalogException { Product product = XmlRpcStructFactory.getProductFromXmlRpc(productHash); - return fileManager.getMetadata(product).getHashtable(); + return fileManager.getMetadata(product).getHashTable(); } public Hashtable<String, Object> getReducedMetadata( Hashtable<String, Object> productHash, Vector<String> elements) throws CatalogException { Product product = XmlRpcStructFactory.getProductFromXmlRpc(productHash); - return fileManager.getReducedMetadata(product, elements).getHashtable(); + return fileManager.getReducedMetadata(product, elements).getHashTable(); } - public Vector<Hashtable<String, Object>> getProductTypes() + public Vector<Map<String, Object>> getProductTypes() throws RepositoryManagerException { return XmlRpcStructFactory.getXmlRpcProductTypeList(fileManager.getProductTypes()); } - public Vector<Hashtable<String, Object>> getProductReferences( + public Vector<Map<String, Object>> getProductReferences( Hashtable<String, Object> productHash) throws CatalogException { Product product = XmlRpcStructFactory.getProductFromXmlRpc(productHash); return XmlRpcStructFactory.getXmlRpcReferences(fileManager.getProductReferences(product)); } - public Hashtable<String, Object> getProductById(String productId) + public Map<String, Object> getProductById(String productId) throws CatalogException { Product product = fileManager.getProductById(productId); return XmlRpcStructFactory.getXmlRpcProduct(product); } - public Hashtable<String, Object> getProductByName(String productName) + public Map<String, Object> getProductByName(String productName) throws CatalogException { Product product = fileManager.getProductByName(productName); return XmlRpcStructFactory.getXmlRpcProduct(product); } - public Vector<Hashtable<String, Object>> getProductsByProductType( + public Vector<Map<String, Object>> getProductsByProductType( Hashtable<String, Object> productTypeHash) throws CatalogException { ProductType type = XmlRpcStructFactory.getProductTypeFromXmlRpc(productTypeHash); return XmlRpcStructFactory.getXmlRpcProductList(fileManager.getProductsByProductType(type)); } - public Vector<Hashtable<String, Object>> getElementsByProductType( + public Vector<Map<String, Object>> getElementsByProductType( Hashtable<String, Object> productTypeHash) throws ValidationLayerException { ProductType type = XmlRpcStructFactory .getProductTypeFromXmlRpc(productTypeHash); return XmlRpcStructFactory.getXmlRpcElementList(fileManager.getElementsByProductType(type)); } - public Hashtable<String, Object> getElementById(String elementId) + public Map<String, Object> getElementById(String elementId) throws ValidationLayerException { return XmlRpcStructFactory.getXmlRpcElement(fileManager.getElementById(elementId)); } - public Hashtable<String, Object> getElementByName(String elementName) + public Map<String, Object> getElementByName(String elementName) throws ValidationLayerException { return XmlRpcStructFactory.getXmlRpcElement(fileManager.getElementByName(elementName)); } - public Vector<Hashtable<String, Object>> complexQuery( + public Vector<Map<String, Object>> complexQuery( Hashtable<String, Object> complexQueryHash) throws CatalogException { ComplexQuery complexQuery = XmlRpcStructFactory .getComplexQueryFromXmlRpc(complexQueryHash); return XmlRpcStructFactory.getXmlRpcQueryResults(fileManager.complexQuery(complexQuery)); } - public Vector<Hashtable<String, Object>> query( + public Vector<Map<String, Object>> query( Hashtable<String, Object> queryHash, Hashtable<String, Object> productTypeHash) throws CatalogException { @@ -334,12 +335,12 @@ public class XmlRpcFileManagerServer implements FileManagerServer { return XmlRpcStructFactory.getXmlRpcProductList(fileManager.query(query, type)); } - public Hashtable<String, Object> getProductTypeByName(String productTypeName) + public Map<String, Object> getProductTypeByName(String productTypeName) throws RepositoryManagerException { return XmlRpcStructFactory.getXmlRpcProductType(fileManager.getProductTypeByName(productTypeName)); } - public Hashtable<String, Object> getProductTypeById(String productTypeId) + public Map<String, Object> getProductTypeById(String productTypeId) throws RepositoryManagerException { return XmlRpcStructFactory.getXmlRpcProductType(fileManager.getProductTypeById(productTypeId)); } @@ -423,7 +424,7 @@ public class XmlRpcFileManagerServer implements FileManagerServer { Metadata m = new Metadata(); m.addMetadata(metadataHash); ProductType productType = XmlRpcStructFactory.getProductTypeFromXmlRpc(productTypeHash); - return fileManager.getCatalogValues(m, productType).getHashtable(); + return fileManager.getCatalogValues(m, productType).getHashTable(); } public Hashtable<String, Object> getOrigValues( @@ -433,10 +434,10 @@ public class XmlRpcFileManagerServer implements FileManagerServer { Metadata m = new Metadata(); m.addMetadata(metadataHash); ProductType productType = XmlRpcStructFactory.getProductTypeFromXmlRpc(productTypeHash); - return fileManager.getOrigValues(m, productType).getHashtable(); + return fileManager.getOrigValues(m, productType).getHashTable(); } - public Hashtable<String, Object> getCatalogQuery( + public Map<String, Object> getCatalogQuery( Hashtable<String, Object> queryHash, Hashtable<String, Object> productTypeHash) throws RepositoryManagerException, QueryFormulationException { http://git-wip-us.apache.org/repos/asf/oodt/blob/92768b49/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 3f5f92a..e086940 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 @@ -35,6 +35,7 @@ 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.FileManagerClient; +import org.apache.oodt.cas.filemgr.util.RpcCommunicationFactory; import java.io.BufferedReader; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/oodt/blob/92768b49/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 bf57c79..42b07e9 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 @@ -23,6 +23,7 @@ import org.apache.oodt.cas.filemgr.structs.Product; import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException; import org.apache.oodt.cas.filemgr.structs.exceptions.DataTransferException; import org.apache.oodt.cas.filemgr.system.FileManagerClient; +import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient; import org.apache.oodt.cas.filemgr.util.RpcCommunicationFactory; //JDK imports @@ -55,7 +56,7 @@ public class DeleteProduct { private static final Logger LOG = Logger.getLogger(DeleteProduct.class.getName()); /* our File Manager client */ - private XmlRpcFileManagerClient client = null; + private FileManagerClient client = null; /* whether or not we should commit our deletions */ private boolean commit = true; http://git-wip-us.apache.org/repos/asf/oodt/blob/92768b49/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 fae94ac..e64e560 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 @@ -25,8 +25,10 @@ import org.apache.oodt.cas.filemgr.structs.ProductType; import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException; import org.apache.oodt.cas.filemgr.structs.exceptions.ConnectionException; import org.apache.oodt.cas.filemgr.structs.exceptions.RepositoryManagerException; +import org.apache.oodt.cas.filemgr.system.FileManagerClient; import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient; import org.apache.oodt.cas.filemgr.util.GenericFileManagerObjectFactory; +import org.apache.oodt.cas.filemgr.util.RpcCommunicationFactory; import org.apache.oodt.cas.metadata.Metadata; import java.io.File; http://git-wip-us.apache.org/repos/asf/oodt/blob/92768b49/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 e297d2c..989dbd7 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 @@ -25,7 +25,9 @@ import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException; import org.apache.oodt.cas.filemgr.structs.exceptions.ConnectionException; import org.apache.oodt.cas.filemgr.structs.exceptions.DataTransferException; import org.apache.oodt.cas.filemgr.structs.exceptions.RepositoryManagerException; +import org.apache.oodt.cas.filemgr.system.FileManagerClient; import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient; +import org.apache.oodt.cas.filemgr.util.RpcCommunicationFactory; import org.apache.oodt.cas.metadata.Metadata; import org.apache.oodt.cas.metadata.util.PathUtils; http://git-wip-us.apache.org/repos/asf/oodt/blob/92768b49/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 b079e67..f7ba6e6 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 @@ -37,6 +37,7 @@ import org.apache.oodt.cas.filemgr.structs.exceptions.RepositoryManagerException import org.apache.oodt.cas.filemgr.structs.query.ComplexQuery; import org.apache.oodt.cas.filemgr.structs.query.QueryResult; import org.apache.oodt.cas.filemgr.system.FileManagerClient; +import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient; import org.apache.oodt.cas.filemgr.util.RpcCommunicationFactory; import org.apache.oodt.cas.filemgr.util.SqlParser; http://git-wip-us.apache.org/repos/asf/oodt/blob/92768b49/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/AvroTypeFactory.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/AvroTypeFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/AvroTypeFactory.java index 5459db0..2643630 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/AvroTypeFactory.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/AvroTypeFactory.java @@ -101,7 +101,7 @@ public class AvroTypeFactory { public static AvroMetadata getAvroMetadata(Metadata metadata){ AvroMetadata avroMetadata = new AvroMetadata(); - Hashtable met = metadata.getHashtable(); + Hashtable met = metadata.getHashTable(); Map<String,List<String>> hashMapMetadata = new HashMap<String,List<String>>(); if (met != null && met.size() > 0){ http://git-wip-us.apache.org/repos/asf/oodt/blob/92768b49/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 15e6e8f..fd7668d 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 @@ -30,6 +30,9 @@ import org.apache.oodt.cas.filemgr.structs.Reference; import org.apache.oodt.cas.filemgr.structs.TermQueryCriteria; import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException; import org.apache.oodt.cas.filemgr.structs.exceptions.ConnectionException; +import org.apache.oodt.cas.filemgr.system.FileManagerClient; +import org.apache.oodt.cas.filemgr.system.FileManagerServer; +import org.apache.oodt.cas.filemgr.util.RpcCommunicationFactory; import org.apache.oodt.cas.filemgr.validation.ValidationLayer; import org.apache.oodt.cas.metadata.Metadata; import org.apache.oodt.commons.database.DatabaseConnectionBuilder; http://git-wip-us.apache.org/repos/asf/oodt/blob/92768b49/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestRpcFileManagerClient.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestRpcFileManagerClient.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestRpcFileManagerClient.java index 81c58de..18e3cc9 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestRpcFileManagerClient.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestRpcFileManagerClient.java @@ -101,17 +101,17 @@ public class TestRpcFileManagerClient extends TestCase { reducedMet = fmc.getReducedMetadata(product, arrayListElems); assertNotNull(reducedMet); assertTrue(reducedMet.containsKey(CoreMetKeys.FILENAME)); - assertEquals(reducedMet.getHashtable().keySet().size(), 1); + assertEquals(reducedMet.getHashTable().keySet().size(), 1); reducedMet = fmc.getReducedMetadata(product, vectorElemList); assertNotNull(reducedMet); assertTrue(reducedMet.containsKey(CoreMetKeys.FILENAME)); - assertEquals(reducedMet.getHashtable().keySet().size(), 1); + assertEquals(reducedMet.getHashTable().keySet().size(), 1); reducedMet = fmc.getReducedMetadata(product, linkedListElemList); assertNotNull(reducedMet); assertTrue(reducedMet.containsKey(CoreMetKeys.FILENAME)); - assertEquals(reducedMet.getHashtable().keySet().size(), 1); + assertEquals(reducedMet.getHashTable().keySet().size(), 1); } catch (Exception e) { e.printStackTrace();
