Skip to content

1.0.2-SNAPSHOT: Updates and type-safety #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grahamkirby merged 8 commits into from
Sep 1, 2025
Merged

1.0.2-SNAPSHOT: Updates and type-safety #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ff485d7
Migrates tests to JUnit5
Jul 21, 2025
69f5827
Addresses raw type warnings
Jul 22, 2025
e1d0af6
Prepares 1.0.2-SNAPSHOT version
Jul 22, 2025
b843bfe
Updates Ciesvium dependency to `1.1.1-SNAPSHOT`
Jul 22, 2025
ff6df9f
Updates `neo-storr` dependency to `1.0.1-SNAPSHOT`
Jul 23, 2025
6f37618
Revert "Addresses raw type warnings"
Jul 23, 2025
4885b43
Updated to use String ids for objects
Jul 25, 2025
b8e8c7b
Removes unnecessary "SuppressWarnings"
Jul 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
13 changes: 10 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/uk/ac/standrews/cs/population_records/RecordRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/uk/ac/standrews/cs/population_records/record_types/Birth.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/uk/ac/standrews/cs/population_records/record_types/Death.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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);
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/uk/ac/standrews/cs/population_records/record_types/Marriage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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);
}

Expand Down
4 changes: 2 additions & 2 deletions src/test/java/uk/ac/standrews/cs/population_records/NormalisationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Loading