diff --git a/dspace-api/src/main/java/org/dspace/administer/StructBuilder.java b/dspace-api/src/main/java/org/dspace/administer/StructBuilder.java index 458f3cff1f..a0e6a3f148 100644 --- a/dspace-api/src/main/java/org/dspace/administer/StructBuilder.java +++ b/dspace-api/src/main/java/org/dspace/administer/StructBuilder.java @@ -40,7 +40,8 @@ import java.io.FileWriter; import java.io.IOException; import java.sql.SQLException; import java.util.Enumeration; -import java.util.Hashtable; +import java.util.HashMap; +import java.util.Map; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -96,10 +97,10 @@ public class StructBuilder private static org.jdom.Document xmlOutput = new org.jdom.Document(new Element("imported_structure")); /** a hashtable to hold metadata for the collection being worked on */ - private static Hashtable collectionMap = new Hashtable(); + private static Map collectionMap = new HashMap(); /** a hashtable to hold metadata for the community being worked on */ - private static Hashtable communityMap = new Hashtable(); + private static Map communityMap = new HashMap(); /** * Main method to be run from the command line to import a structure into @@ -429,16 +430,12 @@ public class StructBuilder // now update the metadata Node tn = communities.item(i); - Enumeration keys = communityMap.keys(); - while (keys.hasMoreElements()) + for (Map.Entry entry : communityMap.entrySet()) { - Node node = null; - String key = (String) keys.nextElement(); - NodeList nl = XPathAPI.selectNodeList(tn, key); + NodeList nl = XPathAPI.selectNodeList(tn, entry.getKey()); if (nl.getLength() == 1) { - node = nl.item(0); - community.setMetadata((String) communityMap.get(key), getStringValue(node)); + community.setMetadata(entry.getValue(), getStringValue(nl.item(0))); } } @@ -544,16 +541,12 @@ public class StructBuilder // import the rest of the metadata Node tn = collections.item(i); - Enumeration keys = collectionMap.keys(); - while (keys.hasMoreElements()) + for (Map.Entry entry : collectionMap.entrySet()) { - Node node = null; - String key = (String) keys.nextElement(); - NodeList nl = XPathAPI.selectNodeList(tn, key); + NodeList nl = XPathAPI.selectNodeList(tn, entry.getKey()); if (nl.getLength() == 1) { - node = nl.item(0); - collection.setMetadata((String) collectionMap.get(key), getStringValue(node)); + collection.setMetadata(entry.getValue(), getStringValue(nl.item(0))); } } diff --git a/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java b/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java index 04bea077b1..f2e8da7f77 100755 --- a/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java +++ b/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java @@ -691,14 +691,14 @@ public class ItemImport System.out.println("Deleting items listed in mapfile: " + mapFile); // read in the mapfile - Map myhash = readMapFile(mapFile); + Map myhash = readMapFile(mapFile); // now delete everything that appeared in the mapFile Iterator i = myhash.keySet().iterator(); while (i.hasNext()) { - String itemID = (String) myhash.get(i.next()); + String itemID = myhash.get(i.next()); if (itemID.indexOf('/') != -1) { diff --git a/dspace-api/src/main/java/org/dspace/app/util/DCInputsReader.java b/dspace-api/src/main/java/org/dspace/app/util/DCInputsReader.java index 125288a5f5..6f58e0a270 100644 --- a/dspace-api/src/main/java/org/dspace/app/util/DCInputsReader.java +++ b/dspace-api/src/main/java/org/dspace/app/util/DCInputsReader.java @@ -107,12 +107,6 @@ public class DCInputsReader */ private Map>>> formDefns = null; - /** - * Reference to the forms which allow, disallow or mandate files to be - * uploaded. - */ - private Map formFileUploadDefns = null; - /** * Reference to the value-pairs map, computed from the forms definition file */ diff --git a/dspace-api/src/main/java/org/dspace/app/util/SubmissionConfig.java b/dspace-api/src/main/java/org/dspace/app/util/SubmissionConfig.java index c5de2eb40e..42fa662a8e 100644 --- a/dspace-api/src/main/java/org/dspace/app/util/SubmissionConfig.java +++ b/dspace-api/src/main/java/org/dspace/app/util/SubmissionConfig.java @@ -100,7 +100,7 @@ public class SubmissionConfig implements Serializable // loop through our steps, and create SubmissionStepConfig objects for (int stepNum = 0; stepNum < steps.size(); stepNum++) { - Map stepInfo = steps.get(stepNum); + Map stepInfo = steps.get(stepNum); SubmissionStepConfig step = new SubmissionStepConfig(stepInfo); // Only add this step to the process if either: diff --git a/dspace-stats/src/main/java/org/dspace/statistics/StatisticsLoggingConsumer.java b/dspace-stats/src/main/java/org/dspace/statistics/StatisticsLoggingConsumer.java index bdc6f65f38..eb3806c3da 100644 --- a/dspace-stats/src/main/java/org/dspace/statistics/StatisticsLoggingConsumer.java +++ b/dspace-stats/src/main/java/org/dspace/statistics/StatisticsLoggingConsumer.java @@ -81,7 +81,7 @@ public class StatisticsLoggingConsumer implements Consumer updateQuery, null, null); // Get all the metadata - Map metadataStorageInfo = SolrLogger.getMetadataStorageInfo(); + Map metadataStorageInfo = SolrLogger.getMetadataStorageInfo(); List storageFieldList = new ArrayList(); List> storageValuesList = new ArrayList>(); diff --git a/dspace-stats/src/main/java/org/dspace/statistics/util/StatisticsDataGenerator.java b/dspace-stats/src/main/java/org/dspace/statistics/util/StatisticsDataGenerator.java index f516644f69..e8890edc66 100644 --- a/dspace-stats/src/main/java/org/dspace/statistics/util/StatisticsDataGenerator.java +++ b/dspace-stats/src/main/java/org/dspace/statistics/util/StatisticsDataGenerator.java @@ -199,7 +199,7 @@ public class StatisticsDataGenerator { solr.deleteByQuery("*:*"); solr.commit(); - Map metadataStorageInfo = SolrLogger.getMetadataStorageInfo(); + Map metadataStorageInfo = SolrLogger.getMetadataStorageInfo(); String prevIp = null; String dbfile = ConfigurationManager.getProperty("solr.dbfile"); diff --git a/dspace-stats/src/main/java/org/dspace/statistics/util/StatisticsImporter.java b/dspace-stats/src/main/java/org/dspace/statistics/util/StatisticsImporter.java index 7b9db062c1..8a13e041a7 100644 --- a/dspace-stats/src/main/java/org/dspace/statistics/util/StatisticsImporter.java +++ b/dspace-stats/src/main/java/org/dspace/statistics/util/StatisticsImporter.java @@ -76,7 +76,7 @@ public class StatisticsImporter private static LookupService geoipLookup; /** Metadata storage information */ - private static Map metadataStorageInfo; + private static Map metadataStorageInfo; /** Whether to skip the DNS reverse lookup or not */ private static boolean skipReverseDNS = false; @@ -362,9 +362,8 @@ public class StatisticsImporter if (dso instanceof Item) { Item item = (Item) dso; // Store the metadata - for (Object storedField : metadataStorageInfo.keySet()) { - String dcField = (String) metadataStorageInfo - .get(storedField); + for (String storedField : metadataStorageInfo.keySet()) { + String dcField = metadataStorageInfo.get(storedField); DCValue[] vals = item.getMetadata(dcField.split("\\.")[0], dcField.split("\\.")[1], dcField.split("\\.")[2],