diff --git a/ole-app/olefs/src/it/java/org/kuali/ole/deliver/util/CallNumberMigration_IT.java b/ole-app/olefs/src/it/java/org/kuali/ole/deliver/util/CallNumberMigration_IT.java
deleted file mode 100644
index 8f97ccb13f..0000000000
--- a/ole-app/olefs/src/it/java/org/kuali/ole/deliver/util/CallNumberMigration_IT.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.kuali.ole.deliver.util;
-
-import org.apache.log4j.Logger;
-import org.junit.Test;
-import org.kuali.ole.OLETestCaseBase;
-import org.kuali.ole.docstore.common.dao.CallNumberMigrationDao;
-import org.kuali.ole.sys.context.SpringContext;
-
-/**
- * Created by jayabharathreddy on 12/17/15.
- */
-public class CallNumberMigration_IT extends OLETestCaseBase {
-
- private static final Logger LOG = Logger.getLogger(CallNumberMigration_IT.class);
-
- @Test
- public void calculateAndUpdateShelvingOrder() throws Exception {
- CallNumberMigrationDao callNumberMigration = (CallNumberMigrationDao) SpringContext.getBean("callNumberMigrationDao");
- callNumberMigration.init();
- }
-
-
-
-}
diff --git a/ole-common/ole-docstore-common/pom.xml b/ole-common/ole-docstore-common/pom.xml
index 2570fcc5ab..96993e7124 100644
--- a/ole-common/ole-docstore-common/pom.xml
+++ b/ole-common/ole-docstore-common/pom.xml
@@ -94,36 +94,6 @@
4.3.5
-
- org.kuali.rice
- rice-core-framework
- ${rice.version}
-
-
- org.springframework
- spring-tx
-
-
- org.springframework
- spring-orm
-
-
- org.springframework
- spring-web
-
-
-
-
-
- org.springframework
- spring-tx
- ${spring.version}
-
-
- org.springframework
- spring-orm
- ${spring.version}
-
\ No newline at end of file
diff --git a/ole-common/ole-docstore-common/src/main/java/org/kuali/ole/docstore/common/dao/CallNumberMigrationDao.java b/ole-docstore/ole-docstore-engine/src/main/java/org/kuali/ole/docstore/engine/service/storage/rdbms/dao/CallNumberMigrationDao.java
similarity index 88%
rename from ole-common/ole-docstore-common/src/main/java/org/kuali/ole/docstore/common/dao/CallNumberMigrationDao.java
rename to ole-docstore/ole-docstore-engine/src/main/java/org/kuali/ole/docstore/engine/service/storage/rdbms/dao/CallNumberMigrationDao.java
index 5d3dc73eb2..4f2542c371 100644
--- a/ole-common/ole-docstore-common/src/main/java/org/kuali/ole/docstore/common/dao/CallNumberMigrationDao.java
+++ b/ole-docstore/ole-docstore-engine/src/main/java/org/kuali/ole/docstore/engine/service/storage/rdbms/dao/CallNumberMigrationDao.java
@@ -1,4 +1,4 @@
-package org.kuali.ole.docstore.common.dao;
+package org.kuali.ole.docstore.engine.service.storage.rdbms.dao;
import org.apache.commons.lang.StringUtils;
import org.kuali.ole.utility.callnumber.CallNumberFactory;
@@ -23,8 +23,8 @@ public class CallNumberMigrationDao extends PlatformAwareDaoBaseJdbc {
private static Map callNumberType = new HashMap<>();
- private String holdingsCallNumberQuery = "SELECT HOLDINGS_ID,CALL_NUMBER_TYPE_ID,CALL_NUMBER FROM OLE_DS_HOLDINGS_T Where CALL_NUMBER !='null' ORDER BY HOLDINGS_ID";
- private String itemCallNumberQuery = "SELECT ITEM_ID,CALL_NUMBER_TYPE_ID,CALL_NUMBER FROM OLE_DS_ITEM_T Where CALL_NUMBER !='null' ORDER BY ITEM_ID";
+ private String holdingsCallNumberQuery = "SELECT HOLDINGS_ID,CALL_NUMBER_TYPE_ID,CALL_NUMBER FROM OLE_DS_HOLDINGS_T Where CALL_NUMBER !='null' AND CALL_NUMBER !='' ORDER BY HOLDINGS_ID";
+ private String itemCallNumberQuery = "SELECT ITEM_ID,CALL_NUMBER_TYPE_ID,CALL_NUMBER FROM OLE_DS_ITEM_T Where CALL_NUMBER !='null' AND CALL_NUMBER !='' ORDER BY ITEM_ID";
public void init() throws Exception {
fetchCallNumberType();
@@ -61,13 +61,13 @@ private void calculateAndUpdateHoldingsShelvingOrder(SqlRowSet holdingsCallNumbe
while (holdingsCallNumberResultSet.next()) {
count++;
- Map holdingsDetails = new HashMap<>();
- holdingsDetails.put("callNumberTypeId",holdingsCallNumberResultSet.getString("CALL_NUMBER_TYPE_ID"));
+ Map holdingsDetails = new HashMap<>();
+ holdingsDetails.put("callNumberTypeId", holdingsCallNumberResultSet.getString("CALL_NUMBER_TYPE_ID"));
holdingsDetails.put("callNumber", holdingsCallNumberResultSet.getString("CALL_NUMBER"));
holdingsDetails.put("holdingsId", String.valueOf(holdingsCallNumberResultSet.getInt("HOLDINGS_ID")));
futures.add(executorService.submit(new HoldingsCallNumberProcessor(holdingsDetails, callNumberType)));
}
- List batchSqls= new ArrayList<>();
+ List batchSqls = new ArrayList<>();
for (Iterator iterator = futures.iterator(); iterator.hasNext(); ) {
Future future = iterator.next();
try {
@@ -79,7 +79,7 @@ private void calculateAndUpdateHoldingsShelvingOrder(SqlRowSet holdingsCallNumbe
LOG.info(e.getMessage());
}
- if(batchSqls.size() == 10){
+ if (batchSqls.size() == 1000) {
String[] arraysqls = batchSqls.toArray(new String[batchSqls.size()]);
getJdbcTemplate().batchUpdate(arraysqls);
batchSqls.clear();
@@ -87,7 +87,7 @@ private void calculateAndUpdateHoldingsShelvingOrder(SqlRowSet holdingsCallNumbe
}
executorService.shutdown();
- if(batchSqls.size() > 0){
+ if (batchSqls.size() > 0) {
String[] arraysqls = batchSqls.toArray(new String[batchSqls.size()]);
getJdbcTemplate().batchUpdate(arraysqls);
}
@@ -103,13 +103,13 @@ private void calculateAndUpdateItemShelvingOrder(SqlRowSet itemCallNumberResultS
int count = 0;
while (itemCallNumberResultSet.next()) {
count++;
- Map ItemDetails = new HashMap<>();
- ItemDetails.put("callNumberTypeId",itemCallNumberResultSet.getString("CALL_NUMBER_TYPE_ID"));
+ Map ItemDetails = new HashMap<>();
+ ItemDetails.put("callNumberTypeId", itemCallNumberResultSet.getString("CALL_NUMBER_TYPE_ID"));
ItemDetails.put("callNumber", itemCallNumberResultSet.getString("CALL_NUMBER"));
ItemDetails.put("itemId", String.valueOf(itemCallNumberResultSet.getInt("ITEM_ID")));
futures.add(executorService.submit(new ItemCallNumberProcessor(ItemDetails, callNumberType)));
}
- List batchSqls= new ArrayList<>();
+ List batchSqls = new ArrayList<>();
for (Iterator iterator = futures.iterator(); iterator.hasNext(); ) {
Future future = iterator.next();
try {
@@ -120,16 +120,17 @@ private void calculateAndUpdateItemShelvingOrder(SqlRowSet itemCallNumberResultS
} catch (ExecutionException e) {
LOG.info(e.getMessage());
}
-
- if(batchSqls.size() == 10){
+ if (batchSqls.size() == 1000) {
String[] arraysqls = batchSqls.toArray(new String[batchSqls.size()]);
getJdbcTemplate().batchUpdate(arraysqls);
batchSqls.clear();
}
}
+
+
executorService.shutdown();
- if(batchSqls.size() > 0){
+ if (batchSqls.size() > 0) {
String[] arraysqls = batchSqls.toArray(new String[batchSqls.size()]);
getJdbcTemplate().batchUpdate(arraysqls);
}
diff --git a/ole-common/ole-docstore-common/src/main/java/org/kuali/ole/docstore/common/dao/HoldingsCallNumberProcessor.java b/ole-docstore/ole-docstore-engine/src/main/java/org/kuali/ole/docstore/engine/service/storage/rdbms/dao/HoldingsCallNumberProcessor.java
similarity index 97%
rename from ole-common/ole-docstore-common/src/main/java/org/kuali/ole/docstore/common/dao/HoldingsCallNumberProcessor.java
rename to ole-docstore/ole-docstore-engine/src/main/java/org/kuali/ole/docstore/engine/service/storage/rdbms/dao/HoldingsCallNumberProcessor.java
index 5a04a5e2db..c8e65f94cc 100644
--- a/ole-common/ole-docstore-common/src/main/java/org/kuali/ole/docstore/common/dao/HoldingsCallNumberProcessor.java
+++ b/ole-docstore/ole-docstore-engine/src/main/java/org/kuali/ole/docstore/engine/service/storage/rdbms/dao/HoldingsCallNumberProcessor.java
@@ -1,4 +1,4 @@
-package org.kuali.ole.docstore.common.dao;
+package org.kuali.ole.docstore.engine.service.storage.rdbms.dao;
import org.apache.commons.lang.StringUtils;
import org.kuali.rice.core.api.resourceloader.GlobalResourceLoader;
diff --git a/ole-common/ole-docstore-common/src/main/java/org/kuali/ole/docstore/common/dao/ItemCallNumberProcessor.java b/ole-docstore/ole-docstore-engine/src/main/java/org/kuali/ole/docstore/engine/service/storage/rdbms/dao/ItemCallNumberProcessor.java
similarity index 97%
rename from ole-common/ole-docstore-common/src/main/java/org/kuali/ole/docstore/common/dao/ItemCallNumberProcessor.java
rename to ole-docstore/ole-docstore-engine/src/main/java/org/kuali/ole/docstore/engine/service/storage/rdbms/dao/ItemCallNumberProcessor.java
index e875a8e2b4..ea5e605215 100644
--- a/ole-common/ole-docstore-common/src/main/java/org/kuali/ole/docstore/common/dao/ItemCallNumberProcessor.java
+++ b/ole-docstore/ole-docstore-engine/src/main/java/org/kuali/ole/docstore/engine/service/storage/rdbms/dao/ItemCallNumberProcessor.java
@@ -1,4 +1,4 @@
-package org.kuali.ole.docstore.common.dao;
+package org.kuali.ole.docstore.engine.service.storage.rdbms.dao;
import org.apache.commons.lang.StringUtils;
import org.kuali.rice.core.api.resourceloader.GlobalResourceLoader;
diff --git a/ole-docstore/ole-docstore-webapp/src/main/java/org/kuali/ole/web/RebuildIndexServlet.java b/ole-docstore/ole-docstore-webapp/src/main/java/org/kuali/ole/web/RebuildIndexServlet.java
index d1ff556d12..25c7c84b84 100644
--- a/ole-docstore/ole-docstore-webapp/src/main/java/org/kuali/ole/web/RebuildIndexServlet.java
+++ b/ole-docstore/ole-docstore-webapp/src/main/java/org/kuali/ole/web/RebuildIndexServlet.java
@@ -1,10 +1,10 @@
package org.kuali.ole.web;
import org.apache.commons.lang.StringUtils;
+import org.kuali.ole.docstore.engine.service.storage.rdbms.dao.CallNumberMigrationDao;
import org.kuali.ole.docstore.common.document.content.enums.DocCategory;
import org.kuali.ole.docstore.common.document.content.enums.DocFormat;
import org.kuali.ole.docstore.common.document.content.enums.DocType;
-import org.kuali.ole.docstore.common.dao.CallNumberMigrationDao;
import org.kuali.ole.docstore.metrics.reindex.ReIndexingStatus;
import org.kuali.ole.docstore.process.RebuildIndexesHandler;
import org.kuali.ole.logger.DocStoreLogger;
@@ -15,7 +15,6 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
-import java.sql.SQLException;
/**
* Created by IntelliJ IDEA.
diff --git a/ole-docstore/ole-docstore-webapp/src/main/resources/org/kuali/ole/BootStrapSpringBeans.xml b/ole-docstore/ole-docstore-webapp/src/main/resources/org/kuali/ole/BootStrapSpringBeans.xml
index e93673c362..91b9d3f9c1 100644
--- a/ole-docstore/ole-docstore-webapp/src/main/resources/org/kuali/ole/BootStrapSpringBeans.xml
+++ b/ole-docstore/ole-docstore-webapp/src/main/resources/org/kuali/ole/BootStrapSpringBeans.xml
@@ -126,7 +126,7 @@
-
+