Merge pull request #7 from jamesross03/develop

1.0.2-SNAPSHOT: Updates and type-safety

Author: grahamkirby

README.md

@@ -10,7 +10,7 @@ This project provides some Java utility classes for manipulating population reco
 <dependency>
     <groupId>uk.ac.standrews.cs</groupId>
     <artifactId>population-records</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0.2-SNAPSHOT</version>
 </dependency>
 ...
 <repository>

pom.xml

@@ -27,7 +27,7 @@
     </parent>
 
     <artifactId>population-records</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.2-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>population-records</name>
 
@@ -39,13 +39,20 @@
         <dependency>
             <groupId>uk.ac.standrews.cs</groupId>
             <artifactId>neo-storr</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>uk.ac.standrews.cs</groupId>
             <artifactId>ciesvium</artifactId>
-            <version>1.1.0-SNAPSHOT</version>
+            <version>1.1.1-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.10.2</version> <!-- Use the latest version -->
+            <scope>test</scope>
         </dependency>
 
     </dependencies>

src/main/java/uk/ac/standrews/cs/population_records/RecordRepository.java

@@ -131,7 +131,7 @@ private <T extends LXP> Iterable<T> getRecords(IBucket<T> bucket) {
 
         return () -> new Iterator<>() {
 
-            final List<Long> object_ids = bucket.getObjectIds();
+            final List<String> object_ids = bucket.getObjectIds();
             final int bucket_size = object_ids.size();
             int next_index = 0;
 

src/main/java/uk/ac/standrews/cs/population_records/record_types/Birth.java

@@ -29,7 +29,7 @@
 import java.util.List;
 import java.util.Map;
 
-@SuppressWarnings({"unused", "WeakerAccess"})
+@SuppressWarnings("WeakerAccess")
 public class Birth extends StaticLXP {
 
     public static final String ROLE_BABY = "ROLE_BABY";
@@ -53,7 +53,7 @@ public Birth() {
         super();
     }
 
-    public Birth(long persistent_object_id, Map properties, IBucket bucket) throws PersistentObjectException {
+    public Birth(String persistent_object_id, Map properties, IBucket bucket) throws PersistentObjectException {
 
         super(persistent_object_id, properties, bucket);
     }

src/main/java/uk/ac/standrews/cs/population_records/record_types/Death.java

@@ -29,7 +29,7 @@
 import java.util.List;
 import java.util.Map;
 
-@SuppressWarnings({"unused", "WeakerAccess"})
+@SuppressWarnings("WeakerAccess")
 public class Death extends StaticLXP {
 
     public static final String ROLE_DECEASED = "ROLE_DECEASED";
@@ -57,7 +57,7 @@ public Death() {
         super();
     }
 
-    public Death(long persistent_Object_id, Map properties, IBucket bucket) throws PersistentObjectException {
+    public Death(String persistent_Object_id, Map properties, IBucket bucket) throws PersistentObjectException {
 
         super(persistent_Object_id, properties, bucket);
     }

src/main/java/uk/ac/standrews/cs/population_records/record_types/Marriage.java

@@ -29,7 +29,7 @@
 import java.util.List;
 import java.util.Map;
 
-@SuppressWarnings({"WeakerAccess", "unused"})
+@SuppressWarnings("WeakerAccess")
 public class Marriage extends StaticLXP {
 
     public static final String ROLE_BRIDE = "ROLE_BRIDE";
@@ -60,8 +60,8 @@ public Marriage() {
         super();
     }
 
-    public Marriage(long persistent_object_id, Map properties, IBucket bucket) throws PersistentObjectException {
-
+    public Marriage(String persistent_object_id, Map properties, IBucket bucket) throws PersistentObjectException {
+        
         super(persistent_object_id, properties, bucket);
     }
 

src/test/java/uk/ac/standrews/cs/population_records/NormalisationTest.java

@@ -16,9 +16,9 @@
  */
 package uk.ac.standrews.cs.population_records;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class NormalisationTest {