From 7db96f415348e8e93b2d345b98cbbcbc9cd36415 Mon Sep 17 00:00:00 2001 From: Clara Wiatrowski Date: Thu, 30 Jun 2022 10:49:36 +0200 Subject: [PATCH 1/3] Add sizeOnDisk to the model --- .../heritrix3wrapper/jaxb/SizeTotalsReport.java | 3 +++ .../org/netarchivesuite/heritrix3wrapper/jaxb/TestJob.java | 2 ++ src/test/resources/jaxb/job-finished.xml | 1 + src/test/resources/jaxb/job-unbuilt.xml | 1 + 4 files changed, 7 insertions(+) diff --git a/src/main/java/org/netarchivesuite/heritrix3wrapper/jaxb/SizeTotalsReport.java b/src/main/java/org/netarchivesuite/heritrix3wrapper/jaxb/SizeTotalsReport.java index 60009eb..d05cbc6 100644 --- a/src/main/java/org/netarchivesuite/heritrix3wrapper/jaxb/SizeTotalsReport.java +++ b/src/main/java/org/netarchivesuite/heritrix3wrapper/jaxb/SizeTotalsReport.java @@ -29,5 +29,8 @@ public class SizeTotalsReport { @XmlElement(required=true) public Long totalCount; + + @XmlElement(required=true) + public Long sizeOnDisk; } diff --git a/src/test/java/org/netarchivesuite/heritrix3wrapper/jaxb/TestJob.java b/src/test/java/org/netarchivesuite/heritrix3wrapper/jaxb/TestJob.java index 6653488..0040a4d 100644 --- a/src/test/java/org/netarchivesuite/heritrix3wrapper/jaxb/TestJob.java +++ b/src/test/java/org/netarchivesuite/heritrix3wrapper/jaxb/TestJob.java @@ -111,6 +111,7 @@ public void assertJobUnbuilt(Job job) throws Exception { Assert.assertEquals(new Long(0), sizeTotalsReport.notModifiedCount); Assert.assertEquals(new Long(0), sizeTotalsReport.total); Assert.assertEquals(new Long(0), sizeTotalsReport.totalCount); + Assert.assertEquals(new Long(0), sizeTotalsReport.sizeOnDisk); RateReport rateReport = job.rateReport; Assert.assertNotNull(rateReport); Assert.assertNull(rateReport.currentDocsPerSecond); @@ -243,6 +244,7 @@ public void assertJobFinished(Job job) throws Exception { Assert.assertEquals(new Long(506), sizeTotalsReport.novelCount); Assert.assertEquals(new Long(269461632), sizeTotalsReport.total); Assert.assertEquals(new Long(506), sizeTotalsReport.totalCount); + Assert.assertEquals(new Long(123456789), sizeTotalsReport.sizeOnDisk); RateReport rateReport = job.rateReport; Assert.assertNotNull(rateReport); Assert.assertEquals(new Double(0.0),rateReport.currentDocsPerSecond); diff --git a/src/test/resources/jaxb/job-finished.xml b/src/test/resources/jaxb/job-finished.xml index 9b0b3a4..77e9209 100644 --- a/src/test/resources/jaxb/job-finished.xml +++ b/src/test/resources/jaxb/job-finished.xml @@ -36,6 +36,7 @@ 506 269461632 506 + 123456789 0.0 diff --git a/src/test/resources/jaxb/job-unbuilt.xml b/src/test/resources/jaxb/job-unbuilt.xml index 89490ba..1edeeb3 100644 --- a/src/test/resources/jaxb/job-unbuilt.xml +++ b/src/test/resources/jaxb/job-unbuilt.xml @@ -30,6 +30,7 @@ 0 0 0 + 0 From e5a0003119315695c02542c8479152300d650bb1 Mon Sep 17 00:00:00 2001 From: csrster Date: Fri, 15 Jul 2022 11:34:41 +0200 Subject: [PATCH 2/3] [maven-release-plugin] prepare release heritrix3-wrapper-1.0.5 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e885c8c..e486fb6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.netarchivesuite heritrix3-wrapper - 1.0.5-SNAPSHOT + 1.0.5 jar Heritrix 3 Wrapper @@ -27,7 +27,7 @@ scm:git:git@github.com:netarchivesuite/heritrix3-wrapper.git scm:git:https://github.com/netarchivesuite/heritrix3-wrapper.git https://github.com/netarchivesuite/heritrix3-wrapper - HEAD + heritrix3-wrapper-1.0.5 From 6bfecffc76f06b0b67a301e3a8730d47cae40322 Mon Sep 17 00:00:00 2001 From: csrster Date: Fri, 15 Jul 2022 11:34:44 +0200 Subject: [PATCH 3/3] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e486fb6..f98e513 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.netarchivesuite heritrix3-wrapper - 1.0.5 + 1.0.6-SNAPSHOT jar Heritrix 3 Wrapper @@ -27,7 +27,7 @@ scm:git:git@github.com:netarchivesuite/heritrix3-wrapper.git scm:git:https://github.com/netarchivesuite/heritrix3-wrapper.git https://github.com/netarchivesuite/heritrix3-wrapper - heritrix3-wrapper-1.0.5 + HEAD