Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions src/main/java/org/entur/netex/support/NetexVersionHelper.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.entur.netex.support;

import static java.util.Comparator.comparingInt;
import static java.util.Comparator.comparingLong;

import java.util.Collection;
import java.util.Comparator;
Expand All @@ -20,10 +20,10 @@ private NetexVersionHelper() {}

/**
* According to the <b>Norwegian Netex profile</b> the version number must be a
* positive increasing integer. A bigger value indicate a later version.
* positive increasing number. A bigger value indicate a later version.
*/
private static int versionOf(EntityInVersionStructure e) {
return Integer.parseInt(e.getVersion());
private static long versionOf(EntityInVersionStructure e) {
return Long.parseLong(e.getVersion());
}

/**
Expand Down Expand Up @@ -56,6 +56,6 @@ public static <T extends EntityInVersionStructure> T versionOfElementIn(
private static <
T extends EntityInVersionStructure
> Comparator<T> comparingVersion() {
return comparingInt(NetexVersionHelper::versionOf);
return comparingLong(NetexVersionHelper::versionOf);
}
}
30 changes: 30 additions & 0 deletions src/test/java/org/entur/netex/support/NetexVersionHelperTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package org.entur.netex.support;

import java.util.ArrayList;
import java.util.Collection;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.rutebanken.netex.model.EntityInVersionStructure;

class NetexVersionHelperTest {

@Test
void testVersionOf() {
EntityInVersionStructure entityInVersionStructure1 =
new EntityInVersionStructure();
entityInVersionStructure1.setVersion("20250101000000");
EntityInVersionStructure entityInVersionStructure2 =
new EntityInVersionStructure();
entityInVersionStructure2.setVersion("20250101000001");

Collection<EntityInVersionStructure> entitiesInVersionStructure =
new ArrayList<>();
entitiesInVersionStructure.add(entityInVersionStructure1);
entitiesInVersionStructure.add(entityInVersionStructure2);

Assertions.assertEquals(
entityInVersionStructure2,
NetexVersionHelper.latestVersionedElementIn(entitiesInVersionStructure)
);
}
}