diff --git a/dspace-api/src/main/java/org/dspace/browse/BrowseCreateDAOOracle.java b/dspace-api/src/main/java/org/dspace/browse/BrowseCreateDAOOracle.java index b3fd587757..50b40d27d5 100644 --- a/dspace-api/src/main/java/org/dspace/browse/BrowseCreateDAOOracle.java +++ b/dspace-api/src/main/java/org/dspace/browse/BrowseCreateDAOOracle.java @@ -402,7 +402,7 @@ public class BrowseCreateDAOOracle implements BrowseCreateDAO { try { - Object[] params = { new Integer(itemID) }; + Object[] params = { Integer.valueOf(itemID) }; String dquery = "DELETE FROM " + table + " WHERE item_id=?"; DatabaseManager.updateQuery(context, dquery, params); } @@ -422,7 +422,7 @@ public class BrowseCreateDAOOracle implements BrowseCreateDAO { try { - Object[] params = { new Integer(itemID) }; + Object[] params = { Integer.valueOf(itemID) }; String dquery = "DELETE FROM Communities2Item WHERE item_id = ?"; DatabaseManager.updateQuery(context, dquery, params); } diff --git a/dspace-api/src/main/java/org/dspace/browse/BrowseCreateDAOPostgres.java b/dspace-api/src/main/java/org/dspace/browse/BrowseCreateDAOPostgres.java index 4fd511cde0..f541648550 100644 --- a/dspace-api/src/main/java/org/dspace/browse/BrowseCreateDAOPostgres.java +++ b/dspace-api/src/main/java/org/dspace/browse/BrowseCreateDAOPostgres.java @@ -406,7 +406,7 @@ public class BrowseCreateDAOPostgres implements BrowseCreateDAO { try { - Object[] params = { new Integer(itemID) }; + Object[] params = { Integer.valueOf(itemID) }; String dquery = "DELETE FROM " + table + " WHERE item_id = ?"; DatabaseManager.updateQuery(context, dquery, params); } @@ -425,7 +425,7 @@ public class BrowseCreateDAOPostgres implements BrowseCreateDAO { try { - Object[] params = { new Integer(itemID) }; + Object[] params = { Integer.valueOf(itemID) }; String dquery = "DELETE FROM Communities2Item WHERE item_id = ?"; DatabaseManager.updateQuery(context, dquery, params); } diff --git a/dspace-api/src/main/java/org/dspace/browse/BrowseDAOOracle.java b/dspace-api/src/main/java/org/dspace/browse/BrowseDAOOracle.java index f44e6c673d..258ba09908 100644 --- a/dspace-api/src/main/java/org/dspace/browse/BrowseDAOOracle.java +++ b/dspace-api/src/main/java/org/dspace/browse/BrowseDAOOracle.java @@ -210,7 +210,7 @@ public class BrowseDAOOracle implements BrowseDAO { String query = "SELECT MAX(" + column + ") AS max_value FROM " + table + " WHERE item_id=?"; - Object[] params = { new Integer(itemID) }; + Object[] params = { Integer.valueOf(itemID) }; tri = DatabaseManager.query(context, query, params); TableRow row; @@ -886,16 +886,16 @@ public class BrowseDAOOracle implements BrowseDAO { queryBuf.append("rec WHERE rownum<=? "); if (offset > 0) - params.add(new Integer(limit + offset)); + params.add(Integer.valueOf(limit + offset)); else - params.add(new Integer(limit)); + params.add(Integer.valueOf(limit)); } if (offset > 0) { queryBuf.insert(0, "SELECT * FROM ("); queryBuf.append(") WHERE rnum>?"); - params.add(new Integer(offset)); + params.add(Integer.valueOf(offset)); } } @@ -964,7 +964,7 @@ public class BrowseDAOOracle implements BrowseDAO queryBuf.append(containerTable).append(".").append(containerIDField); queryBuf.append("=? "); - params.add(new Integer(containerID)); + params.add(Integer.valueOf(containerID)); } } diff --git a/dspace-api/src/main/java/org/dspace/browse/BrowseDAOPostgres.java b/dspace-api/src/main/java/org/dspace/browse/BrowseDAOPostgres.java index 60da76320f..00a03c966a 100644 --- a/dspace-api/src/main/java/org/dspace/browse/BrowseDAOPostgres.java +++ b/dspace-api/src/main/java/org/dspace/browse/BrowseDAOPostgres.java @@ -216,7 +216,7 @@ public class BrowseDAOPostgres implements BrowseDAO { String query = "SELECT max(" + column + ") FROM " + table + " WHERE item_id = ?"; - Object[] params = { new Integer(itemID) }; + Object[] params = { Integer.valueOf(itemID) }; tri = DatabaseManager.query(context, query, params); TableRow row; @@ -890,7 +890,7 @@ public class BrowseDAOPostgres implements BrowseDAO { queryBuf.append(" LIMIT ? "); - params.add(new Integer(limit)); + params.add(Integer.valueOf(limit)); } // prepare the OFFSET clause @@ -898,7 +898,7 @@ public class BrowseDAOPostgres implements BrowseDAO { queryBuf.append(" OFFSET ? "); - params.add(new Integer(offset)); + params.add(Integer.valueOf(offset)); } } @@ -968,7 +968,7 @@ public class BrowseDAOPostgres implements BrowseDAO queryBuf.append(containerTable).append(".").append(containerIDField); queryBuf.append("=? "); - params.add(new Integer(containerID)); + params.add(Integer.valueOf(containerID)); } } diff --git a/dspace-api/src/main/java/org/dspace/browse/BrowseItemDAOOracle.java b/dspace-api/src/main/java/org/dspace/browse/BrowseItemDAOOracle.java index fe8c1cccec..b79718046d 100644 --- a/dspace-api/src/main/java/org/dspace/browse/BrowseItemDAOOracle.java +++ b/dspace-api/src/main/java/org/dspace/browse/BrowseItemDAOOracle.java @@ -124,17 +124,17 @@ public class BrowseItemDAOOracle implements BrowseItemDAO { if (qualifier == null) { - Object[] params = { new Integer(itemId), element, schema }; + Object[] params = { Integer.valueOf(itemId), element, schema }; tri = DatabaseManager.query(context, getByMetadataElement, params); } else if (Item.ANY.equals(qualifier)) { - Object[] params = { new Integer(itemId), element, schema }; + Object[] params = { Integer.valueOf(itemId), element, schema }; tri = DatabaseManager.query(context, getByMetadataAnyQualifier, params); } else { - Object[] params = { new Integer(itemId), element, qualifier, schema }; + Object[] params = { Integer.valueOf(itemId), element, qualifier, schema }; tri = DatabaseManager.query(context, getByMetadata, params); } diff --git a/dspace-api/src/main/java/org/dspace/browse/BrowseItemDAOPostgres.java b/dspace-api/src/main/java/org/dspace/browse/BrowseItemDAOPostgres.java index 969bf3480b..17305bc40b 100644 --- a/dspace-api/src/main/java/org/dspace/browse/BrowseItemDAOPostgres.java +++ b/dspace-api/src/main/java/org/dspace/browse/BrowseItemDAOPostgres.java @@ -123,17 +123,17 @@ public class BrowseItemDAOPostgres implements BrowseItemDAO { if (qualifier == null) { - Object[] params = { new Integer(itemId), element, schema }; + Object[] params = { Integer.valueOf(itemId), element, schema }; tri = DatabaseManager.query(context, getByMetadataElement, params); } else if (Item.ANY.equals(qualifier)) { - Object[] params = { new Integer(itemId), element, schema }; + Object[] params = { Integer.valueOf(itemId), element, schema }; tri = DatabaseManager.query(context, getByMetadataAnyQualifier, params); } else { - Object[] params = { new Integer(itemId), element, qualifier, schema }; + Object[] params = { Integer.valueOf(itemId), element, qualifier, schema }; tri = DatabaseManager.query(context, getByMetadata, params); } diff --git a/dspace-api/src/main/java/org/dspace/browse/IndexBrowse.java b/dspace-api/src/main/java/org/dspace/browse/IndexBrowse.java index 08ef898f40..6c38a96244 100644 --- a/dspace-api/src/main/java/org/dspace/browse/IndexBrowse.java +++ b/dspace-api/src/main/java/org/dspace/browse/IndexBrowse.java @@ -535,7 +535,7 @@ public class IndexBrowse Map sortMap = new HashMap(); for (SortOption so : SortOption.getSortOptions()) { - Integer key = new Integer(so.getNumber()); + Integer key = Integer.valueOf(so.getNumber()); String metadata = so.getMetadata(); // If we've already used the metadata for this Item @@ -958,7 +958,7 @@ public class IndexBrowse List sortCols = new ArrayList(); for (SortOption so : SortOption.getSortOptions()) { - sortCols.add(new Integer(so.getNumber())); + sortCols.add(Integer.valueOf(so.getNumber())); } createItemTables(BrowseIndex.getItemBrowseIndex(), sortCols); diff --git a/dspace-api/src/main/java/org/dspace/browse/ItemCountDAOOracle.java b/dspace-api/src/main/java/org/dspace/browse/ItemCountDAOOracle.java index 65664ab3b6..60d12acedd 100644 --- a/dspace-api/src/main/java/org/dspace/browse/ItemCountDAOOracle.java +++ b/dspace-api/src/main/java/org/dspace/browse/ItemCountDAOOracle.java @@ -98,17 +98,17 @@ public class ItemCountDAOOracle implements ItemCountDAO try { // first find out if we have a record - Object[] sparams = { new Integer(collection.getID()) }; + Object[] sparams = { Integer.valueOf(collection.getID()) }; tri = DatabaseManager.query(context, collectionSelect, sparams); if (tri.hasNext()) { - Object[] params = { new Integer(count), new Integer(collection.getID()) }; + Object[] params = { Integer.valueOf(count), Integer.valueOf(collection.getID()) }; DatabaseManager.updateQuery(context, collectionUpdate, params); } else { - Object[] params = { new Integer(collection.getID()), new Integer(count) }; + Object[] params = { Integer.valueOf(collection.getID()), Integer.valueOf(count) }; DatabaseManager.updateQuery(context, collectionInsert, params); } } @@ -138,17 +138,17 @@ public class ItemCountDAOOracle implements ItemCountDAO try { // first find out if we have a record - Object[] sparams = { new Integer(community.getID()) }; + Object[] sparams = { Integer.valueOf(community.getID()) }; tri = DatabaseManager.query(context, communitySelect, sparams); if (tri.hasNext()) { - Object[] params = { new Integer(count), new Integer(community.getID()) }; + Object[] params = { Integer.valueOf(count), Integer.valueOf(community.getID()) }; DatabaseManager.updateQuery(context, communityUpdate, params); } else { - Object[] params = { new Integer(community.getID()), new Integer(count) }; + Object[] params = { Integer.valueOf(community.getID()), Integer.valueOf(count) }; DatabaseManager.updateQuery(context, communityInsert, params); } } @@ -233,7 +233,7 @@ public class ItemCountDAOOracle implements ItemCountDAO { try { - Object[] params = { new Integer(collection.getID()) }; + Object[] params = { Integer.valueOf(collection.getID()) }; DatabaseManager.updateQuery(context, collectionRemove, params); } catch (SQLException e) @@ -254,7 +254,7 @@ public class ItemCountDAOOracle implements ItemCountDAO { try { - Object[] params = { new Integer(community.getID()) }; + Object[] params = { Integer.valueOf(community.getID()) }; DatabaseManager.updateQuery(context, communityRemove, params); } catch (SQLException e) @@ -277,7 +277,7 @@ public class ItemCountDAOOracle implements ItemCountDAO TableRowIterator tri = null; try { - Object[] params = { new Integer(collection.getID()) }; + Object[] params = { Integer.valueOf(collection.getID()) }; tri = DatabaseManager.query(context, collectionSelect, params); if (!tri.hasNext()) @@ -319,7 +319,7 @@ public class ItemCountDAOOracle implements ItemCountDAO TableRowIterator tri = null; try { - Object[] params = { new Integer(community.getID()) }; + Object[] params = { Integer.valueOf(community.getID()) }; tri = DatabaseManager.query(context, communitySelect, params); if (!tri.hasNext()) diff --git a/dspace-api/src/main/java/org/dspace/browse/ItemCountDAOPostgres.java b/dspace-api/src/main/java/org/dspace/browse/ItemCountDAOPostgres.java index 2025713b8d..4e4113d08a 100644 --- a/dspace-api/src/main/java/org/dspace/browse/ItemCountDAOPostgres.java +++ b/dspace-api/src/main/java/org/dspace/browse/ItemCountDAOPostgres.java @@ -98,17 +98,17 @@ public class ItemCountDAOPostgres implements ItemCountDAO try { // first find out if we have a record - Object[] sparams = { new Integer(collection.getID()) }; + Object[] sparams = { Integer.valueOf(collection.getID()) }; tri = DatabaseManager.query(context, collectionSelect, sparams); if (tri.hasNext()) { - Object[] params = { new Integer(count), new Integer(collection.getID()) }; + Object[] params = { Integer.valueOf(count), Integer.valueOf(collection.getID()) }; DatabaseManager.updateQuery(context, collectionUpdate, params); } else { - Object[] params = { new Integer(collection.getID()), new Integer(count) }; + Object[] params = { Integer.valueOf(collection.getID()), Integer.valueOf(count) }; DatabaseManager.updateQuery(context, collectionInsert, params); } } @@ -138,17 +138,17 @@ public class ItemCountDAOPostgres implements ItemCountDAO try { // first find out if we have a record - Object[] sparams = { new Integer(community.getID()) }; + Object[] sparams = { Integer.valueOf(community.getID()) }; tri = DatabaseManager.query(context, communitySelect, sparams); if (tri.hasNext()) { - Object[] params = { new Integer(count), new Integer(community.getID()) }; + Object[] params = { Integer.valueOf(count), Integer.valueOf(community.getID()) }; DatabaseManager.updateQuery(context, communityUpdate, params); } else { - Object[] params = { new Integer(community.getID()), new Integer(count) }; + Object[] params = { Integer.valueOf(community.getID()), Integer.valueOf(count) }; DatabaseManager.updateQuery(context, communityInsert, params); } } @@ -233,7 +233,7 @@ public class ItemCountDAOPostgres implements ItemCountDAO { try { - Object[] params = { new Integer(collection.getID()) }; + Object[] params = { Integer.valueOf(collection.getID()) }; DatabaseManager.updateQuery(context, collectionRemove, params); } catch (SQLException e) @@ -254,7 +254,7 @@ public class ItemCountDAOPostgres implements ItemCountDAO { try { - Object[] params = { new Integer(community.getID()) }; + Object[] params = { Integer.valueOf(community.getID()) }; DatabaseManager.updateQuery(context, communityRemove, params); } catch (SQLException e) @@ -277,7 +277,7 @@ public class ItemCountDAOPostgres implements ItemCountDAO TableRowIterator tri = null; try { - Object[] params = { new Integer(collection.getID()) }; + Object[] params = { Integer.valueOf(collection.getID()) }; tri = DatabaseManager.query(context, collectionSelect, params); if (!tri.hasNext()) @@ -319,7 +319,7 @@ public class ItemCountDAOPostgres implements ItemCountDAO TableRowIterator tri = null; try { - Object[] params = { new Integer(community.getID()) }; + Object[] params = { Integer.valueOf(community.getID()) }; tri = DatabaseManager.query(context, communitySelect, params); if (!tri.hasNext()) diff --git a/dspace-api/src/main/java/org/dspace/browse/ItemListConfig.java b/dspace-api/src/main/java/org/dspace/browse/ItemListConfig.java index 633d5f90d6..26187e5923 100644 --- a/dspace-api/src/main/java/org/dspace/browse/ItemListConfig.java +++ b/dspace-api/src/main/java/org/dspace/browse/ItemListConfig.java @@ -83,18 +83,18 @@ public class ItemListConfig int i = 1; while (st.hasMoreTokens()) { - Integer key = new Integer(i); + Integer key = Integer.valueOf(i); String token = st.nextToken(); // find out if the field is a date if (token.indexOf("(date)") > 0) { token = token.replaceAll("\\(date\\)", ""); - types.put(key, new Integer(ItemListConfig.DATE)); + types.put(key, Integer.valueOf(ItemListConfig.DATE)); } else { - types.put(key, new Integer(ItemListConfig.TEXT)); + types.put(key, Integer.valueOf(ItemListConfig.TEXT)); } String[] mdBits = interpretField(token.trim(), null); @@ -128,7 +128,7 @@ public class ItemListConfig */ public String[] getMetadata(int col) { - return (String[]) metadata.get(new Integer(col)); + return (String[]) metadata.get(Integer.valueOf(col)); } /**