From 5270fa9124fdf8b66a344ef176dc747075729eb5 Mon Sep 17 00:00:00 2001
From: brianjlowe <bjl23@cornell.edu>
Date: Thu, 17 Apr 2014 15:39:08 -0400
Subject: [PATCH] VIVO-745 Eliminating NullPointerException in persistent URI
 tool

---
 .../controller/jena/JenaIngestController.java |  6 +-
 .../webapp/utils/jena/JenaIngestUtils.java    | 56 ++++++-------------
 2 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java
index c898e8806..00dde62db 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java
@@ -622,7 +622,9 @@ public class JenaIngestController extends BaseEditController {
         String newModel = vreq.getParameter("newModel");
         String oldNamespace = vreq.getParameter("oldNamespace");
         String newNamespace = vreq.getParameter("newNamespace");
-        String dNamespace = vreq.getParameter("defaultNamespace");      
+        String dNamespace = vreq.getParameter("defaultNamespace");
+        newNamespace = (newNamespace == null || newNamespace.isEmpty()) ? oldNamespace : newNamespace;
+        newNamespace = (dNamespace != null) ? dNamespace : newNamespace;
         if(modelName!=null){
             Model m = maker.getModel(modelName);
             ArrayList namespaceList = new ArrayList();
@@ -645,7 +647,7 @@ public class JenaIngestController extends BaseEditController {
             vreq.setAttribute("bodyJsp",PERMANENT_URI);
         } else if(oldModel != null) {
             JenaIngestUtils utils = new JenaIngestUtils();
-            utils.doPermanentURI(oldModel,newModel,oldNamespace,newNamespace,dNamespace,maker,vreq);
+            utils.doPermanentURI(oldModel, newModel, oldNamespace, newNamespace, maker, vreq);
             vreq.setAttribute("title","Ingest Menu");
             vreq.setAttribute("bodyJsp",INGEST_MENU_JSP);
         }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtils.java
index fd4a0336a..14266910e 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtils.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtils.java
@@ -730,16 +730,19 @@ public class JenaIngestUtils {
     }
 
     public void doPermanentURI(String oldModel, String newModel, String oldNamespace,
-            String newNamespace, String dNamespace, ModelMaker maker, 
+            String newNamespace, ModelMaker maker, 
             VitroRequest vreq) {
 
+        if(newNamespace.isEmpty()){
+            throw new RuntimeException("new namespace must be specified");
+        }
+        
         WebappDaoFactory wdf = vreq.getUnfilteredWebappDaoFactory();
         Model m = maker.getModel(oldModel);
         Model saveModel = maker.getModel(newModel);
         Model tempModel = ModelFactory.createDefaultModel();
         ResIterator rsItr = null;
         ArrayList<String> urlCheck = new ArrayList<String>();
-        String changeNamespace = null;
         boolean urlFound = false;
         if(!oldModel.equals(newModel)){
             StmtIterator stmtItr = m.listStatements();
@@ -755,42 +758,20 @@ public class JenaIngestUtils {
         String uri = null;  
         while(rsItr.hasNext()){
             Resource res = rsItr.next();
-            if(oldNamespace.equals(res.getNameSpace())){
-                if(!newNamespace.equals("")){
-                    do{
-                        uri = getUnusedURI(newNamespace,wdf);
-                        if(!urlCheck.contains(uri)){
-                            urlCheck.add(uri);
-                            urlFound = true;
-                        }
-                    }while(!urlFound);
-                    urlFound = false;
-                }
-                else if(dNamespace.equals(vreq.getUnfilteredWebappDaoFactory().getDefaultNamespace())){
-                    try{
-                        do{
-                            uri = wdf.getIndividualDao().getUnusedURI(null);
-                            if(!urlCheck.contains(uri)){
-                                urlCheck.add(uri);
-                                urlFound = true;
-                            }
-                        }while(!urlFound);
-                        urlFound = false;
-                    }catch(InsertException ex){
-                        log.error("could not create uri");
-                    }           
-                }
+            if(res.getNameSpace().equals(oldNamespace)){
+                do{
+                    uri = getUnusedURI(newNamespace,wdf);
+                    if(!urlCheck.contains(uri)){
+                        urlCheck.add(uri);
+                        urlFound = true;
+                    }
+                }while(!urlFound);
+                urlFound = false;
                 ResourceUtils.renameResource(res, uri);                    
             }
 
         }
         boolean statementDone = false;
-        if(!newNamespace.equals("")){
-            changeNamespace = newNamespace;
-        }
-        else if(dNamespace.equals(vreq.getUnfilteredWebappDaoFactory().getDefaultNamespace())){
-            changeNamespace = dNamespace;
-        }
         if(!oldModel.equals(newModel)){
             StmtIterator stmtItr = tempModel.listStatements();
             while(stmtItr.hasNext()){
@@ -798,18 +779,17 @@ public class JenaIngestUtils {
                 Statement stmt = stmtItr.nextStatement();
                 Resource sRes = stmt.getSubject();
                 Resource oRes = null;
-                if(sRes.getNameSpace().equals(changeNamespace)){
+                if(sRes.getNameSpace().equals(newNamespace)){
                     saveModel.add(stmt);
                     statementDone = true;
                 }
                 try{
-                    oRes = (Resource)stmt.getObject();
-                    if(oRes.getNameSpace().equals(changeNamespace) && !statementDone){
+                    oRes = (Resource) stmt.getObject();
+                    if(oRes.getNameSpace().equals(newNamespace) && !statementDone){
                         saveModel.add(stmt);
                         statementDone = true;
                     }    
-                }
-                catch(Exception e){
+                } catch(Exception e){
                     continue;
                 }
             }