Merge pull request #190 from jayared/release-2.0

call number migration for 2.0
openlibraryenvironment · Jan 8, 2016 · bb984ec · bb984ec
2 parents fa5bc0c + 9201fbe
commit bb984ec
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 73 deletions.
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
diff --git a/ole-common/ole-docstore-common/pom.xml b/ole-common/ole-docstore-common/pom.xml
@@ -94,36 +94,6 @@
             <version>4.3.5</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.kuali.rice</groupId>
-            <artifactId>rice-core-framework</artifactId>
-            <version>${rice.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-tx</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-orm</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-web</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-orm</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
 
     </dependencies>
 </project>
diff --git a/...re/common/dao/CallNumberMigrationDao.java → ...age/rdbms/dao/CallNumberMigrationDao.java b/...re/common/dao/CallNumberMigrationDao.java → ...age/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<String, String> 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<String,String> holdingsDetails = new HashMap<>();
-            holdingsDetails.put("callNumberTypeId",holdingsCallNumberResultSet.getString("CALL_NUMBER_TYPE_ID"));
+            Map<String, String> 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<String> batchSqls= new ArrayList<>();
+        List<String> batchSqls = new ArrayList<>();
         for (Iterator<Future> iterator = futures.iterator(); iterator.hasNext(); ) {
             Future future = iterator.next();
             try {
@@ -79,15 +79,15 @@ 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();
             }
         }
         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<String,String> ItemDetails = new HashMap<>();
-            ItemDetails.put("callNumberTypeId",itemCallNumberResultSet.getString("CALL_NUMBER_TYPE_ID"));
+            Map<String, String> 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<String> batchSqls= new ArrayList<>();
+        List<String> batchSqls = new ArrayList<>();
         for (Iterator<Future> 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/...mmon/dao/HoldingsCallNumberProcessor.java → ...dbms/dao/HoldingsCallNumberProcessor.java b/...mmon/dao/HoldingsCallNumberProcessor.java → ...dbms/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/...e/common/dao/ItemCallNumberProcessor.java → ...ge/rdbms/dao/ItemCallNumberProcessor.java b/...e/common/dao/ItemCallNumberProcessor.java → ...ge/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
@@ -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
@@ -126,7 +126,7 @@
 
     <bean id="dataSource" p:serviceName="kradApplicationDataSource" parent="grlBeanImporter" />
 
-    <bean id="callNumberMigrationDao" parent="platformAwareDaoJdbc" class="org.kuali.ole.docstore.common.dao.CallNumberMigrationDao"/>
+    <bean id="callNumberMigrationDao" parent="platformAwareDaoJdbc" class="org.kuali.ole.docstore.engine.service.storage.rdbms.dao.CallNumberMigrationDao"/>
 
     <!-- beans below here are extended by KFS beans, and so the "parent" relationship does not work and they must be redefined -->