Cleanup

Author: bbpennel

.travis.yml

@@ -7,7 +7,7 @@ matrix:
         - gem install sass
       services:
         - redis-server
-      script: mvn verify -pl migration-util
+      script: mvn verify -pl access,access-common,admin,deposit,fcrepo-clients,metadata,persistence,security,services,services-camel,solr-ingest,solr-search,sword-server,migration-util
       sudo: false
       cache:
         directories:

migration-util/src/main/java/edu/unc/lib/dcr/migration/TransformDepositRecordsCommand.java

@@ -33,6 +33,8 @@
 import picocli.CommandLine.ParentCommand;
 
 /**
+ * Command for transforming deposit records
+ *
  * @author bbpennel
  */
 @Command(name = "transform_deposit_records", aliases = {"tdr"},

migration-util/src/main/java/edu/unc/lib/dcr/migration/deposit/DepositRecordTransformer.java

@@ -29,7 +29,6 @@
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.List;
 import java.util.concurrent.RecursiveAction;
 
@@ -133,12 +132,12 @@ protected void compute() {
             log.info("Ingesting deposit record {} as {}", bxc3Pid.getId(), bxc5Pid.getRepositoryPath());
             DepositRecord depRecord = repoObjFactory.createDepositRecord(bxc5Pid, bxc5Model);
 
-            log.info("Adding manifests for {}", bxc3Pid.getId());
+            log.debug("Adding manifests for {}", bxc3Pid.getId());
             addManifests();
-            log.info("Transforming premis for {}", bxc3Pid.getId());
+            log.debug("Transforming premis for {}", bxc3Pid.getId());
             transformAndPopulatePremis(depRecord);
             // Need this to be last
-            log.info("Overriding modification time for {}", bxc3Pid.getId());
+            log.debug("Overriding modification time for {}", bxc3Pid.getId());
             overrideLastModified(bxc3Resc, depRecord);
         } catch (Exception e) {
             tx.cancelAndIgnore();
@@ -266,8 +265,6 @@ private void addManifests() {
             PID manifestPid = getDepositManifestPid(bxc5Pid, dsName);
             // Transfer the manifest to its permanent storage location
             URI manifestStoredUri = transferSession.transfer(manifestPid, manifestPath.toUri());
-            log.error("Transferred manifest {}, exists? {}", manifestStoredUri,
-                    Files.exists(Paths.get(manifestStoredUri)));
 
             // Populate manifest timestamps
             Model manifestModel = ModelFactory.createDefaultModel();
@@ -277,15 +274,8 @@ private void addManifests() {
             selfResc.addProperty(Fcrepo4Repository.created, created, XSDDatatype.XSDdateTime);
 
             // Create the manifest in fedora
-            try {
-                repoObjFactory.createOrUpdateBinary(manifestPid, manifestStoredUri, dsName,
-                        mimetype, null, md5, manifestModel);
-            } catch (Exception e) {
-                log.error("Failed stuff for {}", manifestStoredUri, e);
-            } finally {
-                log.error("After binary create of manifest {}, exists? {}", manifestStoredUri,
-                        Files.exists(Paths.get(manifestStoredUri)));
-            }
+            repoObjFactory.createOrUpdateBinary(manifestPid, manifestStoredUri, dsName,
+                    mimetype, null, md5, manifestModel);
 
             manifestNum++;
             // Repeat until no more manifests found

migration-util/src/test/java/edu/unc/lib/dcr/migration/TransformDepositRecordsCommandIT.java

@@ -191,7 +191,7 @@ private File setupDepositRecord(CommandLine migrationCommand, String title) thro
     public void transformDepositRecordsGeneratedIds() throws Exception {
         CommandLine migrationCommand = new CommandLine(new MigrationCLI());
 
-        String title = "Deposit Recorded Generated ID " + System.currentTimeMillis();
+        String title = "Deposit Record Generated ID " + System.currentTimeMillis();
         File pidListFile = setupDepositRecord(migrationCommand,
                 title);
 
@@ -228,8 +228,8 @@ public void transformDepositRecordsGeneratedIds() throws Exception {
         // Find the correct deposit record by title
         DepositRecord depRec = depRecs.stream()
                 .filter(d -> d.getResource().hasLiteral(DC.title, title))
-               .findFirst()
-               .get();
+                .findFirst()
+                .get();
 
         assertTrue(depRec.getResource().hasLiteral(Cdr.depositedOnBehalfOf, DEPOSITOR));
 

migration-util/src/test/java/edu/unc/lib/dcr/migration/deposit/DepositRecordTransformerIT.java

@@ -19,7 +19,6 @@
 import static java.util.stream.Collectors.toList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.slf4j.LoggerFactory.getLogger;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -33,10 +32,10 @@
 import org.apache.jena.vocabulary.RDF;
 import org.jdom2.Document;
 import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.ContextHierarchy;
@@ -74,8 +73,6 @@
     @ContextConfiguration("/spring-test/cdr-client-container.xml")
 })
 public class DepositRecordTransformerIT extends AbstractDepositRecordTransformationIT {
-    private static final Logger log = getLogger(DepositRecordTransformerIT.class);
-
     private static Path ingestSourcePath;
 
     static {
@@ -118,6 +115,7 @@ public class DepositRecordTransformerIT extends AbstractDepositRecordTransformat
     public void init() throws Exception {
         TestHelper.setContentBase("http://localhost:48085/rest");
 
+        Files.createDirectories(ingestSourcePath);
         datastreamsPath = ingestSourcePath.resolve("datastreams");
         objectsPath = ingestSourcePath.resolve("objects");
         Files.createDirectories(datastreamsPath);
@@ -133,8 +131,6 @@ public void init() throws Exception {
         transformer.setPremisLoggerFactory(premisLoggerFactory);
         transformer.setRepositoryObjectFactory(repoObjFactory);
         transformer.setTransactionManager(txManager);
-
-        System.setProperty("dcr.it.tdr.ingestSource", tmpFolder.getRoot().getAbsolutePath());
     }
 
     @After
@@ -143,6 +139,11 @@ public void tearDown() throws Exception {
         transferSession.close();
     }
 
+    @AfterClass
+    public static void tearDownClass() throws Exception {
+        FileUtils.deleteDirectory(ingestSourcePath.toFile());
+    }
+
     @Test(expected = RepositoryException.class)
     public void transform_NoFoxml() throws Exception {
         transformer.compute();
@@ -231,7 +232,7 @@ public void transform_DepositRecord_withManifests() throws Exception {
 
         String manifest0Name = "DATA_MANIFEST0";
         String manifest0Content = "content for m0";
-        Path mPath = writeManifestFile(bxc3Pid, manifest0Name, manifest0Content);
+        writeManifestFile(bxc3Pid, manifest0Name, manifest0Content);
         DatastreamVersion manifest0 = new DatastreamVersion(null,
                 manifest0Name, "0",
                 FoxmlDocumentBuilder.DEFAULT_CREATED_DATE,
@@ -241,15 +242,13 @@ public void transform_DepositRecord_withManifests() throws Exception {
 
         String manifest1Name = "DATA_MANIFEST1";
         String manifest1Content = "additional content";
-        Path mPath2 = writeManifestFile(bxc3Pid, manifest1Name, manifest1Content);
+        writeManifestFile(bxc3Pid, manifest1Name, manifest1Content);
         DatastreamVersion manifest1 = new DatastreamVersion(null,
                 manifest1Name, "0",
                 FoxmlDocumentBuilder.DEFAULT_LAST_MODIFIED,
                 Integer.toString(manifest1Content.length()),
                 "text/plain",
                 null);
-        log.error("Mpath1 = {} {}", mPath, Files.exists(mPath));
-        log.error("Mpath2 = {} {}", mPath2, Files.exists(mPath2));
 
         Document foxml = new FoxmlDocumentBuilder(bxc3Pid, "Deposit Record with Manifests")
                 .relsExtModel(bxc3Model)