You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2015/11/03 16:49:18 UTC
[05/13] oodt git commit: OODT-917 replace hashtable with its modern
equivilant
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/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 3007041..b1e4485 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
@@ -37,7 +37,7 @@ import org.apache.oodt.cas.filemgr.structs.query.filter.FilterAlgor;
import org.apache.oodt.cas.filemgr.structs.type.TypeHandler;
import org.apache.oodt.cas.metadata.Metadata;
-import java.util.Hashtable;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -63,9 +63,9 @@ public final class XmlRpcStructFactory {
"Don't instantiate XmlRpcStructFactories!");
}
- public static Hashtable<String, Object> getXmlRpcFileTransferStatus(
+ public static Map<String, Object> getXmlRpcFileTransferStatus(
FileTransferStatus status) {
- Hashtable<String, Object> statusHash = new Hashtable<String, Object>();
+ Map<String, Object> statusHash = new HashMap<String, Object>();
statusHash.put("bytesTransferred",Long.toString(status
.getBytesTransferred()));
statusHash.put("parentProduct", getXmlRpcProduct(status
@@ -76,17 +76,17 @@ public final class XmlRpcStructFactory {
@SuppressWarnings("unchecked")
public static FileTransferStatus getFileTransferStatusFromXmlRpc(
- Hashtable<String, Object> statusHash) {
+ Map<String, Object> statusHash) {
FileTransferStatus status = new FileTransferStatus();
status.setBytesTransferred(Long.parseLong(statusHash
.get("bytesTransferred").toString()));
- status.setParentProduct(getProductFromXmlRpc((Hashtable<String, Object>) statusHash.get("parentProduct")));
- status.setFileRef(getReferenceFromXmlRpc((Hashtable<String, Object>) statusHash.get("fileRef")));
+ status.setParentProduct(getProductFromXmlRpc((Map<String, Object>) statusHash.get("parentProduct")));
+ status.setFileRef(getReferenceFromXmlRpc((Map<String, Object>) statusHash.get("fileRef")));
return status;
}
- public static Vector<Hashtable<String, Object>> getXmlRpcFileTransferStatuses(List<FileTransferStatus> statuses) {
- Vector<Hashtable<String, Object>> statusVector = new Vector<Hashtable<String, Object>>();
+ public static Vector<Map<String, Object>> getXmlRpcFileTransferStatuses(List<FileTransferStatus> statuses) {
+ Vector<Map<String, Object>> statusVector = new Vector<Map<String, Object>>();
if (statuses != null && statuses.size() > 0) {
@@ -98,11 +98,11 @@ public final class XmlRpcStructFactory {
return statusVector;
}
- public static List<FileTransferStatus> getFileTransferStatusesFromXmlRpc(Vector<Hashtable<String, Object>> statusVector) {
+ public static List<FileTransferStatus> getFileTransferStatusesFromXmlRpc(Vector<Map<String, Object>> statusVector) {
List<FileTransferStatus> statuses = new Vector<FileTransferStatus>();
if (statusVector != null && statusVector.size() > 0) {
- for (Hashtable<String, Object> statusHash : statusVector) {
+ for (Map<String, Object> statusHash : statusVector) {
FileTransferStatus status = getFileTransferStatusFromXmlRpc(statusHash);
statuses.add(status);
}
@@ -111,8 +111,8 @@ public final class XmlRpcStructFactory {
return statuses;
}
- public static Hashtable<String, Object> getXmlRpcProductPage(ProductPage page) {
- Hashtable<String, Object>productPageHash = new Hashtable<String, Object>();
+ public static Map<String, Object> getXmlRpcProductPage(ProductPage page) {
+ Map<String, Object>productPageHash = new HashMap<String, Object>();
productPageHash.put("totalPages", page.getTotalPages());
productPageHash.put("pageNum", page.getPageNum());
productPageHash.put("pageSize", page.getPageSize());
@@ -122,19 +122,19 @@ public final class XmlRpcStructFactory {
}
@SuppressWarnings("unchecked")
- public static ProductPage getProductPageFromXmlRpc(Hashtable<String, Object> productPageHash) {
+ public static ProductPage getProductPageFromXmlRpc(Map<String, Object> productPageHash) {
ProductPage page = new ProductPage();
page.setPageNum((Integer) productPageHash.get("pageNum"));
page
.setPageSize((Integer) productPageHash.get("pageSize"));
page.setTotalPages((Integer) productPageHash.get("totalPages"));
- page.setPageProducts(getProductListFromXmlRpc((Vector<Hashtable<String, Object>>) productPageHash
+ page.setPageProducts(getProductListFromXmlRpc((Vector<Map<String, Object>>) productPageHash
.get("pageProducts")));
return page;
}
- public static Hashtable<String, Object> getXmlRpcComplexQuery(ComplexQuery complexQuery) {
- Hashtable<String, Object> complexQueryHash = getXmlRpcQuery(complexQuery);
+ public static Map<String, Object> getXmlRpcComplexQuery(ComplexQuery complexQuery) {
+ Map<String, Object> complexQueryHash = getXmlRpcQuery(complexQuery);
if (complexQuery.getReducedProductTypeNames() != null) {
complexQueryHash
.put("reducedProductTypeNames", new Vector<String>(complexQuery.getReducedProductTypeNames()));
@@ -159,7 +159,7 @@ public final class XmlRpcStructFactory {
}
@SuppressWarnings("unchecked")
- public static ComplexQuery getComplexQueryFromXmlRpc(Hashtable<String, Object> complexQueryHash) {
+ public static ComplexQuery getComplexQueryFromXmlRpc(Map<String, Object> complexQueryHash) {
ComplexQuery complexQuery = new ComplexQuery();
complexQuery.setCriteria(getQueryFromXmlRpc(complexQueryHash).getCriteria());
if (((Vector<String>) complexQueryHash.get("reducedProductTypeNames")).size() > 0) {
@@ -172,13 +172,13 @@ public final class XmlRpcStructFactory {
complexQuery.setToStringResultFormat((String) complexQueryHash.get("toStringResultFormat"));
if (complexQueryHash.get("queryFilter") != null) {
complexQuery.setQueryFilter(
- getQueryFilterFromXmlRpc((Hashtable<String, Object>) complexQueryHash.get("queryFilter")));
+ getQueryFilterFromXmlRpc((Map<String, Object>) complexQueryHash.get("queryFilter")));
}
return complexQuery;
}
- public static Hashtable<String, Object> getXmlRpcQueryFilter(QueryFilter queryFilter) {
- Hashtable<String, Object> queryFilterHash = new Hashtable<String, Object>();
+ public static Map<String, Object> getXmlRpcQueryFilter(QueryFilter queryFilter) {
+ Map<String, Object> queryFilterHash = new HashMap<String, Object>();
queryFilterHash.put("startDateTimeMetKey", queryFilter.getStartDateTimeMetKey());
queryFilterHash.put("endDateTimeMetKey", queryFilter.getEndDateTimeMetKey());
queryFilterHash.put("priorityMetKey", queryFilter.getPriorityMetKey());
@@ -187,25 +187,25 @@ public final class XmlRpcStructFactory {
return queryFilterHash;
}
- public static QueryFilter getQueryFilterFromXmlRpc(Hashtable<String, Object> queryFilterHash) {
+ public static QueryFilter getQueryFilterFromXmlRpc(Map<String, Object> queryFilterHash) {
String startDateTimeMetKey = (String) queryFilterHash.get("startDateTimeMetKey");
String endDateTimeMetKey = (String) queryFilterHash.get("endDateTimeMetKey");
String priorityMetKey = (String) queryFilterHash.get("priorityMetKey");
@SuppressWarnings("unchecked")
- FilterAlgor filterAlgor = getFilterAlgorFromXmlRpc((Hashtable<String, Object>) queryFilterHash.get("filterAlgor"));
+ FilterAlgor filterAlgor = getFilterAlgorFromXmlRpc((Map<String, Object>) queryFilterHash.get("filterAlgor"));
QueryFilter queryFilter = new QueryFilter(startDateTimeMetKey, endDateTimeMetKey, priorityMetKey, filterAlgor);
queryFilter.setConverter(GenericFileManagerObjectFactory.getVersionConverterFromClassName((String) queryFilterHash.get("versionConverterClass")));
return queryFilter;
}
- public static Hashtable<String, Object> getXmlRpcFilterAlgor(FilterAlgor filterAlgor) {
- Hashtable<String, Object> filterAlgorHash = new Hashtable<String, Object>();
+ public static Map<String, Object> getXmlRpcFilterAlgor(FilterAlgor filterAlgor) {
+ Map<String, Object> filterAlgorHash = new HashMap<String, Object>();
filterAlgorHash.put("class", filterAlgor.getClass().getCanonicalName());
filterAlgorHash.put("epsilon", Long.toString(filterAlgor.getEpsilon()));
return filterAlgorHash;
}
- public static FilterAlgor getFilterAlgorFromXmlRpc(Hashtable<String, Object> filterAlgorHash) {
+ public static FilterAlgor getFilterAlgorFromXmlRpc(Map<String, Object> filterAlgorHash) {
FilterAlgor filterAlgor = GenericFileManagerObjectFactory.getFilterAlgorFromClassName((String) filterAlgorHash.get("class"));
if (filterAlgor != null) {
filterAlgor.setEpsilon(Long.parseLong((String) filterAlgorHash.get("epsilon")));
@@ -213,44 +213,44 @@ public final class XmlRpcStructFactory {
return filterAlgor;
}
- public static Vector<Hashtable<String, Object>> getXmlRpcQueryResults(List<QueryResult> queryResults) {
- Vector<Hashtable<String, Object>> queryResultHashVector = new Vector<Hashtable<String, Object>>();
+ public static Vector<Map<String, Object>> getXmlRpcQueryResults(List<QueryResult> queryResults) {
+ Vector<Map<String, Object>> queryResultHashVector = new Vector<Map<String, Object>>();
for (QueryResult queryResult : queryResults) {
queryResultHashVector.add(getXmlRpcQueryResult(queryResult));
}
return queryResultHashVector;
}
- public static List<QueryResult> getQueryResultsFromXmlRpc(Vector<Hashtable<String, Object>> queryResultHashVector) {
+ public static List<QueryResult> getQueryResultsFromXmlRpc(Vector<Map<String, Object>> queryResultHashVector) {
List<QueryResult> queryResults = new Vector<QueryResult>();
- for (Hashtable<String, Object> queryResultHash : queryResultHashVector) {
+ for (Map<String, Object> queryResultHash : queryResultHashVector) {
queryResults.add(getQueryResultFromXmlRpc(queryResultHash));
}
return queryResults;
}
- public static Hashtable<String, Object> getXmlRpcQueryResult(QueryResult queryResult) {
- Hashtable<String, Object> queryResultHash = new Hashtable<String, Object>();
+ public static Map<String, Object> getXmlRpcQueryResult(QueryResult queryResult) {
+ Map<String, Object> queryResultHash = new HashMap<String, Object>();
if (queryResult.getToStringFormat() != null) {
queryResultHash.put("toStringFormat", queryResult.getToStringFormat());
}
queryResultHash.put("product", getXmlRpcProduct(queryResult.getProduct()));
- queryResultHash.put("metadata", queryResult.getMetadata().getHashtable());
+ queryResultHash.put("metadata", queryResult.getMetadata().getMap());
return queryResultHash;
}
@SuppressWarnings("unchecked")
- public static QueryResult getQueryResultFromXmlRpc(Hashtable<String, Object> queryResultHash) {
- Product product = getProductFromXmlRpc((Hashtable<String, Object>) queryResultHash.get("product"));
+ public static QueryResult getQueryResultFromXmlRpc(Map<String, Object> queryResultHash) {
+ Product product = getProductFromXmlRpc((Map<String, Object>) queryResultHash.get("product"));
Metadata metadata = new Metadata();
- metadata.addMetadata((Hashtable<String, Object>) queryResultHash.get("metadata"));
+ metadata.addMetadata((Map<String, Object>) queryResultHash.get("metadata"));
QueryResult queryResult = new QueryResult(product, metadata);
queryResult.setToStringFormat((String) queryResultHash.get("toStringFormat"));
return queryResult;
}
- public static Hashtable<String, Object> getXmlRpcProduct(Product product) {
- Hashtable<String, Object> productHash = new Hashtable<String, Object>();
+ public static Map<String, Object> getXmlRpcProduct(Product product) {
+ Map<String, Object> productHash = new HashMap<String, Object>();
if (product.getProductId() != null) {
productHash.put("id", product.getProductId());
}
@@ -278,32 +278,32 @@ public final class XmlRpcStructFactory {
}
@SuppressWarnings("unchecked")
- public static Product getProductFromXmlRpc(Hashtable<?, ?> productHash) {
+ public static Product getProductFromXmlRpc(Map<?, ?> productHash) {
Product product = new Product();
product.setProductId((String) productHash.get("id"));
product.setProductName((String) productHash.get("name"));
if (productHash.get("type") != null) {
product.setProductType(getProductTypeFromXmlRpc(
- (Hashtable<String, Object>) productHash.get("type")));
+ (Map<String, Object>) productHash.get("type")));
}
product.setProductStructure((String) productHash.get("structure"));
product.setTransferStatus((String) productHash.get("transferStatus"));
if (productHash.get("references") != null) {
product.setProductReferences(getReferencesFromXmlRpc(
- (Vector<Hashtable<String, Object>>) productHash
+ (Vector<Map<String, Object>>) productHash
.get("references")));
}
if (productHash.get("rootReference") != null) {
product.setRootRef(getReferenceFromXmlRpc(
- (Hashtable<String, Object>) productHash.get("rootReference")));
+ (Map<String, Object>) productHash.get("rootReference")));
}
return product;
}
- public static List<Product> getProductListFromXmlRpc(Vector<Hashtable<String, Object>> productVector) {
+ public static List<Product> getProductListFromXmlRpc(Vector<Map<String, Object>> productVector) {
List<Product> productList = new Vector<Product>();
- for (Hashtable<String, Object> productHash : productVector) {
+ for (Map<String, Object> productHash : productVector) {
Product product = getProductFromXmlRpc(productHash);
productList.add(product);
}
@@ -311,38 +311,38 @@ public final class XmlRpcStructFactory {
return productList;
}
- public static Vector<Hashtable<String, Object>> getXmlRpcProductList(List<Product> products) {
- Vector<Hashtable<String, Object>> productVector = new Vector<Hashtable<String, Object>>();
+ public static Vector<Map<String, Object>> getXmlRpcProductList(List<Product> products) {
+ Vector<Map<String, Object>> productVector = new Vector<Map<String, Object>>();
if (products == null) {
return productVector;
}
for (Product product : products) {
- Hashtable<String, Object> productHash = getXmlRpcProduct(product);
+ Map<String, Object> productHash = getXmlRpcProduct(product);
productVector.add(productHash);
}
return productVector;
}
- public static Vector<Hashtable<String, Object>> getXmlRpcProductTypeList(List<ProductType> productTypes) {
- Vector<Hashtable<String, Object>> productTypeVector = new Vector<Hashtable<String, Object>>();
+ public static Vector<Map<String, Object>> getXmlRpcProductTypeList(List<ProductType> productTypes) {
+ Vector<Map<String, Object>> productTypeVector = new Vector<Map<String, Object>>();
if (productTypes == null) {
return productTypeVector;
}
for (ProductType type : productTypes) {
- Hashtable<String, Object> typeHash = getXmlRpcProductType(type);
+ Map<String, Object> typeHash = getXmlRpcProductType(type);
productTypeVector.add(typeHash);
}
return productTypeVector;
}
- public static List<ProductType> getProductTypeListFromXmlRpc(Vector<Hashtable<String, Object>> productTypeVector) {
+ public static List<ProductType> getProductTypeListFromXmlRpc(Vector<Map<String, Object>> productTypeVector) {
List<ProductType> productTypeList = new Vector<ProductType>();
- for (Hashtable<String, Object> productTypeHash : productTypeVector) {
+ for (Map<String, Object> productTypeHash : productTypeVector) {
ProductType type = getProductTypeFromXmlRpc(productTypeHash);
productTypeList.add(type);
}
@@ -350,8 +350,8 @@ public final class XmlRpcStructFactory {
return productTypeList;
}
- public static Hashtable<String, Object> getXmlRpcProductType(ProductType type) {
- Hashtable<String, Object> productTypeHash = new Hashtable<String, Object>();
+ public static Map<String, Object> getXmlRpcProductType(ProductType type) {
+ Map<String, Object> productTypeHash = new HashMap<String, Object>();
// TODO(bfoster): ProductType ID is currently required by XmlRpcFileManager.
productTypeHash.put("id", type.getProductTypeId());
if (type.getName() != null) {
@@ -367,7 +367,7 @@ public final class XmlRpcStructFactory {
productTypeHash.put("versionerClass", type.getVersioner());
}
if (type.getTypeMetadata() != null) {
- productTypeHash.put("typeMetadata", type.getTypeMetadata().getHashtable());
+ productTypeHash.put("typeMetadata", type.getTypeMetadata().getMap());
}
if (type.getExtractors() != null) {
productTypeHash.put("typeExtractors", getXmlRpcTypeExtractors(type.getExtractors()));
@@ -379,7 +379,7 @@ public final class XmlRpcStructFactory {
}
@SuppressWarnings("unchecked")
- public static ProductType getProductTypeFromXmlRpc(Hashtable<String, Object> productTypeHash) {
+ public static ProductType getProductTypeFromXmlRpc(Map<String, Object> productTypeHash) {
ProductType type = new ProductType();
type.setDescription((String) productTypeHash.get("description"));
type.setName((String) productTypeHash.get("name"));
@@ -388,24 +388,24 @@ public final class XmlRpcStructFactory {
type.setVersioner((String) productTypeHash.get("versionerClass"));
if (productTypeHash.get("typeMetadata") != null) {
Metadata typeMet = new Metadata();
- typeMet.addMetadata((Hashtable<String, Object>) productTypeHash.get("typeMetadata"));
+ typeMet.addMetadata((Map<String, Object>) productTypeHash.get("typeMetadata"));
type.setTypeMetadata(typeMet);
}
if (productTypeHash.get("typeExtractors") != null) {
type.setExtractors(getTypeExtractorsFromXmlRpc(
- (Vector<Hashtable<String, Object>>) productTypeHash
+ (Vector<Map<String, Object>>) productTypeHash
.get("typeExtractors")));
}
if (productTypeHash.get("typeHandlers") != null) {
type.setHandlers(getTypeHandlersFromXmlRpc(
- (Vector<Hashtable<String, Object>>) productTypeHash
+ (Vector<Map<String, Object>>) productTypeHash
.get("typeHandlers")));
}
return type;
}
- public static Vector<Hashtable<String, Object>> getXmlRpcTypeExtractors(List<ExtractorSpec> extractors) {
- Vector<Hashtable<String, Object>> extractorsVector = new Vector<Hashtable<String, Object>>();
+ public static Vector<Map<String, Object>> getXmlRpcTypeExtractors(List<ExtractorSpec> extractors) {
+ Vector<Map<String, Object>> extractorsVector = new Vector<Map<String, Object>>();
if (extractors != null && extractors.size() > 0) {
for (ExtractorSpec spec : extractors) {
@@ -416,16 +416,16 @@ public final class XmlRpcStructFactory {
return extractorsVector;
}
- public static Hashtable<String, Object> getXmlRpcExtractorSpec(ExtractorSpec spec) {
- Hashtable<String, Object> extractorHash = new Hashtable<String, Object>();
+ public static Map<String, Object> getXmlRpcExtractorSpec(ExtractorSpec spec) {
+ Map<String, Object> extractorHash = new HashMap<String, Object>();
extractorHash.put("className", spec.getClassName());
extractorHash.put("config",
getXmlRpcProperties(spec.getConfiguration()));
return extractorHash;
}
- public static Vector<Hashtable<String, Object>> getXmlRpcTypeHandlers(List<TypeHandler> typeHandlers) {
- Vector<Hashtable<String, Object>> handlersVector = new Vector<Hashtable<String, Object>>();
+ public static Vector<Map<String, Object>> getXmlRpcTypeHandlers(List<TypeHandler> typeHandlers) {
+ Vector<Map<String, Object>> handlersVector = new Vector<Map<String, Object>>();
if (typeHandlers != null && typeHandlers.size() > 0) {
for (TypeHandler typeHandler : typeHandlers) {
@@ -436,8 +436,8 @@ public final class XmlRpcStructFactory {
return handlersVector;
}
- public static Hashtable<String, Object> getXmlRpcTypeHandler(TypeHandler typeHandler) {
- Hashtable<String, Object> handlerHash = new Hashtable<String, Object>();
+ public static Map<String, Object> getXmlRpcTypeHandler(TypeHandler typeHandler) {
+ Map<String, Object> handlerHash = new HashMap<String, Object>();
handlerHash.put("className", typeHandler != null ?
typeHandler.getClass().getCanonicalName():"");
handlerHash.put("elementName", typeHandler != null ?
@@ -445,11 +445,11 @@ public final class XmlRpcStructFactory {
return handlerHash;
}
- public static List<ExtractorSpec> getTypeExtractorsFromXmlRpc(Vector<Hashtable<String, Object>> extractorsVector) {
+ public static List<ExtractorSpec> getTypeExtractorsFromXmlRpc(Vector<Map<String, Object>> extractorsVector) {
List<ExtractorSpec> extractors = new Vector<ExtractorSpec>();
if (extractorsVector != null && extractorsVector.size() > 0) {
- for (Hashtable<String, Object> extractorSpecHash : extractorsVector) {
+ for (Map<String, Object> extractorSpecHash : extractorsVector) {
extractors.add(getExtractorSpecFromXmlRpc(extractorSpecHash));
}
}
@@ -459,20 +459,20 @@ public final class XmlRpcStructFactory {
@SuppressWarnings("unchecked")
public static ExtractorSpec getExtractorSpecFromXmlRpc(
- Hashtable<String, Object> extractorSpecHash) {
+ Map<String, Object> extractorSpecHash) {
ExtractorSpec spec = new ExtractorSpec();
spec.setClassName((String) extractorSpecHash.get("className"));
spec
- .setConfiguration(getPropertiesFromXmlRpc((Hashtable<String, String>) extractorSpecHash
+ .setConfiguration(getPropertiesFromXmlRpc((Map<String, String>) extractorSpecHash
.get("config")));
return spec;
}
- public static List<TypeHandler> getTypeHandlersFromXmlRpc(Vector<Hashtable<String, Object>> handlersVector) {
+ public static List<TypeHandler> getTypeHandlersFromXmlRpc(Vector<Map<String, Object>> handlersVector) {
List<TypeHandler> handlers = new Vector<TypeHandler>();
if (handlersVector != null && handlersVector.size() > 0) {
- for (Hashtable<String, Object> typeHandlerHash : handlersVector) {
+ for (Map<String, Object> typeHandlerHash : handlersVector) {
handlers.add(getTypeHandlerFromXmlRpc(typeHandlerHash));
}
}
@@ -481,7 +481,7 @@ public final class XmlRpcStructFactory {
}
public static TypeHandler getTypeHandlerFromXmlRpc(
- Hashtable<String, Object> typeHandlerHash) {
+ Map<String, Object> typeHandlerHash) {
TypeHandler typeHandler = GenericFileManagerObjectFactory
.getTypeHandlerFromClassName((String) typeHandlerHash.get("className"));
if(typeHandler != null) {
@@ -490,7 +490,7 @@ public final class XmlRpcStructFactory {
return typeHandler;
}
- public static Properties getPropertiesFromXmlRpc(Hashtable<String, String> propHash) {
+ public static Properties getPropertiesFromXmlRpc(Map<String, String> propHash) {
Properties props = new Properties();
if (propHash != null && propHash.keySet().size() > 0) {
@@ -503,8 +503,8 @@ public final class XmlRpcStructFactory {
return props;
}
- public static Hashtable<String, String> getXmlRpcProperties(Properties props) {
- Hashtable<String, String> propHash = new Hashtable<String, String>();
+ public static Map<String, String> getXmlRpcProperties(Properties props) {
+ Map<String, String> propHash = new HashMap<String, String>();
if (props != null && props.keySet().size() > 0) {
for (Object o : props.keySet()) {
@@ -517,32 +517,32 @@ public final class XmlRpcStructFactory {
return propHash;
}
- public static Vector<Hashtable<String, Object>> getXmlRpcReferences(List<Reference> references) {
- Vector<Hashtable<String, Object>> refVector = new Vector<Hashtable<String, Object>>();
+ public static Vector<Map<String, Object>> getXmlRpcReferences(List<Reference> references) {
+ Vector<Map<String, Object>> refVector = new Vector<Map<String, Object>>();
if (references == null) {
return refVector;
}
for (Reference reference : references) {
- Hashtable<String, Object> refHash = getXmlRpcReference(reference);
+ Map<String, Object> refHash = getXmlRpcReference(reference);
refVector.add(refHash);
}
return refVector;
}
- public static List<Reference> getReferencesFromXmlRpc(Vector<Hashtable<String, Object>> referenceVector) {
+ public static List<Reference> getReferencesFromXmlRpc(Vector<Map<String, Object>> referenceVector) {
List<Reference> references = new Vector<Reference>();
- for (Hashtable<String, Object> aReferenceVector : referenceVector) {
+ for (Map<String, Object> aReferenceVector : referenceVector) {
Reference r = getReferenceFromXmlRpc(aReferenceVector);
references.add(r);
}
return references;
}
- public static Hashtable<String, Object> getXmlRpcReference(Reference reference) {
- Hashtable<String, Object> referenceHash = new Hashtable<String, Object>();
+ public static Map<String, Object> getXmlRpcReference(Reference reference) {
+ Map<String, Object> referenceHash = new HashMap<String, Object>();
referenceHash.put("origReference", reference.getOrigReference());
referenceHash.put("dataStoreReference", reference
.getDataStoreReference() != null ? reference
@@ -554,7 +554,7 @@ public final class XmlRpcStructFactory {
return referenceHash;
}
- public static Reference getReferenceFromXmlRpc(Hashtable<String, Object> referenceHash) {
+ public static Reference getReferenceFromXmlRpc(Map<String, Object> referenceHash) {
Reference reference = new Reference();
reference.setDataStoreReference((String) referenceHash
.get("dataStoreReference"));
@@ -564,26 +564,26 @@ public final class XmlRpcStructFactory {
return reference;
}
- public static Vector<Hashtable<String, Object>> getXmlRpcElementList(List<Element> elementList) {
- Vector<Hashtable<String, Object>> elementVector = new Vector<Hashtable<String, Object>>(elementList.size());
+ public static Vector<Map<String, Object>> getXmlRpcElementList(List<Element> elementList) {
+ Vector<Map<String, Object>> elementVector = new Vector<Map<String, Object>>(elementList.size());
for (Element element : elementList) {
- Hashtable<String, Object> elementHash = getXmlRpcElement(element);
+ Map<String, Object> elementHash = getXmlRpcElement(element);
elementVector.add(elementHash);
}
return elementVector;
}
- public static List<Element> getElementListFromXmlRpc(Vector<Hashtable<String, Object>> elementVector) {
+ public static List<Element> getElementListFromXmlRpc(Vector<Map<String, Object>> elementVector) {
List<Element> elementList = new Vector<Element>(elementVector.size());
- for (Hashtable<String, Object> elementHash : elementVector) {
+ for (Map<String, Object> elementHash : elementVector) {
Element element = getElementFromXmlRpc(elementHash);
elementList.add(element);
}
return elementList;
}
- public static Hashtable<String, Object> getXmlRpcElement(Element element) {
- Hashtable<String, Object> elementHash = new Hashtable<String, Object>();
+ public static Map<String, Object> getXmlRpcElement(Element element) {
+ Map<String, Object> elementHash = new HashMap<String, Object>();
elementHash.put("id", element.getElementId());
elementHash.put("name", element.getElementName());
@@ -596,7 +596,7 @@ public final class XmlRpcStructFactory {
return elementHash;
}
- public static Element getElementFromXmlRpc(Hashtable<String, Object> elementHash) {
+ public static Element getElementFromXmlRpc(Map<String, Object> elementHash) {
Element element = new Element();
element.setElementId((String) elementHash.get("id"));
element.setElementName((String) elementHash.get("name"));
@@ -606,44 +606,44 @@ public final class XmlRpcStructFactory {
return element;
}
- public static Hashtable<String, Object> getXmlRpcQuery(Query query) {
- Hashtable<String, Object> queryHash = new Hashtable<String, Object>();
- Vector<Hashtable<String, Object>> criteriaVector = getXmlRpcQueryCriteriaList(query.getCriteria());
+ public static Map<String, Object> getXmlRpcQuery(Query query) {
+ Map<String, Object> queryHash = new HashMap<String, Object>();
+ Vector<Map<String, Object>> criteriaVector = getXmlRpcQueryCriteriaList(query.getCriteria());
queryHash.put("criteria", criteriaVector);
return queryHash;
}
- public static Query getQueryFromXmlRpc(Hashtable<String, Object> queryHash) {
+ public static Query getQueryFromXmlRpc(Map<String, Object> queryHash) {
Query query = new Query();
@SuppressWarnings("unchecked")
- List<QueryCriteria> criteria = getQueryCriteriaListFromXmlRpc((Vector<Hashtable<String, Object>>) queryHash
+ List<QueryCriteria> criteria = getQueryCriteriaListFromXmlRpc((Vector<Map<String, Object>>) queryHash
.get("criteria"));
query.setCriteria(criteria);
return query;
}
- public static Vector<Hashtable<String, Object>> getXmlRpcQueryCriteriaList(List<QueryCriteria> criteriaList) {
- Vector<Hashtable<String, Object>> criteriaVector = new Vector<Hashtable<String, Object>>(criteriaList.size());
+ public static Vector<Map<String, Object>> getXmlRpcQueryCriteriaList(List<QueryCriteria> criteriaList) {
+ Vector<Map<String, Object>> criteriaVector = new Vector<Map<String, Object>>(criteriaList.size());
for (QueryCriteria criteria : criteriaList) {
- Hashtable<String, Object> criteriaHash = getXmlRpcQueryCriteria(criteria);
+ Map<String, Object> criteriaHash = getXmlRpcQueryCriteria(criteria);
criteriaVector.add(criteriaHash);
}
return criteriaVector;
}
- public static List<QueryCriteria> getQueryCriteriaListFromXmlRpc(Vector<Hashtable<String, Object>> criteriaVector) {
+ public static List<QueryCriteria> getQueryCriteriaListFromXmlRpc(Vector<Map<String, Object>> criteriaVector) {
List<QueryCriteria> criteriaList = new Vector<QueryCriteria>(criteriaVector.size());
- for (Hashtable<String, Object> criteriaHash : criteriaVector) {
+ for (Map<String, Object> criteriaHash : criteriaVector) {
QueryCriteria criteria = getQueryCriteriaFromXmlRpc(criteriaHash);
criteriaList.add(criteria);
}
return criteriaList;
}
- public static Hashtable<String, Object> getXmlRpcQueryCriteria(QueryCriteria criteria) {
- Hashtable<String, Object> criteriaHash = new Hashtable<String, Object>();
+ public static Map<String, Object> getXmlRpcQueryCriteria(QueryCriteria criteria) {
+ Map<String, Object> criteriaHash = new HashMap<String, Object>();
criteriaHash.put("class",criteria.getClass().getCanonicalName());
if(criteria instanceof TermQueryCriteria){
@@ -659,11 +659,11 @@ public final class XmlRpcStructFactory {
} else if(criteria instanceof BooleanQueryCriteria){
BooleanQueryCriteria boolQuery = (BooleanQueryCriteria) criteria;
criteriaHash.put("operator", boolQuery.getOperator());
- Vector<Hashtable<String, Object>> termsHash = new Vector<Hashtable<String, Object>>();
+ Vector<Map<String, Object>> termsHash = new Vector<Map<String, Object>>();
List<QueryCriteria> terms = boolQuery.getTerms();
for (QueryCriteria term : terms) {
- Hashtable<String, Object> termHash = getXmlRpcQueryCriteria(term);
+ Map<String, Object> termHash = getXmlRpcQueryCriteria(term);
termsHash.add(termHash);
}
criteriaHash.put("terms", termsHash);
@@ -674,7 +674,7 @@ public final class XmlRpcStructFactory {
return criteriaHash;
}
- public static QueryCriteria getQueryCriteriaFromXmlRpc(Hashtable<String, Object> criteriaHash) {
+ public static QueryCriteria getQueryCriteriaFromXmlRpc(Map<String, Object> criteriaHash) {
QueryCriteria criteria = null;
if(criteriaHash.get("class").equals(TermQueryCriteria.class.getCanonicalName())){
criteria = new TermQueryCriteria();
@@ -698,8 +698,8 @@ public final class XmlRpcStructFactory {
System.out.println("Error generating Boolean Query.");
}
@SuppressWarnings("unchecked")
- List<Hashtable<String, Object>> terms = (List<Hashtable<String, Object>>) criteriaHash.get("terms");
- for (Hashtable<String, Object> term : terms) {
+ List<Map<String, Object>> terms = (List<Map<String, Object>>) criteriaHash.get("terms");
+ for (Map<String, Object> term : terms) {
QueryCriteria termCriteria = getQueryCriteriaFromXmlRpc(term);
try {
((BooleanQueryCriteria) criteria).addTerm(termCriteria);
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/filemgr/src/test/java/org/apache/oodt/cas/filemgr/repository/TestXMLRepositoryManager.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/repository/TestXMLRepositoryManager.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/repository/TestXMLRepositoryManager.java
index 073d6f7..c5e9ca7 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/repository/TestXMLRepositoryManager.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/repository/TestXMLRepositoryManager.java
@@ -191,7 +191,7 @@ public class TestXMLRepositoryManager extends TestCase {
assertTrue(type.getTypeMetadata().containsKey("Creator"));
assertTrue(type.getTypeMetadata().containsKey("Contributor"));
- assertEquals(2, type.getTypeMetadata().getHashtable().keySet().size());
+ assertEquals(2, type.getTypeMetadata().getMap().keySet().size());
assertNotNull(type.getTypeMetadata().getAllMetadata("Creator"));
assertEquals(2, type.getTypeMetadata().getAllMetadata("Creator").size());
assertNotNull(type.getTypeMetadata().getAllMetadata("Contributor"));
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java
index ec6d392..02d6412 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java
@@ -100,17 +100,17 @@ public class TestXmlRpcFileManagerClient extends TestCase {
reducedMet = fmc.getReducedMetadata(product, arrayListElems);
assertNotNull(reducedMet);
assertTrue(reducedMet.containsKey(CoreMetKeys.FILENAME));
- assertEquals(reducedMet.getHashtable().keySet().size(), 1);
+ assertEquals(reducedMet.getMap().keySet().size(), 1);
reducedMet = fmc.getReducedMetadata(product, vectorElemList);
assertNotNull(reducedMet);
assertTrue(reducedMet.containsKey(CoreMetKeys.FILENAME));
- assertEquals(reducedMet.getHashtable().keySet().size(), 1);
+ assertEquals(reducedMet.getMap().keySet().size(), 1);
reducedMet = fmc.getReducedMetadata(product, linkedListElemList);
assertNotNull(reducedMet);
assertTrue(reducedMet.containsKey(CoreMetKeys.FILENAME));
- assertEquals(reducedMet.getHashtable().keySet().size(), 1);
+ assertEquals(reducedMet.getMap().keySet().size(), 1);
} catch (Exception e) {
fail(e.getMessage());
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/filemgr/src/test/java/org/apache/oodt/cas/filemgr/util/TestXmlRpcStructFactory.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/util/TestXmlRpcStructFactory.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/util/TestXmlRpcStructFactory.java
index bc34989..ef1b0f1 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/util/TestXmlRpcStructFactory.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/util/TestXmlRpcStructFactory.java
@@ -17,6 +17,7 @@
package org.apache.oodt.cas.filemgr.util;
//OODT imports
+
import org.apache.oodt.cas.filemgr.datatransfer.InPlaceDataTransferFactory;
import org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory;
import org.apache.oodt.cas.filemgr.structs.ExtractorSpec;
@@ -30,20 +31,21 @@ import org.apache.oodt.cas.filemgr.system.XmlRpcFileManager;
import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
import org.apache.oodt.cas.metadata.Metadata;
-//Google imports
import com.google.common.collect.Lists;
-//JDK imports
import java.io.File;
import java.io.FileInputStream;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.Hashtable;
+import java.util.Map;
import java.util.Properties;
-//JUnit imports
import junit.framework.TestCase;
+//Google imports
+//JDK imports
+//JUnit imports
+
/**
* Test class for {@link XmlRpcStructFactory}.
*
@@ -78,7 +80,7 @@ public class TestXmlRpcStructFactory extends TestCase {
fmClient.setDataTransfer(new LocalDataTransferFactory().createDataTransfer());
ProductType productType = fmClient.getProductTypeByName("GenericFile");
- Hashtable<String, Object> productTypeHash = XmlRpcStructFactory.getXmlRpcProductType(productType);
+ Map<String, Object> productTypeHash = XmlRpcStructFactory.getXmlRpcProductType(productType);
ProductType convBackProdType = XmlRpcStructFactory.getProductTypeFromXmlRpc(productTypeHash);
assertTrue(productType.getProductTypeId().equals(convBackProdType.getProductTypeId()));
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/metadata/src/main/java/org/apache/oodt/cas/metadata/Metadata.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/Metadata.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/Metadata.java
index 3d3d74a..7f32391 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/Metadata.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/Metadata.java
@@ -16,6 +16,7 @@
package org.apache.oodt.cas.metadata;
//JDK imports
+
import java.util.Collections;
import java.util.HashMap;
import java.util.Hashtable;
@@ -386,21 +387,27 @@ public class Metadata {
return values;
}
+ @Deprecated
public void addMetadata(Hashtable<String, Object> metadata) {
addMetadata(metadata, false);
}
+ public void addMetadata(Map<String, Object> metadata) {
+ addMetadata(metadata, false);
+ }
+
/**
- * Takes a hashtable of String keys and Object values. Values of type List
+ * Takes a Map of String keys and Object values. Values of type List
* must be a List of Strings; all other values will have its toString() method
* invoked.
- * @param metadata Hashtable based metadata to add
+ * @param metadata Map based metadata to add
* @param replace If true, existing keys will be replaced, other values will be
* combined.
*/
- public void addMetadata(Hashtable<String, Object> metadata, boolean replace) {
+ @Deprecated
+ public void addMetadata(HashMap<String, Object> metadata, boolean replace) {
// for back compat: the old method allowed us to give it a
- // Hashtable<String,String> and it still worked
+ // Map<String,String> and it still worked
for (Map.Entry<String, Object> key : metadata.entrySet()) {
List<String> vals = (key.getValue() instanceof List) ? (List<String>) key.getValue()
: Collections.singletonList(key.getValue().toString());
@@ -412,7 +419,21 @@ public class Metadata {
}
}
- public void replaceMetadata(Hashtable<String, Object> metadata) {
+ public void addMetadata(Map<String, Object> metadata, boolean replace) {
+ // for back compat: the old method allowed us to give it a
+ // Map<String,String> and it still worked
+ for (Map.Entry<String, Object> key : metadata.entrySet()) {
+ List<String> vals = (key.getValue() instanceof List) ? (List<String>) key.getValue()
+ : Collections.singletonList(key.getValue().toString());
+ if (replace) {
+ this.replaceMetadata(key.getKey(), vals);
+ } else {
+ this.addMetadata(key.getKey(), vals);
+ }
+ }
+ }
+
+ public void replaceMetadata(Map<String, Object> metadata) {
this.root = this.createNewRoot();
this.addMetadata(metadata);
}
@@ -575,7 +596,8 @@ public class Metadata {
}
- public Hashtable<String, Object> getHashtable() {
+ @Deprecated
+ public Hashtable<String, Object> getHashTable() {
Hashtable<String, Object> table = new Hashtable<String, Object>();
for (String key : this.getAllKeys()) {
table.put(key, this.getAllMetadata(key));
@@ -583,6 +605,14 @@ public class Metadata {
return table;
}
+ public Map<String, Object> getMap() {
+ Map<String, Object> table = new HashMap<String, Object>();
+ for (String key : this.getAllKeys()) {
+ table.put(key, this.getAllMetadata(key));
+ }
+ return table;
+ }
+
public boolean equals(Object obj) {
if (obj instanceof Metadata) {
Metadata compMet = (Metadata) obj;
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/metadata/src/main/java/org/apache/oodt/cas/metadata/SerializableMetadata.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/SerializableMetadata.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/SerializableMetadata.java
index c9a9c29..6a924b4 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/SerializableMetadata.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/SerializableMetadata.java
@@ -263,7 +263,7 @@ public class SerializableMetadata extends Metadata implements Serializable {
*/
public Metadata getMetadata() {
Metadata metadata = new Metadata();
- metadata.addMetadata(this.getHashtable());
+ metadata.addMetadata(this.getMap());
return metadata;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenMetExtractor.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenMetExtractor.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenMetExtractor.java
index 092c726..ed916cd 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenMetExtractor.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenMetExtractor.java
@@ -18,6 +18,10 @@
package org.apache.oodt.cas.metadata.extractors;
//JDK imports
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
+import org.apache.oodt.commons.date.DateUtils;
+
import java.io.File;
import java.text.ParseException;
import java.util.Calendar;
@@ -26,10 +30,6 @@ import java.util.List;
import java.util.logging.Logger;
//OODT imports
-import org.apache.oodt.cas.metadata.Metadata;
-import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
-import org.apache.oodt.cas.metadata.extractors.CmdLineMetExtractor;
-import org.apache.oodt.commons.date.DateUtils;
/**
*
@@ -89,7 +89,7 @@ public class FilenameTokenMetExtractor extends CmdLineMetExtractor implements
}
Metadata commonMet = ((FilenameTokenConfig) this.config).getCommonMet();
- met.addMetadata(commonMet.getHashtable());
+ met.addMetadata(commonMet.getMap());
met.addMetadata(((FilenameTokenConfig) this.config)
.getSubstringOffsetMet(file));
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java
----------------------------------------------------------------------
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java b/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java
index e86840e..b22230d 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java
@@ -134,9 +134,9 @@ public final class PCSTrace implements PCSMetadata, PCSConfigMetadata {
System.out.println(REPORT_LINE_SEPARATOR);
System.out.println("Metadata: ");
Metadata met = fm.safeGetMetadata(prod);
- if (met != null && met.getHashtable() != null
- && met.getHashtable().keySet().size() > 0) {
- for (String key : met.getHashtable().keySet()) {
+ if (met != null && met.getMap() != null
+ && met.getMap().keySet().size() > 0) {
+ for (String key : met.getMap().keySet()) {
List vals = met.getAllMetadata(key);
System.out.println(key + "=>" + vals);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java b/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java
index 4e0dc4c..44e1f9c 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java
@@ -16,10 +16,6 @@
*/
package org.apache.oodt.cas.pge.util;
-import com.google.common.base.Splitter;
-import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
-
import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
import org.apache.oodt.cas.filemgr.util.QueryUtils;
import org.apache.oodt.cas.filemgr.util.SqlParser;
@@ -31,6 +27,11 @@ import org.apache.oodt.cas.pge.config.OutputDir;
import org.apache.oodt.cas.pge.config.RegExprOutputFiles;
import org.apache.oodt.cas.pge.exceptions.PGEException;
import org.apache.oodt.commons.xml.XMLUtils;
+
+import com.google.common.base.Splitter;
+import com.google.common.base.Strings;
+import com.google.common.collect.Lists;
+
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -444,7 +445,6 @@ public class XmlHelper {
while ((value = PathUtils
.doDynamicReplacement(value, inputMetadata)).contains("[")
&& envReplaceRecur) {
- ;
}
if (value.toUpperCase().matches(
"^\\s*SQL\\s*\\(.*\\)\\s*\\{.*\\}\\s*$")) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/pge/src/main/java/org/apache/oodt/cas/pge/writers/ExternExtractorMetWriter.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/writers/ExternExtractorMetWriter.java b/pge/src/main/java/org/apache/oodt/cas/pge/writers/ExternExtractorMetWriter.java
index 3f64d7f..a390601 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/writers/ExternExtractorMetWriter.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/writers/ExternExtractorMetWriter.java
@@ -48,6 +48,6 @@ public class ExternExtractorMetWriter extends PcsMetFileWriter {
(String) customArgs[0])));
Metadata m = new Metadata();
m.addMetadata(extractor.extractMetadata(sciPgeConfigFilePath)
- .getHashtable(), true);
+ .getMap(), true);
return m; }
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/profile/src/main/java/org/apache/oodt/profile/handlers/cas/util/ProfileUtils.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/handlers/cas/util/ProfileUtils.java b/profile/src/main/java/org/apache/oodt/profile/handlers/cas/util/ProfileUtils.java
index 7add2f2..6f0958e 100644
--- a/profile/src/main/java/org/apache/oodt/profile/handlers/cas/util/ProfileUtils.java
+++ b/profile/src/main/java/org/apache/oodt/profile/handlers/cas/util/ProfileUtils.java
@@ -89,7 +89,7 @@ public final class ProfileUtils {
prof.setResourceAttributes(resAttrs);
// build up profile elements
- for (String key : met.getHashtable().keySet()) {
+ for (String key : met.getMap().keySet()) {
List vals = met.getAllMetadata(key);
EnumeratedProfileElement elem = new EnumeratedProfileElement(prof);
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonLauncher.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonLauncher.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonLauncher.java
index 5eb2a61..c9a45d6 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonLauncher.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonLauncher.java
@@ -131,7 +131,7 @@ public class DaemonLauncher implements DaemonLauncherMBean {
private synchronized int getNextDaemonId() {
while (this.dm.getUsedIDs().contains(++this.nextDaemonId)) {
- ;
+
}
return this.nextDaemonId;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java b/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java
index 38b89c4..55e102d 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java
@@ -19,7 +19,6 @@
package org.apache.oodt.cas.resource.scheduler;
//JDKimports
-import java.lang.Double;
import java.util.logging.Level;
import java.util.logging.Logger;
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/resource/src/main/java/org/apache/oodt/cas/resource/structs/NameValueJobInput.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/structs/NameValueJobInput.java b/resource/src/main/java/org/apache/oodt/cas/resource/structs/NameValueJobInput.java
index 4c19c9b..b14cfa9 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/structs/NameValueJobInput.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/structs/NameValueJobInput.java
@@ -19,7 +19,8 @@
package org.apache.oodt.cas.resource.structs;
//JDK imports
-import java.util.Hashtable;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Properties;
/**
@@ -69,13 +70,13 @@ public class NameValueJobInput implements JobInput {
*/
public void read(Object in) {
// we want to make sure that we're reading in
- // a java.util.Hashtable
+ // a java.util.Map
// if not then just return
- if (!(in instanceof Hashtable)) {
+ if (!(in instanceof Map)) {
return;
}
- Hashtable readable = (Hashtable) in;
+ Map readable = (Map) in;
for (Object o : readable.keySet()) {
String key = (String) o;
String value = (String) readable.get(key);
@@ -90,7 +91,7 @@ public class NameValueJobInput implements JobInput {
* @see org.apache.oodt.cas.resource.util.XmlRpcWriteable#write()
*/
public Object write() {
- Hashtable writeable = new Hashtable();
+ Map writeable = new HashMap();
if (props != null && props.size() > 0) {
for (Object o : props.keySet()) {
String key = (String) o;
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java b/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java
index ec29690..c767bf3 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java
@@ -41,7 +41,7 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.Collections;
import java.util.Date;
-import java.util.Hashtable;
+import java.util.Map;
import java.util.List;
import java.util.Vector;
import java.util.logging.Level;
@@ -141,7 +141,7 @@ public class XmlRpcResourceManager {
return scheduler.getJobQueue().getJobRepository().jobFinished(spec);
}
- public Hashtable getJobInfo(String jobId) throws JobRepositoryException {
+ public Map getJobInfo(String jobId) throws JobRepositoryException {
JobSpec spec;
try {
@@ -158,82 +158,82 @@ public class XmlRpcResourceManager {
return XmlRpcStructFactory.getXmlRpcJob(spec.getJob());
}
- public String handleJob(Hashtable jobHash, Hashtable jobIn)
+ public String handleJob(Map jobHash, Map jobIn)
throws SchedulerException {
return genericHandleJob(jobHash, jobIn);
}
- public String handleJob(Hashtable jobHash, int jobIn)
+ public String handleJob(Map jobHash, int jobIn)
throws SchedulerException {
return genericHandleJob(jobHash, jobIn);
}
- public String handleJob(Hashtable jobHash, boolean jobIn)
+ public String handleJob(Map jobHash, boolean jobIn)
throws SchedulerException {
return genericHandleJob(jobHash, jobIn);
}
- public String handleJob(Hashtable jobHash, String jobIn)
+ public String handleJob(Map jobHash, String jobIn)
throws SchedulerException {
return genericHandleJob(jobHash, jobIn);
}
- public String handleJob(Hashtable jobHash, double jobIn)
+ public String handleJob(Map jobHash, double jobIn)
throws SchedulerException {
return genericHandleJob(jobHash, jobIn);
}
- public String handleJob(Hashtable jobHash, Date jobIn)
+ public String handleJob(Map jobHash, Date jobIn)
throws SchedulerException {
return genericHandleJob(jobHash, jobIn);
}
- public String handleJob(Hashtable jobHash, Vector jobIn)
+ public String handleJob(Map jobHash, Vector jobIn)
throws SchedulerException {
return genericHandleJob(jobHash, jobIn);
}
- public String handleJob(Hashtable jobHash, byte[] jobIn)
+ public String handleJob(Map jobHash, byte[] jobIn)
throws SchedulerException {
return genericHandleJob(jobHash, jobIn);
}
- public boolean handleJob(Hashtable jobHash, Hashtable jobIn, String urlStr)
+ public boolean handleJob(Map jobHash, Map jobIn, String urlStr)
throws JobExecutionException {
return genericHandleJob(jobHash, jobIn, urlStr);
}
- public boolean handleJob(Hashtable jobHash, int jobIn, String urlStr)
+ public boolean handleJob(Map jobHash, int jobIn, String urlStr)
throws JobExecutionException {
return genericHandleJob(jobHash, jobIn, urlStr);
}
- public boolean handleJob(Hashtable jobHash, boolean jobIn, String urlStr)
+ public boolean handleJob(Map jobHash, boolean jobIn, String urlStr)
throws JobExecutionException {
return genericHandleJob(jobHash, jobIn, urlStr);
}
- public boolean handleJob(Hashtable jobHash, String jobIn, String urlStr)
+ public boolean handleJob(Map jobHash, String jobIn, String urlStr)
throws JobExecutionException {
return genericHandleJob(jobHash, jobIn, urlStr);
}
- public boolean handleJob(Hashtable jobHash, double jobIn, String urlStr)
+ public boolean handleJob(Map jobHash, double jobIn, String urlStr)
throws JobExecutionException {
return genericHandleJob(jobHash, jobIn, urlStr);
}
- public boolean handleJob(Hashtable jobHash, Date jobIn, String urlStr)
+ public boolean handleJob(Map jobHash, Date jobIn, String urlStr)
throws JobExecutionException {
return genericHandleJob(jobHash, jobIn, urlStr);
}
- public boolean handleJob(Hashtable jobHash, Vector jobIn, String urlStr)
+ public boolean handleJob(Map jobHash, Vector jobIn, String urlStr)
throws JobExecutionException {
return genericHandleJob(jobHash, jobIn, urlStr);
}
- public boolean handleJob(Hashtable jobHash, byte[] jobIn, String urlStr)
+ public boolean handleJob(Map jobHash, byte[] jobIn, String urlStr)
throws JobExecutionException {
return genericHandleJob(jobHash, jobIn, urlStr);
}
@@ -243,7 +243,7 @@ public class XmlRpcResourceManager {
return XmlRpcStructFactory.getXmlRpcResourceNodeList(resNodes);
}
- public Hashtable getNodeById(String nodeId) throws MonitorException {
+ public Map getNodeById(String nodeId) throws MonitorException {
ResourceNode node = scheduler.getMonitor().getNodeById(nodeId);
return XmlRpcStructFactory.getXmlRpcResourceNode(node);
@@ -286,7 +286,7 @@ public class XmlRpcResourceManager {
return true;
}
- public boolean addNode(Hashtable hashNode) throws MonitorException {
+ public boolean addNode(Map hashNode) throws MonitorException {
this.scheduler.getMonitor().addNode(XmlRpcStructFactory.getResourceNodeFromXmlRpc(hashNode));
return true;
}
@@ -462,7 +462,7 @@ public class XmlRpcResourceManager {
return true;
}
- private String genericHandleJob(Hashtable jobHash, Object jobIn)
+ private String genericHandleJob(Map jobHash, Object jobIn)
throws SchedulerException {
Job exec = XmlRpcStructFactory.getJobFromXmlRpc(jobHash);
@@ -487,7 +487,7 @@ public class XmlRpcResourceManager {
return jobId;
}
- private boolean genericHandleJob(Hashtable jobHash, Object jobIn,
+ private boolean genericHandleJob(Map jobHash, Object jobIn,
String urlStr) throws JobExecutionException {
Job exec = XmlRpcStructFactory.getJobFromXmlRpc(jobHash);
JobInput in = GenericResourceManagerObjectFactory
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManagerClient.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManagerClient.java b/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManagerClient.java
index bb19e13..c700e61 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManagerClient.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManagerClient.java
@@ -38,7 +38,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.net.URL;
-import java.util.Hashtable;
+import java.util.Map;
import java.util.List;
import java.util.Vector;
import java.util.logging.Level;
@@ -143,10 +143,10 @@ public class XmlRpcResourceManagerClient {
Vector argList = new Vector();
argList.add(jobId);
- Hashtable jobHash;
+ Map jobHash;
try {
- jobHash = (Hashtable) client.execute("resourcemgr.getJobInfo",
+ jobHash = (Map) client.execute("resourcemgr.getJobInfo",
argList);
} catch (XmlRpcException e) {
throw new JobRepositoryException(e.getMessage(), e);
@@ -289,10 +289,10 @@ public class XmlRpcResourceManagerClient {
Vector argList = new Vector();
argList.add(nodeId);
- Hashtable resNodeHash;
+ Map resNodeHash;
try {
- resNodeHash = (Hashtable) client.execute("resourcemgr.getNodeById",
+ resNodeHash = (Map) client.execute("resourcemgr.getNodeById",
argList);
} catch (XmlRpcException e) {
throw new MonitorException(e.getMessage(), e);
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/resource/src/main/java/org/apache/oodt/cas/resource/system/extern/XmlRpcBatchStub.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/system/extern/XmlRpcBatchStub.java b/resource/src/main/java/org/apache/oodt/cas/resource/system/extern/XmlRpcBatchStub.java
index 7d1fc6d..9f41840 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/system/extern/XmlRpcBatchStub.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/system/extern/XmlRpcBatchStub.java
@@ -30,7 +30,6 @@ import org.apache.xmlrpc.WebServer;
import java.util.Date;
import java.util.HashMap;
-import java.util.Hashtable;
import java.util.Map;
import java.util.Vector;
import java.util.logging.Level;
@@ -80,42 +79,42 @@ public class XmlRpcBatchStub {
return true;
}
- public boolean executeJob(Hashtable jobHash, Hashtable jobInput)
+ public boolean executeJob(Map jobHash, Map jobInput)
throws JobException {
return genericExecuteJob(jobHash, jobInput);
}
- public boolean executeJob(Hashtable jobHash, Date jobInput)
+ public boolean executeJob(Map jobHash, Date jobInput)
throws JobException {
return genericExecuteJob(jobHash, jobInput);
}
- public boolean executeJob(Hashtable jobHash, double jobInput)
+ public boolean executeJob(Map jobHash, double jobInput)
throws JobException {
return genericExecuteJob(jobHash, jobInput);
}
- public boolean executeJob(Hashtable jobHash, int jobInput)
+ public boolean executeJob(Map jobHash, int jobInput)
throws JobException {
return genericExecuteJob(jobHash, jobInput);
}
- public boolean executeJob(Hashtable jobHash, boolean jobInput)
+ public boolean executeJob(Map jobHash, boolean jobInput)
throws JobException {
return genericExecuteJob(jobHash, jobInput);
}
- public boolean executeJob(Hashtable jobHash, Vector jobInput)
+ public boolean executeJob(Map jobHash, Vector jobInput)
throws JobException {
return genericExecuteJob(jobHash, jobInput);
}
- public boolean executeJob(Hashtable jobHash, byte[] jobInput)
+ public boolean executeJob(Map jobHash, byte[] jobInput)
throws JobException {
return genericExecuteJob(jobHash, jobInput);
}
- public synchronized boolean killJob(Hashtable jobHash) {
+ public synchronized boolean killJob(Map jobHash) {
Job job = XmlRpcStructFactory.getJobFromXmlRpc(jobHash);
Thread jobThread = (Thread) jobThreadMap.get(job.getId());
if (jobThread == null) {
@@ -129,7 +128,7 @@ public class XmlRpcBatchStub {
return true;
}
- private boolean genericExecuteJob(Hashtable jobHash, Object jobInput) {
+ private boolean genericExecuteJob(Map jobHash, Object jobInput) {
JobInstance exec = null;
JobInput in = null;
try {
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java b/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java
index 51a1eb6..529525d 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java
@@ -18,16 +18,19 @@
package org.apache.oodt.cas.resource.util;
//OODT imports
+
import org.apache.oodt.cas.resource.structs.Job;
import org.apache.oodt.cas.resource.structs.ResourceNode;
-//JDK imports
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Hashtable;
import java.util.List;
+import java.util.Map;
import java.util.Vector;
+//JDK imports
+
/**
* @author mattmann
* @version $Revision$
@@ -55,7 +58,7 @@ public final class XmlRpcStructFactory {
return jobHash;
}
- public static Job getJobFromXmlRpc(Hashtable jobHash) {
+ public static Job getJobFromXmlRpc(Map jobHash) {
Job job = new Job();
job.setId((String) jobHash.get("job.id"));
job.setName((String) jobHash.get("job.name"));
@@ -129,7 +132,7 @@ public final class XmlRpcStructFactory {
return resNodeHash;
}
- public static ResourceNode getResourceNodeFromXmlRpc(Hashtable resNodeHash) {
+ public static ResourceNode getResourceNodeFromXmlRpc(Map resNodeHash) {
ResourceNode node = new ResourceNode();
node.setId((String) resNodeHash.get("node.id"));
node.setCapacity(Integer
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/sso/src/main/java/org/apache/oodt/security/sso/opensso/IdentityDetails.java
----------------------------------------------------------------------
diff --git a/sso/src/main/java/org/apache/oodt/security/sso/opensso/IdentityDetails.java b/sso/src/main/java/org/apache/oodt/security/sso/opensso/IdentityDetails.java
index 7c0dcba..97916f1 100755
--- a/sso/src/main/java/org/apache/oodt/security/sso/opensso/IdentityDetails.java
+++ b/sso/src/main/java/org/apache/oodt/security/sso/opensso/IdentityDetails.java
@@ -18,11 +18,12 @@
package org.apache.oodt.security.sso.opensso;
//JDK imports
+import org.apache.oodt.cas.metadata.Metadata;
+
import java.util.List;
import java.util.Vector;
//OODT imports
-import org.apache.oodt.cas.metadata.Metadata;
/**
*
@@ -129,7 +130,7 @@ public class IdentityDetails {
public String toString() {
return "[name=" + this.name + ",type=" + this.type + ",realm=" + this.realm + ",roles=" + this.groups
- + ",attributes=" + this.attributes.getHashtable() + "]";
+ + ",attributes=" + this.attributes.getMap() + "]";
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/sso/src/main/java/org/apache/oodt/security/sso/opensso/UserDetails.java
----------------------------------------------------------------------
diff --git a/sso/src/main/java/org/apache/oodt/security/sso/opensso/UserDetails.java b/sso/src/main/java/org/apache/oodt/security/sso/opensso/UserDetails.java
index ab0b708..ae442b1 100755
--- a/sso/src/main/java/org/apache/oodt/security/sso/opensso/UserDetails.java
+++ b/sso/src/main/java/org/apache/oodt/security/sso/opensso/UserDetails.java
@@ -92,6 +92,6 @@ public class UserDetails {
}
public String toString() {
- return "[token=" + this.token + ",roles=" + this.roles + ",attributes=" + this.attributes.getHashtable() + "]";
+ return "[token=" + this.token + ",roles=" + this.roles + ",attributes=" + this.attributes.getMap() + "]";
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java
index 49f623d..dd16e11 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java
@@ -207,7 +207,7 @@ public class RDFDatasetServlet extends HttpServlet {
// and add RDF nodes underneath the RdfDesc for this product
if (type.getTypeMetadata() != null) {
- for (String key : type.getTypeMetadata().getHashtable().keySet()) {
+ for (String key : type.getTypeMetadata().getMap().keySet()) {
List<String> vals = type.getTypeMetadata().getAllMetadata(key);
if (vals != null && vals.size() > 0) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java
index 58bd4ed..9827bd1 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java
@@ -241,7 +241,7 @@ public class RDFProductServlet extends HttpServlet {
// and add RDF nodes underneath the RdfDesc for this product
if (prodMetadata != null) {
- for (String key : prodMetadata.getHashtable().keySet()) {
+ for (String key : prodMetadata.getMap().keySet()) {
List<String> vals = prodMetadata.getAllMetadata(key);
if (vals != null && vals.size() > 0) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/DynWorkflowCliAction.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/DynWorkflowCliAction.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/DynWorkflowCliAction.java
index 0b61e00..0e41165 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/DynWorkflowCliAction.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/DynWorkflowCliAction.java
@@ -52,7 +52,7 @@ public class DynWorkflowCliAction extends WorkflowCliAction {
} catch (Exception e) {
throw new CmdLineActionException(
"Failed to submit dynamic workflow for taskIds " + taskIds
- + " with metadata " + metadata.getHashtable() + " : "
+ + " with metadata " + metadata.getMap() + " : "
+ e.getMessage(), e);
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetWorkflowInstMetCliAction.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetWorkflowInstMetCliAction.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetWorkflowInstMetCliAction.java
index 0f18d29..bd8409f 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetWorkflowInstMetCliAction.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetWorkflowInstMetCliAction.java
@@ -39,7 +39,7 @@ public class GetWorkflowInstMetCliAction extends WorkflowCliAction {
try {
Metadata met = getClient().getWorkflowInstanceMetadata(instanceId);
- printer.println("[id=" + instanceId + ", met=" + met.getHashtable()
+ printer.println("[id=" + instanceId + ", met=" + met.getMap()
+ "]");
} catch (Exception e) {
throw new CmdLineActionException(
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/SendEventCliAction.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/SendEventCliAction.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/SendEventCliAction.java
index a9793c1..02ef2fa 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/SendEventCliAction.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/SendEventCliAction.java
@@ -52,7 +52,7 @@ public class SendEventCliAction extends WorkflowCliAction {
} catch (Exception e) {
throw new CmdLineActionException("Failed to send event '" + eventName
+ "' to url '" + getUrl() + "' with metadata '"
- + metadata.getHashtable() + "' : " + e.getMessage(), e);
+ + metadata.getMap() + "' : " + e.getMessage(), e);
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/MailTask.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/MailTask.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/MailTask.java
index 51b7a44..edf4528 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/MailTask.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/MailTask.java
@@ -19,8 +19,14 @@
package org.apache.oodt.cas.workflow.examples;
//JDK imports
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
+import org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance;
+import org.apache.oodt.cas.workflow.structs.exceptions.WorkflowTaskInstanceException;
+
import java.util.Date;
import java.util.Properties;
+
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.Session;
@@ -29,10 +35,6 @@ import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
//OODT imports
-import org.apache.oodt.cas.metadata.Metadata;
-import org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
-import org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance;
-import org.apache.oodt.cas.workflow.structs.exceptions.WorkflowTaskInstanceException;
/**
*
@@ -85,7 +87,7 @@ public class MailTask implements WorkflowTaskInstance {
private String getMsgStringFromMet(Metadata met) {
StringBuilder buf = new StringBuilder();
- for (Object key : met.getHashtable().keySet()) {
+ for (Object key : met.getMap().keySet()) {
String keyStr = (String) key;
StringBuilder val = new StringBuilder();
for (Object value : met.getAllMetadata(keyStr)) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepository.java
index 8210d5e..05688bd 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepository.java
@@ -892,8 +892,8 @@ public class DataSourceWorkflowInstanceRepository extends
throws InstanceRepositoryException {
if (inst.getSharedContext() != null
- && inst.getSharedContext().getHashtable().keySet().size() > 0) {
- for (String key : inst.getSharedContext().getHashtable().keySet()) {
+ && inst.getSharedContext().getMap().keySet().size() > 0) {
+ for (String key : inst.getSharedContext().getMap().keySet()) {
List vals = inst.getSharedContext().getAllMetadata(key);
if (vals != null && vals.size() > 0) {
for (Object val1 : vals) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/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 eca00ec..0e29502 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
@@ -19,6 +19,19 @@
package org.apache.oodt.cas.workflow.instrepo;
//OODT imports
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.search.BooleanClause;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.Hits;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Sort;
+import org.apache.lucene.search.SortField;
+import org.apache.lucene.search.TermQuery;
import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycleStage;
import org.apache.oodt.cas.workflow.lifecycle.WorkflowState;
@@ -30,7 +43,9 @@ import org.apache.oodt.cas.workflow.structs.WorkflowTask;
import org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
import org.apache.oodt.cas.workflow.structs.exceptions.InstanceRepositoryException;
-//JDK imports
+import org.safehaus.uuid.UUID;
+import org.safehaus.uuid.UUIDGenerator;
+
import java.io.File;
import java.io.IOException;
import java.util.List;
@@ -38,24 +53,9 @@ import java.util.Vector;
import java.util.logging.Level;
import java.util.logging.Logger;
+//JDK imports
//Lucene imports
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.Term;
-import org.apache.lucene.search.BooleanClause;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.Hits;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Sort;
-import org.apache.lucene.search.SortField;
-import org.apache.lucene.search.TermQuery;
-
//JUG imports
-import org.safehaus.uuid.UUID;
-import org.safehaus.uuid.UUIDGenerator;
/**
* @author mattmann
@@ -554,8 +554,8 @@ public class LuceneWorkflowInstanceRepository extends
}
private void addInstanceMetadataToDoc(Document doc, Metadata met) {
- if (met != null && met.getHashtable().keySet().size() > 0) {
- for (String metKey : met.getHashtable().keySet()) {
+ if (met != null && met.getMap().keySet().size() > 0) {
+ for (String metKey : met.getMap().keySet()) {
List metVals = met.getAllMetadata(metKey);
if (metVals != null && metVals.size() > 0) {
for (Object metVal1 : metVals) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetMap.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetMap.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetMap.java
index 547dfbd..7537455 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetMap.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetMap.java
@@ -70,7 +70,7 @@ public final class WorkflowInstanceMetMap implements WorkflowInstanceMetMapKeys{
}
public List getWorkflows() {
- return Arrays.asList(map.getHashtable().keySet().toArray());
+ return Arrays.asList(map.getMap().keySet().toArray());
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJobInput.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJobInput.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJobInput.java
index 5ced9d4..da80781 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJobInput.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJobInput.java
@@ -19,19 +19,21 @@
package org.apache.oodt.cas.workflow.structs;
//JDK imports
+
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.resource.structs.JobInput;
+import org.apache.oodt.cas.workflow.util.XmlRpcStructFactory;
+
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
-import java.io.InputStream;
import java.io.IOException;
-import java.util.Hashtable;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Properties;
-
//OODT imports
-import org.apache.oodt.cas.metadata.Metadata;
-import org.apache.oodt.cas.resource.structs.JobInput;
-import org.apache.oodt.cas.workflow.util.XmlRpcStructFactory;
/**
* @author mattmann
@@ -89,16 +91,16 @@ public class TaskJobInput implements JobInput {
* @see org.apache.oodt.cas.resource.util.XmlRpcWriteable#read(java.lang.Object)
*/
public void read(Object in) {
- if (!(in instanceof Hashtable)) {
+ if (!(in instanceof Map)) {
return;
}
- Hashtable inHash = (Hashtable) in;
+ Map inHash = (Map) in;
this.taskConfig = XmlRpcStructFactory
- .getWorkflowTaskConfigurationFromXmlRpc((Hashtable) inHash
+ .getWorkflowTaskConfigurationFromXmlRpc((Map) inHash
.get("task.config"));
- this.dynMetadata.addMetadata((Hashtable) inHash.get("task.metadata"));
+ this.dynMetadata.addMetadata((Map) inHash.get("task.metadata"));
this.workflowTaskInstanceClassName = (String)inHash.get("task.instance.class");
}
@@ -109,11 +111,11 @@ public class TaskJobInput implements JobInput {
* @see org.apache.oodt.cas.resource.util.XmlRpcWriteable#write()
*/
public Object write() {
- // need to create a hashtable with the task metadata and the task config
- Hashtable outHash = new Hashtable();
+ // need to create a Map with the task metadata and the task config
+ Map outHash = new HashMap();
outHash.put("task.config", XmlRpcStructFactory
.getXmlRpcWorkflowTaskConfiguration(this.taskConfig));
- outHash.put("task.metadata", this.dynMetadata.getHashtable());
+ outHash.put("task.metadata", this.dynMetadata.getMap());
outHash.put("task.instance.class", this.workflowTaskInstanceClassName);
return outHash;
}