First pass on 2.x flow upgrade to 3, and removing unneeded modules (#938)

Author: aebadirad

marklogic-data-hub/src/main/java/com/marklogic/hub/impl/DataHubImpl.java

@@ -506,7 +506,7 @@ private Map<Integer, String> getServerPortsInUse() {
     }
 
     //DataHubUpgrader stuff
-    public static String MIN_UPGRADE_VERSION = "1.1.3";
+    public static String MIN_UPGRADE_VERSION = "2.0.0";
 
     @Override public boolean upgradeHub() throws CantUpgradeException {
         return upgradeHub(null);
@@ -545,6 +545,8 @@ private Map<Integer, String> getServerPortsInUse() {
                 updatedFlows.addAll(flows);
             }
 
+            runInDatabase("for $i in cts:uris(\"\", (), cts:and-not-query(cts:collection-query(\"hub-core-module\"), cts:document-query((\"/com.marklogic.hub/config.sjs\", \"/com.marklogic.hub/config.xqy\")))) return xdmp:document-delete($i)", hubConfig.getDbName(DatabaseKind.MODULES));
+
             if (isHubInstalled) {
                 // install hub modules into MarkLogic
                 this.install();

marklogic-data-hub/src/main/java/com/marklogic/hub/scaffold/impl/ScaffoldingImpl.java

@@ -280,6 +280,7 @@ public boolean update2xFlow(String entityName, String flowName, FlowType flowTyp
 
         Path flowDir = getFlowDir(entityName, flowName, flowType);
         Path mainPath = flowDir.resolve("main.sjs");
+        Path xqyMainPath = flowDir.resolve("main.xqy");
         if (mainPath.toFile().exists()) {
             try {
                 String mainFile = FileUtils.readFileToString(mainPath.toFile());
@@ -309,6 +310,22 @@ public boolean update2xFlow(String entityName, String flowName, FlowType flowTyp
                 throw new RuntimeException(e);
             }
         }
+
+        if (mainPath.toFile().exists() || xqyMainPath.toFile().exists()) {
+            if (xqyMainPath.toFile().exists()) {
+                mainPath = xqyMainPath;
+            }
+            try {
+                String mainFile = FileUtils.readFileToString(mainPath.toFile());
+                mainFile = mainFile.replaceFirst("com\\.marklogic\\.hub", "MarkLogic/data-hub-framework");
+                FileOutputStream fileOutputStream = new FileOutputStream(mainPath.toFile());
+                IOUtils.write(mainFile, fileOutputStream);
+                fileOutputStream.close();
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+
         return updated;
     }
 

quick-start/src/main/java/com/marklogic/quickstart/web/CurrentProjectController.java

@@ -204,10 +204,14 @@ public ResponseEntity<?> clearDatabase() {
 
     @RequestMapping(value = "/update-hub", method = RequestMethod.POST)
     public ResponseEntity<?> updateHub() throws IOException, CantUpgradeException {
-        if (dataHubService.updateHub(envConfig().getMlSettings())) {
-            installUserModules(envConfig().getMlSettings(), true);
-            startProjectWatcher();
-            return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+        try {
+            if (dataHubService.updateHub(envConfig().getMlSettings())) {
+                installUserModules(envConfig().getMlSettings(), true);
+                startProjectWatcher();
+                return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+            }
+        } catch (CantUpgradeException e) {
+            return new ResponseEntity<>(e.getMessage(), HttpStatus.BAD_REQUEST);
         }
         return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
     }

quick-start/src/main/ui/app/login/login.component.html

@@ -241,6 +241,7 @@ <h3 *ngIf="currentEnvironment">Congratulations on updating to version<br>{{curre
             <h3>Automatic Hub Update Failed!</h3>
             <p *ngIf="currentEnvironment" class="error">
               Sorry. We failed to update you to version <span class="version">{{currentEnvironment.runningVersion}}</span>.
+              <span>{{hubUpdateError}}.</span>
             </p>
             <p>Go read the wiki page that describes the changes necessary and try them manually.</p>
             <a target="_blank" [href]="hubUpdateUrl()">How to update a Hub Project</a>

quick-start/src/main/ui/app/login/login.component.ts

@@ -26,6 +26,7 @@ export class LoginComponent implements OnInit {
   hubVersions: any;
   hubUpdating: boolean = false;
   hubUpdateFailed: boolean = false;
+  hubUpdateError: string = '';
 
   currentTab: string = 'ProjectDir';
 
@@ -314,11 +315,13 @@ export class LoginComponent implements OnInit {
     this.hubUpdating = true;
     this.projectService.updateProject().subscribe(() => {
       this.hubUpdating = false;
+      this.hubUpdateError = '';
       this.loginNext();
     },
-    () => {
+    error => {
       this.hubUpdating = false;
       this.hubUpdateFailed = true;
+      this.hubUpdateError = error.json().message;
     });
   }