Skip to content

Adapt message builder and attributes validator to 1.6.0-alpha.4 #193

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
sophokles73 merged 1 commit into from
Sep 6, 2025
Merged

Adapt message builder and attributes validator to 1.6.0-alpha.4 #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
339 changes: 201 additions & 138 deletions src/main/java/org/eclipse/uprotocol/transport/builder/UMessageBuilder.java
View file
Open in desktop

Large diffs are not rendered by default.

456 changes: 0 additions & 456 deletions src/main/java/org/eclipse/uprotocol/transport/validate/UAttributesValidator.java
View file
Open in desktop

This file was deleted.

582 changes: 582 additions & 0 deletions src/main/java/org/eclipse/uprotocol/transport/validator/UAttributesValidator.java
View file
Open in desktop

Large diffs are not rendered by default.

589 changes: 331 additions & 258 deletions src/test/java/org/eclipse/uprotocol/transport/builder/UMessageBuilderTest.java
View file
Open in desktop

Large diffs are not rendered by default.

562 changes: 0 additions & 562 deletions src/test/java/org/eclipse/uprotocol/transport/validator/UAttributeValidatorTest.java
View file
Open in desktop

This file was deleted.

791 changes: 791 additions & 0 deletions src/test/java/org/eclipse/uprotocol/transport/validator/UAttributesValidatorTest.java
View file
Open in desktop

Large diffs are not rendered by default.

31 changes: 3 additions & 28 deletions src/test/java/org/eclipse/uprotocol/uuid/factory/UUIDFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;

import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;

import static org.junit.jupiter.api.Assertions.*;
Expand Down Expand Up @@ -113,9 +110,9 @@ void testUuidv6CreationWithNullInstant() {
@Test
@DisplayName("Test UUIDUtils for Random UUID")
void testUuidutilsForRandomUuid() {
final java.util.UUID uuid_java = java.util.UUID.randomUUID();
final UUID uuid = UUID.newBuilder().setMsb(uuid_java.getMostSignificantBits())
.setLsb(uuid_java.getLeastSignificantBits()).build();
final var uuidJava = java.util.UUID.randomUUID();
final UUID uuid = UUID.newBuilder().setMsb(uuidJava.getMostSignificantBits())
.setLsb(uuidJava.getLeastSignificantBits()).build();
final Optional<Long> time = UuidUtils.getTime(uuid);
final String uuidString = UuidSerializer.serialize(uuid);

Expand Down Expand Up @@ -222,28 +219,6 @@ void testCreateUprotocolUuidWithDifferentTimeValues() throws InterruptedExceptio

}

@Test
@DisplayName("Test Create both UUIDv6 and v7 to compare performance")
void testCreateBothUuidv6AndV7ToComparePerformance() throws InterruptedException {
final List<UUID> uuidv6List = new ArrayList<>();
final List<UUID> uuidv7List = new ArrayList<>();
final int MAX_COUNT = 10000;

Instant start = Instant.now();
for (int i = 0; i < MAX_COUNT; i++) {
uuidv7List.add(UuidFactory.Factories.UPROTOCOL.factory().create());
}
final Duration v7Diff = Duration.between(start, Instant.now());

start = Instant.now();
for (int i = 0; i < MAX_COUNT; i++) {
uuidv6List.add(UuidFactory.Factories.UUIDV6.factory().create());
}
final Duration v6Diff = Duration.between(start, Instant.now());
System.out.println(
"UUIDv7:[" + v7Diff.toNanos() / MAX_COUNT + "ns]" + " UUIDv6:[" + v6Diff.toNanos() / MAX_COUNT + "ns]");
}

@Test
@DisplayName("Test Create UUIDv7 with the same time to confirm the UUIDs are not the same")
void testCreateUuidv7WithTheSameTimeToConfirmTheUuidsAreNotTheSame() {
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/org/eclipse/uprotocol/uuid/validator/UuidValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ void testUuidv7WithInvalidTypes() {
final UUID uuidv6 = UuidFactory.Factories.UUIDV6.factory().create();
final UUID uuid = UUID.newBuilder().setMsb(0L).setLsb(0L).build();

final java.util.UUID uuid_java = java.util.UUID.randomUUID();
final UUID uuidv4 = UUID.newBuilder().setMsb(uuid_java.getMostSignificantBits())
.setLsb(uuid_java.getLeastSignificantBits()).build();
final java.util.UUID uuidJava = java.util.UUID.randomUUID();
final UUID uuidv4 = UUID.newBuilder().setMsb(uuidJava.getMostSignificantBits())
.setLsb(uuidJava.getLeastSignificantBits()).build();

final UuidValidator validator = UuidValidator.Validators.UPROTOCOL.validator();
assertNotNull(validator);
Expand Down