From 69db6814d471ffe7efca36a85bb3f66734f5246a Mon Sep 17 00:00:00 2001 From: scottf Date: Mon, 23 Feb 2026 12:46:57 -0500 Subject: [PATCH 1/7] Remove GSON, use internal Json tool --- pcgroups/build.gradle | 30 +--- .../io/synadia/pcg/ElasticConsumerGroup.java | 54 +++----- .../pcg/ElasticConsumerGroupConfig.java | 130 ++++++++++++------ .../java/io/synadia/pcg/MemberMapping.java | 49 ++++++- .../io/synadia/pcg/StaticConsumerGroup.java | 21 +-- .../pcg/StaticConsumerGroupConfig.java | 80 +++++++---- .../synadia/pcg/ElasticConsumerGroupTest.java | 38 ++--- .../java/io/synadia/pcg/IntegrationTest.java | 17 ++- .../io/synadia/pcg/PartitionUtilsTest.java | 9 +- .../synadia/pcg/StaticConsumerGroupTest.java | 30 ++-- 10 files changed, 280 insertions(+), 178 deletions(-) diff --git a/pcgroups/build.gradle b/pcgroups/build.gradle index 383c6fe..c84dda9 100644 --- a/pcgroups/build.gradle +++ b/pcgroups/build.gradle @@ -19,7 +19,7 @@ def isRelease = System.getenv("BUILD_EVENT") == "release" def tc = System.getenv("TARGET_COMPATIBILITY"); def targetCompat = tc == "21" ? JavaVersion.VERSION_21 : (tc == "17" ? JavaVersion.VERSION_17 : JavaVersion.VERSION_1_8) def jarEnd = tc == "21" ? "-jdk21" : (tc == "17" ? "-jdk17" : "") -def jarAndArtifactName = "partitioned-consumer-groups" + jarEnd +def jarAndArtifactName = "pcgroups" + jarEnd version = isRelease ? jarVersion : jarVersion + "-SNAPSHOT" // version is the variable the build actually uses. @@ -36,10 +36,10 @@ repositories { dependencies { implementation 'io.nats:jnats:2.25.1' - implementation 'com.google.code.gson:gson:2.11.0' implementation 'org.jspecify:jspecify:1.0.0' testImplementation 'io.nats:jnats-server-runner:3.1.0' + testImplementation 'org.junit.jupiter:junit-jupiter:5.14.1' testImplementation 'org.junit.platform:junit-platform-launcher:1.14.3' } @@ -66,28 +66,18 @@ jar { bnd("Bundle-Name": "io.synadia.partitioned.consumer.groups", "Bundle-Vendor": "synadia.io", "Bundle-Description": "NATS JetStream Partitioned Consumer Groups Library for Java", - "Bundle-DocURL": "https://synadia.io" + "Bundle-DocURL": "https://github.com/synadia-io/orbit.java/tree/main/pcgroups", + "Target-Compatibility": "Java " + targetCompat ) } } test { - // Use junit platform for unit tests useJUnitPlatform() - testLogging { - exceptionFormat = 'full' - events "started", "passed", "skipped", "failed" - showStandardStreams = true - } - retry { - failOnPassedAfterRetry = false - maxFailures = 3 - maxRetries = 3 - } - systemProperty 'junit.jupiter.execution.timeout.default', '3m' } javadoc { + options.overview = 'src/main/javadoc/overview.html' // relative to source root source = sourceSets.main.allJava title = "Synadia Communications Inc. NATS JetStream Partitioned Consumer Groups" classpath = sourceSets.main.runtimeClasspath @@ -103,13 +93,8 @@ tasks.register('sourcesJar', Jar) { from sourceSets.main.allSource } -tasks.register('testsJar', Jar) { - archiveClassifier.set('tests') - from sourceSets.test.allSource -} - artifacts { - archives javadocJar, sourcesJar, testsJar + archives javadocJar, sourcesJar } jacoco { @@ -146,10 +131,9 @@ publishing { from components.java artifact sourcesJar artifact javadocJar - artifact testsJar pom { name = jarAndArtifactName - packaging = "jar" + packaging = 'jar' groupId = group artifactId = jarAndArtifactName description = "Synadia Communications Inc. NATS JetStream Partitioned Consumer Groups" diff --git a/pcgroups/src/main/java/io/synadia/pcg/ElasticConsumerGroup.java b/pcgroups/src/main/java/io/synadia/pcg/ElasticConsumerGroup.java index b26a668..09d5042 100644 --- a/pcgroups/src/main/java/io/synadia/pcg/ElasticConsumerGroup.java +++ b/pcgroups/src/main/java/io/synadia/pcg/ElasticConsumerGroup.java @@ -13,15 +13,12 @@ package io.synadia.pcg; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; import io.nats.client.*; import io.nats.client.api.*; import io.nats.client.impl.Headers; import io.synadia.pcg.exceptions.ConsumerGroupException; import java.io.IOException; -import java.nio.charset.StandardCharsets; import java.time.Duration; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -41,7 +38,6 @@ public class ElasticConsumerGroup { private static final Logger LOGGER = Logger.getLogger(ElasticConsumerGroup.class.getName()); - private static final Gson GSON = new GsonBuilder().disableHtmlEscaping().create(); private ElasticConsumerGroup() { // Utility class @@ -96,27 +92,22 @@ public static ElasticConsumerGroupConfig create(Connection nc, String streamName String key = composeKey(streamName, consumerGroupName); // Check if config already exists - KeyValueEntry entry = kv.get(key); - if (entry != null) { - String json = new String(entry.getValue(), StandardCharsets.UTF_8); - ElasticConsumerGroupConfig existingConfig = GSON.fromJson(json, ElasticConsumerGroupConfig.class); - - // Verify the config matches + ElasticConsumerGroupConfig existingConfig = ElasticConsumerGroupConfig.instance(kv.get(key)); + if (existingConfig != null) { if (existingConfig.getMaxMembers() != maxMembers || - !Objects.equals(existingConfig.getFilter(), filter) || - existingConfig.getMaxBufferedMsgs() != maxBufferedMsgs || - existingConfig.getMaxBufferedBytes() != maxBufferedBytes || - !Arrays.equals(existingConfig.getPartitioningWildcards(), partitioningWildcards)) { + !Objects.equals(existingConfig.getFilter(), filter) || + existingConfig.getMaxBufferedMessages() != maxBufferedMsgs || + existingConfig.getMaxBufferedBytes() != maxBufferedBytes || + !Arrays.equals(existingConfig.getPartitioningWildcards(), partitioningWildcards)) { throw new ConsumerGroupException( - "the existing elastic consumer group config can not be updated to the requested one, " + - "please delete the existing elastic consumer group and create a new one"); + "the existing elastic consumer group config can not be updated to the requested one, " + + "please delete the existing elastic consumer group and create a new one"); } return existingConfig; } // Create the config entry - String payload = GSON.toJson(config); - kv.put(key, payload.getBytes(StandardCharsets.UTF_8)); + kv.put(key, config.serialize()); // Create the work queue stream with subject transform String workQueueStreamName = composeCGSName(streamName, consumerGroupName); @@ -305,9 +296,8 @@ public static List addMembers(Connection nc, String streamName, String c List newMembers = new ArrayList<>(existingMembers); config.setMembers(newMembers); - String payload = GSON.toJson(config); String key = composeKey(streamName, consumerGroupName); - kv.update(key, payload.getBytes(StandardCharsets.UTF_8), config.getRevision()); + kv.update(key, config.serialize(), config.getRevision()); return newMembers; } @@ -350,9 +340,8 @@ public static List deleteMembers(Connection nc, String streamName, Strin config.setMembers(newMembers); - String payload = GSON.toJson(config); String key = composeKey(streamName, consumerGroupName); - kv.update(key, payload.getBytes(StandardCharsets.UTF_8), config.getRevision()); + kv.update(key, config.serialize(), config.getRevision()); return newMembers; } @@ -382,9 +371,8 @@ public static void setMemberMappings(Connection nc, String streamName, String co config.setMemberMappings(memberMappings); config.validate(); - String payload = GSON.toJson(config); String key = composeKey(streamName, consumerGroupName); - kv.put(key, payload.getBytes(StandardCharsets.UTF_8)); + kv.put(key, config.serialize()); } /** @@ -408,9 +396,8 @@ public static void deleteMemberMappings(Connection nc, String streamName, String config.setMemberMappings(new ArrayList<>()); - String payload = GSON.toJson(config); String key = composeKey(streamName, consumerGroupName); - kv.put(key, payload.getBytes(StandardCharsets.UTF_8)); + kv.put(key, config.serialize()); } /** @@ -538,17 +525,11 @@ private static ElasticConsumerGroupConfig getConfigFromKV(KeyValue kv, String st } String key = composeKey(streamName, consumerGroupName); - KeyValueEntry entry = kv.get(key); - - if (entry == null) { + ElasticConsumerGroupConfig config = ElasticConsumerGroupConfig.instance(kv.get(key)); + if (config == null) { throw new ConsumerGroupException("error getting the elastic consumer group's config: not found"); } - - String json = new String(entry.getValue(), StandardCharsets.UTF_8); - ElasticConsumerGroupConfig config = GSON.fromJson(json, ElasticConsumerGroupConfig.class); - config.setRevision(entry.getRevision()); config.validate(); - return config; } @@ -730,14 +711,13 @@ private void processWatcherUpdate(KeyValueEntry entry) { } try { - String json = new String(entry.getValue(), StandardCharsets.UTF_8); - ElasticConsumerGroupConfig newConfig = GSON.fromJson(json, ElasticConsumerGroupConfig.class); + ElasticConsumerGroupConfig newConfig = ElasticConsumerGroupConfig.instance(entry); newConfig.validate(); // Check if critical config changed (immutable fields) if (newConfig.getMaxMembers() != config.getMaxMembers() || !Objects.equals(newConfig.getFilter(), config.getFilter()) || - newConfig.getMaxBufferedMsgs() != config.getMaxBufferedMsgs() || + newConfig.getMaxBufferedMessages() != config.getMaxBufferedMessages() || newConfig.getMaxBufferedBytes() != config.getMaxBufferedBytes() || !Arrays.equals(newConfig.getPartitioningWildcards(), config.getPartitioningWildcards())) { stopConsuming(); diff --git a/pcgroups/src/main/java/io/synadia/pcg/ElasticConsumerGroupConfig.java b/pcgroups/src/main/java/io/synadia/pcg/ElasticConsumerGroupConfig.java index 29e3c21..579001f 100644 --- a/pcgroups/src/main/java/io/synadia/pcg/ElasticConsumerGroupConfig.java +++ b/pcgroups/src/main/java/io/synadia/pcg/ElasticConsumerGroupConfig.java @@ -13,41 +13,59 @@ package io.synadia.pcg; -import com.google.gson.annotations.SerializedName; +import io.nats.client.api.KeyValueEntry; +import io.nats.client.support.*; import io.synadia.pcg.exceptions.ConsumerGroupException; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; import java.util.*; +import static io.nats.client.support.JsonUtils.*; +import static io.nats.client.support.JsonValueUtils.*; + /** * Configuration for an elastic consumer group. * JSON structure must be compatible with the Go version. */ -public class ElasticConsumerGroupConfig { +public class ElasticConsumerGroupConfig implements JsonSerializable { + static final String MAX_MEMBERS = "max_members"; + static final String FILTER = "filter"; + static final String PARTITIONING_WILDCARDS = "partitioning_wildcards"; + static final String MAX_BUFFERED_MSG = "max_buffered_msg"; + static final String MAX_BUFFERED_BYTES = "max_buffered_bytes"; + static final String MEMBERS = "members"; + static final String MEMBER_MAPPINGS = "member_mappings"; - @SerializedName("max_members") private int maxMembers; - - @SerializedName("filter") private String filter; - - @SerializedName("partitioning_wildcards") private int[] partitioningWildcards; - - @SerializedName("max_buffered_msg") - private long maxBufferedMsgs; - - @SerializedName("max_buffered_bytes") + private long maxBufferedMessages; private long maxBufferedBytes; - - @SerializedName("members") private List members; - - @SerializedName("member_mappings") private List memberMappings; // Internal revision number, not serialized private transient long revision; + @Nullable + public static ElasticConsumerGroupConfig instance(KeyValueEntry entry) throws JsonParseException { + if (entry != null) { + byte[] json = entry.getValue(); + if (json != null) { + ElasticConsumerGroupConfig config = instance(json); + config.setRevision(entry.getRevision()); + return config; + } + } + return null; + } + + @NonNull + public static ElasticConsumerGroupConfig instance(byte @NonNull[] json) throws JsonParseException { + return new ElasticConsumerGroupConfig(JsonParser.parse(json)); + } + public ElasticConsumerGroupConfig() { this.partitioningWildcards = new int[0]; this.members = new ArrayList<>(); @@ -55,15 +73,30 @@ public ElasticConsumerGroupConfig() { } public ElasticConsumerGroupConfig(int maxMembers, String filter, int[] partitioningWildcards, - long maxBufferedMsgs, long maxBufferedBytes, + long maxBufferedMessages, long maxBufferedBytes, List members, List memberMappings) { this.maxMembers = maxMembers; this.filter = filter; this.partitioningWildcards = partitioningWildcards != null ? partitioningWildcards.clone() : new int[0]; - this.maxBufferedMsgs = maxBufferedMsgs; + this.maxBufferedMessages = maxBufferedMessages; this.maxBufferedBytes = maxBufferedBytes; - this.members = members != null ? new ArrayList<>(members) : new ArrayList<>(); - this.memberMappings = memberMappings != null ? new ArrayList<>(memberMappings) : new ArrayList<>(); + this.members = members == null ? new ArrayList<>() : new ArrayList<>(members); + this.memberMappings = memberMappings == null ? new ArrayList<>() : new ArrayList<>(memberMappings); + } + + public ElasticConsumerGroupConfig(JsonValue jv) { + this.maxMembers = JsonValueUtils.readInteger(jv, MAX_MEMBERS, 0); + this.filter = JsonValueUtils.readString(jv, FILTER); + List integers = read(jv, PARTITIONING_WILDCARDS, v -> listOf(v, JsonValueUtils::getInteger)); + this.partitioningWildcards = new int[integers.size()]; + for (int x = 0; x < integers.size(); x++) { + Integer i = integers.get(x); + this.partitioningWildcards[x] = i == null ? 0 : i; + } + this.maxBufferedMessages = JsonValueUtils.readLong(jv, MAX_BUFFERED_MSG, 0); + this.maxBufferedBytes = JsonValueUtils.readLong(jv, MAX_BUFFERED_BYTES, 0); + this.members = JsonValueUtils.readStringList(jv, MEMBERS); + this.memberMappings = MemberMapping.listOfOrEmptyList(readValue(jv, MEMBER_MAPPINGS)); } public int getMaxMembers() { @@ -83,19 +116,19 @@ public void setFilter(String filter) { } public int[] getPartitioningWildcards() { - return partitioningWildcards != null ? partitioningWildcards.clone() : new int[0]; + return partitioningWildcards.clone(); } public void setPartitioningWildcards(int[] partitioningWildcards) { - this.partitioningWildcards = partitioningWildcards != null ? partitioningWildcards.clone() : new int[0]; + this.partitioningWildcards = partitioningWildcards == null ? new int[0] : partitioningWildcards.clone(); } - public long getMaxBufferedMsgs() { - return maxBufferedMsgs; + public long getMaxBufferedMessages() { + return maxBufferedMessages; } - public void setMaxBufferedMsgs(long maxBufferedMsgs) { - this.maxBufferedMsgs = maxBufferedMsgs; + public void setMaxBufferedMessages(long maxBufferedMessages) { + this.maxBufferedMessages = maxBufferedMessages; } public long getMaxBufferedBytes() { @@ -111,15 +144,15 @@ public List getMembers() { } public void setMembers(List members) { - this.members = members != null ? new ArrayList<>(members) : new ArrayList<>(); + this.members = members == null ? new ArrayList<>() : new ArrayList<>(members); } public List getMemberMappings() { - return memberMappings != null ? new ArrayList<>(memberMappings) : new ArrayList<>(); + return new ArrayList<>(memberMappings); } public void setMemberMappings(List memberMappings) { - this.memberMappings = memberMappings != null ? new ArrayList<>(memberMappings) : new ArrayList<>(); + this.memberMappings = memberMappings == null ? new ArrayList<>() : new ArrayList<>(memberMappings); } public long getRevision() { @@ -134,17 +167,14 @@ public void setRevision(long revision) { * Checks if the given member name is in the current membership. */ public boolean isInMembership(String name) { - if (memberMappings != null && !memberMappings.isEmpty()) { + if (!memberMappings.isEmpty()) { for (MemberMapping mapping : memberMappings) { if (mapping.getMember().equals(name)) { return true; } } } - if (members != null && !members.isEmpty()) { - return members.contains(name); - } - return false; + return members.contains(name); } /** @@ -192,8 +222,8 @@ public void validate() throws ConsumerGroupException { } // Validate that only one of members or member mappings is provided - boolean hasMembers = members != null && !members.isEmpty(); - boolean hasMemberMappings = memberMappings != null && !memberMappings.isEmpty(); + boolean hasMembers = !members.isEmpty(); + boolean hasMemberMappings = !memberMappings.isEmpty(); if (hasMembers && hasMemberMappings) { throw new ConsumerGroupException("either members or member mappings must be provided, not both"); @@ -201,7 +231,7 @@ public void validate() throws ConsumerGroupException { // Validate member mappings if (hasMemberMappings) { - if (memberMappings.size() < 1 || memberMappings.size() > maxMembers) { + if (memberMappings.size() > maxMembers) { throw new ConsumerGroupException("the number of member mappings must be between 1 and the max number of members"); } @@ -257,13 +287,33 @@ public String getPartitioningTransformDest() { return "{{Partition(" + maxMembers + "," + wildcardList + ")}}." + destFromFilter; } + @Override + public String toJson() { + StringBuilder sb = beginJson(); + addField(sb, MAX_MEMBERS, maxMembers); + addField(sb, FILTER, filter); + if (partitioningWildcards != null && partitioningWildcards.length > 0) { + sb.append("\"").append(PARTITIONING_WILDCARDS).append("\":["); + for (int i = 0; i < partitioningWildcards.length; i++) { + if (i > 0) sb.append(","); + sb.append(partitioningWildcards[i]); + } + sb.append("],"); + } + addField(sb, MAX_BUFFERED_MSG, maxBufferedMessages); + addField(sb, MAX_BUFFERED_BYTES, maxBufferedBytes); + addStrings(sb, MEMBERS, members); + addJsons(sb, MEMBER_MAPPINGS, memberMappings); + return endJson(sb).toString(); + } + @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; ElasticConsumerGroupConfig that = (ElasticConsumerGroupConfig) o; return maxMembers == that.maxMembers && - maxBufferedMsgs == that.maxBufferedMsgs && + maxBufferedMessages == that.maxBufferedMessages && maxBufferedBytes == that.maxBufferedBytes && Objects.equals(filter, that.filter) && Arrays.equals(partitioningWildcards, that.partitioningWildcards) && @@ -273,7 +323,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - int result = Objects.hash(maxMembers, filter, maxBufferedMsgs, maxBufferedBytes, members, memberMappings); + int result = Objects.hash(maxMembers, filter, maxBufferedMessages, maxBufferedBytes, members, memberMappings); result = 31 * result + Arrays.hashCode(partitioningWildcards); return result; } @@ -284,7 +334,7 @@ public String toString() { "maxMembers=" + maxMembers + ", filter='" + filter + '\'' + ", partitioningWildcards=" + Arrays.toString(partitioningWildcards) + - ", maxBufferedMsgs=" + maxBufferedMsgs + + ", maxBufferedMsgs=" + maxBufferedMessages + ", maxBufferedBytes=" + maxBufferedBytes + ", members=" + members + ", memberMappings=" + memberMappings + diff --git a/pcgroups/src/main/java/io/synadia/pcg/MemberMapping.java b/pcgroups/src/main/java/io/synadia/pcg/MemberMapping.java index adca2f3..c81d3a4 100644 --- a/pcgroups/src/main/java/io/synadia/pcg/MemberMapping.java +++ b/pcgroups/src/main/java/io/synadia/pcg/MemberMapping.java @@ -13,30 +13,67 @@ package io.synadia.pcg; -import com.google.gson.annotations.SerializedName; +import io.nats.client.support.JsonSerializable; +import io.nats.client.support.JsonValue; +import io.nats.client.support.JsonValueUtils; +import org.jspecify.annotations.NonNull; + +import java.util.ArrayList; import java.util.Arrays; +import java.util.List; import java.util.Objects; +import static io.nats.client.support.JsonUtils.*; +import static io.nats.client.support.JsonValueUtils.*; +import static io.nats.client.support.JsonValueUtils.readString; + /** * Represents a mapping between a member name and its assigned partitions. * JSON structure must be compatible with the Go version. */ -public class MemberMapping { +public class MemberMapping implements JsonSerializable { + static final String MEMBER = "member"; + static final String PARTITIONS = "partitions"; - @SerializedName("member") private String member; - - @SerializedName("partitions") private int[] partitions; - public MemberMapping() { + static List listOfOrEmptyList(JsonValue jv) { + return JsonValueUtils.listOf(jv, MemberMapping::new); } + public MemberMapping() {} + public MemberMapping(String member, int[] partitions) { this.member = member; this.partitions = partitions != null ? partitions.clone() : new int[0]; } + public MemberMapping(JsonValue jv) { + this.member = readString(jv, MEMBER); + List integers = read(jv, PARTITIONS, v -> listOf(v, JsonValueUtils::getInteger)); + this.partitions = new int[integers.size()]; + for (int x = 0; x < integers.size(); x++) { + Integer i = integers.get(x); + this.partitions[x] = i == null ? 0 : i; + } + } + + @Override + @NonNull + public String toJson() { + StringBuilder sb = beginJson(); + addField(sb, MEMBER, member); + if (partitions.length > 0) { + List integers = new ArrayList(partitions.length); + for (int i : partitions) { + integers.add(i); + } + _addList(sb, PARTITIONS, integers, StringBuilder::append); + } + return endJson(sb).toString(); + } + public String getMember() { return member; } diff --git a/pcgroups/src/main/java/io/synadia/pcg/StaticConsumerGroup.java b/pcgroups/src/main/java/io/synadia/pcg/StaticConsumerGroup.java index a9f5d15..e9583b7 100644 --- a/pcgroups/src/main/java/io/synadia/pcg/StaticConsumerGroup.java +++ b/pcgroups/src/main/java/io/synadia/pcg/StaticConsumerGroup.java @@ -13,15 +13,12 @@ package io.synadia.pcg; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; import io.nats.client.*; import io.nats.client.api.*; import io.nats.client.impl.Headers; import io.synadia.pcg.exceptions.ConsumerGroupException; import java.io.IOException; -import java.nio.charset.StandardCharsets; import java.time.Duration; import java.util.ArrayList; import java.util.List; @@ -40,7 +37,6 @@ public class StaticConsumerGroup { private static final Logger LOGGER = Logger.getLogger(StaticConsumerGroup.class.getName()); - private static final Gson GSON = new GsonBuilder().disableHtmlEscaping().create(); private StaticConsumerGroup() { // Utility class @@ -89,10 +85,8 @@ public static StaticConsumerGroupConfig create(Connection nc, String streamName, String key = composeKey(streamName, consumerGroupName); // Check if config already exists - KeyValueEntry entry = kv.get(key); - if (entry != null) { - String json = new String(entry.getValue(), StandardCharsets.UTF_8); - StaticConsumerGroupConfig existingConfig = GSON.fromJson(json, StaticConsumerGroupConfig.class); + StaticConsumerGroupConfig existingConfig = StaticConsumerGroupConfig.instance(kv.get(key)); + if (existingConfig != null) { // Verify the config matches if (!configsMatch(existingConfig, config)) { @@ -102,8 +96,7 @@ public static StaticConsumerGroupConfig create(Connection nc, String streamName, } // Create the config entry - String payload = GSON.toJson(config); - kv.put(key, payload.getBytes(StandardCharsets.UTF_8)); + kv.put(key, config.serialize()); return config; } @@ -299,8 +292,7 @@ private static StaticConsumerGroupConfig getConfigFromKV(KeyValue kv, String str throw new ConsumerGroupException("error getting the static consumer group's config: not found"); } - String json = new String(entry.getValue(), StandardCharsets.UTF_8); - StaticConsumerGroupConfig config = GSON.fromJson(json, StaticConsumerGroupConfig.class); + StaticConsumerGroupConfig config = StaticConsumerGroupConfig.instance(entry); config.validate(); return config; @@ -374,7 +366,7 @@ private void joinMemberConsumer() throws IOException, JetStreamApiException, Int // Create the durable consumer explicitly (matching Go's js.CreateConsumer) JetStreamManagement jsm = nc.jetStreamManagement(); - System.out.printf("Creating consumer %s with filters %s and priority group %s%n\n", consumerName, filters, PRIORITY_GROUP_NAME); +// System.out.printf("Creating consumer %s with filters %s and priority group %s%n\n", consumerName, filters, PRIORITY_GROUP_NAME); jsm.createConsumer(streamName, cc); // Get consumer context and start consuming @@ -425,8 +417,7 @@ public void watch(KeyValueEntry entry) { } try { - String json = new String(entry.getValue(), StandardCharsets.UTF_8); - StaticConsumerGroupConfig newConfig = GSON.fromJson(json, StaticConsumerGroupConfig.class); + StaticConsumerGroupConfig newConfig = StaticConsumerGroupConfig.instance(entry); newConfig.validate(); // Check if critical config changed diff --git a/pcgroups/src/main/java/io/synadia/pcg/StaticConsumerGroupConfig.java b/pcgroups/src/main/java/io/synadia/pcg/StaticConsumerGroupConfig.java index 3f0ad2d..dc0c885 100644 --- a/pcgroups/src/main/java/io/synadia/pcg/StaticConsumerGroupConfig.java +++ b/pcgroups/src/main/java/io/synadia/pcg/StaticConsumerGroupConfig.java @@ -13,29 +13,48 @@ package io.synadia.pcg; -import com.google.gson.annotations.SerializedName; +import io.nats.client.api.KeyValueEntry; +import io.nats.client.support.*; import io.synadia.pcg.exceptions.ConsumerGroupException; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; import java.util.*; +import static io.nats.client.support.JsonUtils.*; +import static io.nats.client.support.JsonValueUtils.readValue; + /** * Configuration for a static consumer group. * JSON structure must be compatible with the Go version. */ -public class StaticConsumerGroupConfig { +public class StaticConsumerGroupConfig implements JsonSerializable { + static final String MAX_MEMBERS = "max_members"; + static final String FILTER = "filter"; + static final String MEMBERS = "members"; + static final String MEMBER_MAPPINGS = "member_mappings"; - @SerializedName("max_members") private int maxMembers; - - @SerializedName("filter") private String filter; - - @SerializedName("members") private List members; - - @SerializedName("member_mappings") private List memberMappings; + @Nullable + public static StaticConsumerGroupConfig instance(KeyValueEntry entry) throws JsonParseException { + if (entry != null) { + byte[] json = entry.getValue(); + if (json != null) { + return instance(json); + } + } + return null; + } + + @NonNull + public static StaticConsumerGroupConfig instance(byte @NonNull[] json) throws JsonParseException { + return new StaticConsumerGroupConfig(JsonParser.parse(json)); + } + public StaticConsumerGroupConfig() { this.members = new ArrayList<>(); this.memberMappings = new ArrayList<>(); @@ -44,8 +63,26 @@ public StaticConsumerGroupConfig() { public StaticConsumerGroupConfig(int maxMembers, String filter, List members, List memberMappings) { this.maxMembers = maxMembers; this.filter = filter; - this.members = members != null ? new ArrayList<>(members) : new ArrayList<>(); - this.memberMappings = memberMappings != null ? new ArrayList<>(memberMappings) : new ArrayList<>(); + this.members = members == null ? new ArrayList<>() : new ArrayList<>(members); + this.memberMappings = memberMappings == null ? new ArrayList<>() : new ArrayList<>(memberMappings); + } + + public StaticConsumerGroupConfig(JsonValue jv) { + this.maxMembers = JsonValueUtils.readInteger(jv, MAX_MEMBERS, 0); + this.filter = JsonValueUtils.readString(jv, FILTER); + this.members = JsonValueUtils.readStringList(jv, MEMBERS); + this.memberMappings = MemberMapping.listOfOrEmptyList(readValue(jv, MEMBER_MAPPINGS)); + } + + @Override + @NonNull + public String toJson() { + StringBuilder sb = beginJson(); + addField(sb, MAX_MEMBERS, maxMembers); + addField(sb, FILTER, filter); + addStrings(sb, MEMBERS, members); + addJsons(sb, MEMBER_MAPPINGS, memberMappings); + return endJson(sb).toString(); } public int getMaxMembers() { @@ -65,36 +102,33 @@ public void setFilter(String filter) { } public List getMembers() { - return members != null ? new ArrayList<>(members) : new ArrayList<>(); + return new ArrayList<>(members); } public void setMembers(List members) { - this.members = members != null ? new ArrayList<>(members) : new ArrayList<>(); + this.members = members == null ? new ArrayList<>() : new ArrayList<>(members); } public List getMemberMappings() { - return memberMappings != null ? new ArrayList<>(memberMappings) : new ArrayList<>(); + return new ArrayList<>(memberMappings); } public void setMemberMappings(List memberMappings) { - this.memberMappings = memberMappings != null ? new ArrayList<>(memberMappings) : new ArrayList<>(); + this.memberMappings = new ArrayList<>(memberMappings); } /** * Checks if the given member name is in the current membership. */ public boolean isInMembership(String name) { - if (memberMappings != null && !memberMappings.isEmpty()) { + if (!memberMappings.isEmpty()) { for (MemberMapping mapping : memberMappings) { if (mapping.getMember().equals(name)) { return true; } } } - if (members != null && !members.isEmpty()) { - return members.contains(name); - } - return false; + return members.contains(name); } /** @@ -109,8 +143,8 @@ public void validate() throws ConsumerGroupException { } // Validate that only one of members or member mappings is provided - boolean hasMembers = members != null && !members.isEmpty(); - boolean hasMemberMappings = memberMappings != null && !memberMappings.isEmpty(); + boolean hasMembers = !members.isEmpty(); + boolean hasMemberMappings = !memberMappings.isEmpty(); if (hasMembers && hasMemberMappings) { throw new ConsumerGroupException("either members or member mappings must be provided, not both"); @@ -118,7 +152,7 @@ public void validate() throws ConsumerGroupException { // Validate member mappings if (hasMemberMappings) { - if (memberMappings.size() < 1 || memberMappings.size() > maxMembers) { + if (memberMappings.size() > maxMembers) { throw new ConsumerGroupException("the number of member mappings must be between 1 and the max number of members"); } diff --git a/pcgroups/src/test/java/io/synadia/pcg/ElasticConsumerGroupTest.java b/pcgroups/src/test/java/io/synadia/pcg/ElasticConsumerGroupTest.java index e4a9be3..b6c2a59 100644 --- a/pcgroups/src/test/java/io/synadia/pcg/ElasticConsumerGroupTest.java +++ b/pcgroups/src/test/java/io/synadia/pcg/ElasticConsumerGroupTest.java @@ -13,15 +13,17 @@ package io.synadia.pcg; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; +import io.nats.NatsRunnerUtils; +import io.nats.client.support.JsonParseException; import io.synadia.pcg.exceptions.ConsumerGroupException; import org.junit.jupiter.api.Test; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.logging.Level; import static org.junit.jupiter.api.Assertions.*; @@ -31,7 +33,9 @@ */ class ElasticConsumerGroupTest { - private static final Gson GSON = new GsonBuilder().disableHtmlEscaping().create(); + static { + NatsRunnerUtils.setDefaultOutputLevel(Level.SEVERE); + } @Test void testConfigBasic() { @@ -43,7 +47,7 @@ void testConfigBasic() { assertEquals(4, config.getMaxMembers()); assertEquals("foo.*", config.getFilter()); assertArrayEquals(new int[]{1}, config.getPartitioningWildcards()); - assertEquals(1000, config.getMaxBufferedMsgs()); + assertEquals(1000, config.getMaxBufferedMessages()); assertEquals(10000, config.getMaxBufferedBytes()); assertEquals(2, config.getMembers().size()); assertTrue(config.getMemberMappings().isEmpty()); @@ -229,13 +233,13 @@ void testGetPartitioningTransformDestPartialWildcards() { } @Test - void testJsonSerializationWithMembers() { + void testJsonSerializationWithMembers() throws JsonParseException { ElasticConsumerGroupConfig config = new ElasticConsumerGroupConfig( 4, "foo.*", new int[]{1}, 1000, 10000, Arrays.asList("m1", "m2"), new ArrayList<>() ); - String json = GSON.toJson(config); + String json = config.toJson(); // Verify JSON structure matches Go format assertTrue(json.contains("\"max_members\":4")); @@ -246,17 +250,17 @@ void testJsonSerializationWithMembers() { assertTrue(json.contains("\"members\":[\"m1\",\"m2\"]")); // Deserialize and verify - ElasticConsumerGroupConfig deserialized = GSON.fromJson(json, ElasticConsumerGroupConfig.class); + ElasticConsumerGroupConfig deserialized = ElasticConsumerGroupConfig.instance(config.serialize()); assertEquals(config.getMaxMembers(), deserialized.getMaxMembers()); assertEquals(config.getFilter(), deserialized.getFilter()); assertArrayEquals(config.getPartitioningWildcards(), deserialized.getPartitioningWildcards()); - assertEquals(config.getMaxBufferedMsgs(), deserialized.getMaxBufferedMsgs()); + assertEquals(config.getMaxBufferedMessages(), deserialized.getMaxBufferedMessages()); assertEquals(config.getMaxBufferedBytes(), deserialized.getMaxBufferedBytes()); assertEquals(config.getMembers(), deserialized.getMembers()); } @Test - void testJsonSerializationWithMappings() { + void testJsonSerializationWithMappings() throws JsonParseException { List mappings = Arrays.asList( new MemberMapping("alice", new int[]{0, 1}), new MemberMapping("bob", new int[]{2, 3}) @@ -267,30 +271,30 @@ void testJsonSerializationWithMappings() { new ArrayList<>(), mappings ); - String json = GSON.toJson(config); + String json = config.toJson(); assertTrue(json.contains("\"member_mappings\"")); assertTrue(json.contains("\"member\":\"alice\"")); assertTrue(json.contains("\"partitions\":[0,1]")); // Deserialize and verify - ElasticConsumerGroupConfig deserialized = GSON.fromJson(json, ElasticConsumerGroupConfig.class); + ElasticConsumerGroupConfig deserialized = ElasticConsumerGroupConfig.instance(config.serialize()); assertEquals(2, deserialized.getMemberMappings().size()); assertEquals("alice", deserialized.getMemberMappings().get(0).getMember()); assertArrayEquals(new int[]{0, 1}, deserialized.getMemberMappings().get(0).getPartitions()); } @Test - void testJsonDeserializationFromGo() { + void testJsonDeserializationFromGo() throws JsonParseException { // This JSON is in the format produced by the Go implementation String goJson = "{\"max_members\":4,\"filter\":\"foo.*\",\"partitioning_wildcards\":[1],\"max_buffered_msg\":1000,\"max_buffered_bytes\":10000,\"members\":[\"m1\",\"m2\"]}"; - ElasticConsumerGroupConfig config = GSON.fromJson(goJson, ElasticConsumerGroupConfig.class); + ElasticConsumerGroupConfig config = ElasticConsumerGroupConfig.instance(goJson.getBytes(StandardCharsets.UTF_8)); assertEquals(4, config.getMaxMembers()); assertEquals("foo.*", config.getFilter()); assertArrayEquals(new int[]{1}, config.getPartitioningWildcards()); - assertEquals(1000, config.getMaxBufferedMsgs()); + assertEquals(1000, config.getMaxBufferedMessages()); assertEquals(10000, config.getMaxBufferedBytes()); assertEquals(2, config.getMembers().size()); assertEquals("m1", config.getMembers().get(0)); @@ -298,11 +302,11 @@ void testJsonDeserializationFromGo() { } @Test - void testJsonDeserializationWithMappingsFromGo() { + void testJsonDeserializationWithMappingsFromGo() throws JsonParseException { // This JSON is in the format produced by the Go implementation String goJson = "{\"max_members\":4,\"filter\":\"bar.*\",\"partitioning_wildcards\":[1],\"member_mappings\":[{\"member\":\"alice\",\"partitions\":[0,1]},{\"member\":\"bob\",\"partitions\":[2,3]}]}"; - ElasticConsumerGroupConfig config = GSON.fromJson(goJson, ElasticConsumerGroupConfig.class); + ElasticConsumerGroupConfig config = ElasticConsumerGroupConfig.instance(goJson.getBytes(StandardCharsets.UTF_8)); assertEquals(4, config.getMaxMembers()); assertEquals("bar.*", config.getFilter()); @@ -359,7 +363,7 @@ void testRevision() { assertEquals(42, config.getRevision()); // Verify revision is not serialized - String json = GSON.toJson(config); + String json = config.toJson(); assertFalse(json.contains("revision")); } diff --git a/pcgroups/src/test/java/io/synadia/pcg/IntegrationTest.java b/pcgroups/src/test/java/io/synadia/pcg/IntegrationTest.java index c48a3de..1faa142 100644 --- a/pcgroups/src/test/java/io/synadia/pcg/IntegrationTest.java +++ b/pcgroups/src/test/java/io/synadia/pcg/IntegrationTest.java @@ -13,9 +13,12 @@ package io.synadia.pcg; +import io.nats.NatsRunnerUtils; import io.nats.NatsServerRunner; import io.nats.client.Connection; +import io.nats.client.ErrorListener; import io.nats.client.Nats; +import io.nats.client.Options; import io.nats.client.api.ConsumerConfiguration; import io.nats.client.api.StorageType; import io.nats.client.api.StreamConfiguration; @@ -27,8 +30,10 @@ import java.util.Arrays; import java.util.Collections; import java.util.concurrent.atomic.AtomicInteger; +import java.util.logging.Level; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; /** * Integration tests for Static and Elastic consumer groups. @@ -36,6 +41,10 @@ */ class IntegrationTest { + static { + NatsRunnerUtils.setDefaultOutputLevel(Level.SEVERE); + } + /** * Ported from Go TestStatic. * Creates a stream with subject transform, publishes 10 messages, @@ -44,7 +53,8 @@ class IntegrationTest { @Test void testStatic() throws Exception { try (NatsServerRunner server = NatsServerRunner.builder().jetstream(true).build()) { - Connection nc = Nats.connect(server.getNatsLocalhostUri()); + Options options = Options.builder().server(server.getNatsLocalhostUri()).errorListener(new ErrorListener() {}).build(); + Connection nc = Nats.connect(options); String streamName = "test"; String cgName = "group"; @@ -123,7 +133,8 @@ void testStatic() throws Exception { @Test void testElastic() throws Exception { try (NatsServerRunner server = NatsServerRunner.builder().jetstream(true).build()) { - Connection nc = Nats.connect(server.getNatsLocalhostUri()); + Options options = Options.builder().server(server.getNatsLocalhostUri()).errorListener(new ErrorListener() {}).build(); + Connection nc = Nats.connect(options); String streamName = "test"; String cgName = "group"; diff --git a/pcgroups/src/test/java/io/synadia/pcg/PartitionUtilsTest.java b/pcgroups/src/test/java/io/synadia/pcg/PartitionUtilsTest.java index fa65bc3..c11673c 100644 --- a/pcgroups/src/test/java/io/synadia/pcg/PartitionUtilsTest.java +++ b/pcgroups/src/test/java/io/synadia/pcg/PartitionUtilsTest.java @@ -13,14 +13,17 @@ package io.synadia.pcg; +import io.nats.NatsRunnerUtils; import org.junit.jupiter.api.Test; import java.time.Duration; import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.logging.Level; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit tests for PartitionUtils. @@ -28,6 +31,10 @@ */ class PartitionUtilsTest { + static { + NatsRunnerUtils.setDefaultOutputLevel(Level.SEVERE); + } + @Test void testComposeKey() { assertEquals("mystream.mycg", PartitionUtils.composeKey("mystream", "mycg")); diff --git a/pcgroups/src/test/java/io/synadia/pcg/StaticConsumerGroupTest.java b/pcgroups/src/test/java/io/synadia/pcg/StaticConsumerGroupTest.java index dd8baeb..073d4ae 100644 --- a/pcgroups/src/test/java/io/synadia/pcg/StaticConsumerGroupTest.java +++ b/pcgroups/src/test/java/io/synadia/pcg/StaticConsumerGroupTest.java @@ -13,15 +13,17 @@ package io.synadia.pcg; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; +import io.nats.NatsRunnerUtils; +import io.nats.client.support.JsonParseException; import io.synadia.pcg.exceptions.ConsumerGroupException; import org.junit.jupiter.api.Test; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.logging.Level; import static org.junit.jupiter.api.Assertions.*; @@ -31,7 +33,9 @@ */ class StaticConsumerGroupTest { - private static final Gson GSON = new GsonBuilder().disableHtmlEscaping().create(); + static { + NatsRunnerUtils.setDefaultOutputLevel(Level.SEVERE); + } @Test void testConfigWithMembers() { @@ -185,14 +189,14 @@ void testValidationWithMembersSuccess() throws ConsumerGroupException { } @Test - void testJsonSerializationWithMembers() { + void testJsonSerializationWithMembers() throws JsonParseException { StaticConsumerGroupConfig config = new StaticConsumerGroupConfig( 4, "foo.>", Arrays.asList("m1", "m2"), new ArrayList<>() ); - String json = GSON.toJson(config); + String json = config.toJson(); // Verify JSON structure matches Go format assertTrue(json.contains("\"max_members\":4")); @@ -200,14 +204,14 @@ void testJsonSerializationWithMembers() { assertTrue(json.contains("\"members\":[\"m1\",\"m2\"]")); // Deserialize and verify - StaticConsumerGroupConfig deserialized = GSON.fromJson(json, StaticConsumerGroupConfig.class); + StaticConsumerGroupConfig deserialized = StaticConsumerGroupConfig.instance(json.getBytes(StandardCharsets.UTF_8)); assertEquals(config.getMaxMembers(), deserialized.getMaxMembers()); assertEquals(config.getFilter(), deserialized.getFilter()); assertEquals(config.getMembers(), deserialized.getMembers()); } @Test - void testJsonSerializationWithMappings() { + void testJsonSerializationWithMappings() throws JsonParseException { List mappings = Arrays.asList( new MemberMapping("alice", new int[]{0, 1}), new MemberMapping("bob", new int[]{2, 3}) @@ -217,7 +221,7 @@ void testJsonSerializationWithMappings() { 4, "foo.>", new ArrayList<>(), mappings ); - String json = GSON.toJson(config); + String json = config.toJson(); // Verify JSON structure matches Go format assertTrue(json.contains("\"max_members\":4")); @@ -226,7 +230,7 @@ void testJsonSerializationWithMappings() { assertTrue(json.contains("\"partitions\":[0,1]")); // Deserialize and verify - StaticConsumerGroupConfig deserialized = GSON.fromJson(json, StaticConsumerGroupConfig.class); + StaticConsumerGroupConfig deserialized = StaticConsumerGroupConfig.instance(json.getBytes(StandardCharsets.UTF_8)); assertEquals(config.getMaxMembers(), deserialized.getMaxMembers()); assertEquals(2, deserialized.getMemberMappings().size()); assertEquals("alice", deserialized.getMemberMappings().get(0).getMember()); @@ -234,11 +238,11 @@ void testJsonSerializationWithMappings() { } @Test - void testJsonDeserializationFromGo() { + void testJsonDeserializationFromGo() throws JsonParseException { // This JSON is in the format produced by the Go implementation String goJson = "{\"max_members\":4,\"filter\":\"foo.>\",\"members\":[\"m1\",\"m2\",\"m3\",\"m4\"]}"; - StaticConsumerGroupConfig config = GSON.fromJson(goJson, StaticConsumerGroupConfig.class); + StaticConsumerGroupConfig config = StaticConsumerGroupConfig.instance(goJson.getBytes(StandardCharsets.UTF_8)); assertEquals(4, config.getMaxMembers()); assertEquals("foo.>", config.getFilter()); @@ -247,11 +251,11 @@ void testJsonDeserializationFromGo() { } @Test - void testJsonDeserializationWithMappingsFromGo() { + void testJsonDeserializationWithMappingsFromGo() throws JsonParseException { // This JSON is in the format produced by the Go implementation String goJson = "{\"max_members\":4,\"filter\":\"bar.>\",\"member_mappings\":[{\"member\":\"alice\",\"partitions\":[0,1]},{\"member\":\"bob\",\"partitions\":[2,3]}]}"; - StaticConsumerGroupConfig config = GSON.fromJson(goJson, StaticConsumerGroupConfig.class); + StaticConsumerGroupConfig config = StaticConsumerGroupConfig.instance(goJson.getBytes(StandardCharsets.UTF_8)); assertEquals(4, config.getMaxMembers()); assertEquals("bar.>", config.getFilter()); From db7a4f4ee951185cf43d4be8f77873cf0ac90bab Mon Sep 17 00:00:00 2001 From: scottf Date: Mon, 23 Feb 2026 12:51:21 -0500 Subject: [PATCH 2/7] Remove GSON, use internal Json tool --- .github/workflows/pcg-main.yml | 2 +- .github/workflows/pcg-pr.yml | 2 +- .github/workflows/pcg-release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pcg-main.yml b/.github/workflows/pcg-main.yml index 9f30756..0292b94 100644 --- a/.github/workflows/pcg-main.yml +++ b/.github/workflows/pcg-main.yml @@ -9,7 +9,7 @@ on: jobs: build: - uses: ./.github/workflows/workflow-main.yml + uses: synadia-io/workflows/.github/workflows/java-standard-main.yml@main with: project-dir: pcgroups secrets: inherit diff --git a/.github/workflows/pcg-pr.yml b/.github/workflows/pcg-pr.yml index 0d2c8ff..8032301 100644 --- a/.github/workflows/pcg-pr.yml +++ b/.github/workflows/pcg-pr.yml @@ -8,7 +8,7 @@ on: jobs: build: - uses: ./.github/workflows/workflow-pr.yml + uses: synadia-io/workflows/.github/workflows/java-standard-pr.yml@main with: project-dir: pcgroups secrets: inherit diff --git a/.github/workflows/pcg-release.yml b/.github/workflows/pcg-release.yml index 2f64eda..97ea73f 100644 --- a/.github/workflows/pcg-release.yml +++ b/.github/workflows/pcg-release.yml @@ -6,7 +6,7 @@ on: jobs: build: - uses: ./.github/workflows/workflow-release.yml + uses: synadia-io/workflows/.github/workflows/java-standard-release.yml@main with: project-dir: pcgroups secrets: inherit From bac90d049e9f34bafa86781fbe167899c008362b Mon Sep 17 00:00:00 2001 From: scottf Date: Mon, 23 Feb 2026 12:54:27 -0500 Subject: [PATCH 3/7] Readme, License and Notice --- pcgroups/LICENSE | 201 +++++++++++++++++++++++++++++++++++++++++++++ pcgroups/NOTICE | 5 ++ pcgroups/README.md | 11 +-- 3 files changed, 212 insertions(+), 5 deletions(-) create mode 100644 pcgroups/LICENSE create mode 100644 pcgroups/NOTICE diff --git a/pcgroups/LICENSE b/pcgroups/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/pcgroups/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/pcgroups/NOTICE b/pcgroups/NOTICE new file mode 100644 index 0000000..ff3c8b4 --- /dev/null +++ b/pcgroups/NOTICE @@ -0,0 +1,5 @@ +Orbit Java +Copyright (c) 2024-2025 Synadia Communications Inc. All Rights Reserved. + +This product includes software developed at +Synadia Communications Inc. \ No newline at end of file diff --git a/pcgroups/README.md b/pcgroups/README.md index 8eba332..331021d 100644 --- a/pcgroups/README.md +++ b/pcgroups/README.md @@ -1,9 +1,6 @@ -# Partitioned Consumer Groups - -[License-Url]: https://www.apache.org/licenses/LICENSE-2.0 -[License-Image]: https://img.shields.io/badge/License-Apache2-blue.svg +Orbit -[![License][License-Image]][License-Url] +# Partitioned Consumer Groups Initial implementation of a client-side partitioned consumer group feature for NATS streams leveraging some of the new features introduced in `nats-server` version 2.11. @@ -101,3 +98,7 @@ You can look at the `cg` CLI tool's source code for examples of how to create an # Requirements Partitioned consumer groups require NATS server version 2.11 or above. + +--- +Copyright (c) 2025 Synadia Communications Inc. All Rights Reserved. +See [LICENSE](LICENSE) and [NOTICE](NOTICE) file for details. From ef4b3cc5f5f229d87e066b28cfa31089ef793ef1 Mon Sep 17 00:00:00 2001 From: scottf Date: Mon, 23 Feb 2026 13:14:36 -0500 Subject: [PATCH 4/7] Address review --- pcgroups/NOTICE | 2 +- .../io/synadia/pcg/ElasticConsumerGroupConfig.java | 14 +++++++------- .../main/java/io/synadia/pcg/MemberMapping.java | 2 +- .../java/io/synadia/pcg/StaticConsumerGroup.java | 1 - .../io/synadia/pcg/StaticConsumerGroupConfig.java | 2 +- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/pcgroups/NOTICE b/pcgroups/NOTICE index ff3c8b4..bd2b8ad 100644 --- a/pcgroups/NOTICE +++ b/pcgroups/NOTICE @@ -2,4 +2,4 @@ Orbit Java Copyright (c) 2024-2025 Synadia Communications Inc. All Rights Reserved. This product includes software developed at -Synadia Communications Inc. \ No newline at end of file +Synadia Communications Inc. diff --git a/pcgroups/src/main/java/io/synadia/pcg/ElasticConsumerGroupConfig.java b/pcgroups/src/main/java/io/synadia/pcg/ElasticConsumerGroupConfig.java index 579001f..8c66dc2 100644 --- a/pcgroups/src/main/java/io/synadia/pcg/ElasticConsumerGroupConfig.java +++ b/pcgroups/src/main/java/io/synadia/pcg/ElasticConsumerGroupConfig.java @@ -288,17 +288,17 @@ public String getPartitioningTransformDest() { } @Override + @NonNull public String toJson() { StringBuilder sb = beginJson(); addField(sb, MAX_MEMBERS, maxMembers); addField(sb, FILTER, filter); - if (partitioningWildcards != null && partitioningWildcards.length > 0) { - sb.append("\"").append(PARTITIONING_WILDCARDS).append("\":["); - for (int i = 0; i < partitioningWildcards.length; i++) { - if (i > 0) sb.append(","); - sb.append(partitioningWildcards[i]); + if (partitioningWildcards.length > 0) { + List integers = new ArrayList<>(partitioningWildcards.length); + for (int i : partitioningWildcards) { + integers.add(i); } - sb.append("],"); + _addList(sb, PARTITIONING_WILDCARDS, integers, StringBuilder::append); } addField(sb, MAX_BUFFERED_MSG, maxBufferedMessages); addField(sb, MAX_BUFFERED_BYTES, maxBufferedBytes); @@ -334,7 +334,7 @@ public String toString() { "maxMembers=" + maxMembers + ", filter='" + filter + '\'' + ", partitioningWildcards=" + Arrays.toString(partitioningWildcards) + - ", maxBufferedMsgs=" + maxBufferedMessages + + ", maxBufferedMessages=" + maxBufferedMessages + ", maxBufferedBytes=" + maxBufferedBytes + ", members=" + members + ", memberMappings=" + memberMappings + diff --git a/pcgroups/src/main/java/io/synadia/pcg/MemberMapping.java b/pcgroups/src/main/java/io/synadia/pcg/MemberMapping.java index c81d3a4..e3b6652 100644 --- a/pcgroups/src/main/java/io/synadia/pcg/MemberMapping.java +++ b/pcgroups/src/main/java/io/synadia/pcg/MemberMapping.java @@ -65,7 +65,7 @@ public String toJson() { StringBuilder sb = beginJson(); addField(sb, MEMBER, member); if (partitions.length > 0) { - List integers = new ArrayList(partitions.length); + List integers = new ArrayList<>(partitions.length); for (int i : partitions) { integers.add(i); } diff --git a/pcgroups/src/main/java/io/synadia/pcg/StaticConsumerGroup.java b/pcgroups/src/main/java/io/synadia/pcg/StaticConsumerGroup.java index e9583b7..099e7b5 100644 --- a/pcgroups/src/main/java/io/synadia/pcg/StaticConsumerGroup.java +++ b/pcgroups/src/main/java/io/synadia/pcg/StaticConsumerGroup.java @@ -366,7 +366,6 @@ private void joinMemberConsumer() throws IOException, JetStreamApiException, Int // Create the durable consumer explicitly (matching Go's js.CreateConsumer) JetStreamManagement jsm = nc.jetStreamManagement(); -// System.out.printf("Creating consumer %s with filters %s and priority group %s%n\n", consumerName, filters, PRIORITY_GROUP_NAME); jsm.createConsumer(streamName, cc); // Get consumer context and start consuming diff --git a/pcgroups/src/main/java/io/synadia/pcg/StaticConsumerGroupConfig.java b/pcgroups/src/main/java/io/synadia/pcg/StaticConsumerGroupConfig.java index dc0c885..da46472 100644 --- a/pcgroups/src/main/java/io/synadia/pcg/StaticConsumerGroupConfig.java +++ b/pcgroups/src/main/java/io/synadia/pcg/StaticConsumerGroupConfig.java @@ -114,7 +114,7 @@ public List getMemberMappings() { } public void setMemberMappings(List memberMappings) { - this.memberMappings = new ArrayList<>(memberMappings); + this.memberMappings = memberMappings == null ? new ArrayList<>() : new ArrayList<>(memberMappings); } /** From cde892a0a8c07d133aa194e5838a9849ded420a4 Mon Sep 17 00:00:00 2001 From: scottf Date: Mon, 23 Feb 2026 13:39:55 -0500 Subject: [PATCH 5/7] No msgs except in cli --- .../java/io/synadia/pcg/ElasticConsumerGroup.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pcgroups/src/main/java/io/synadia/pcg/ElasticConsumerGroup.java b/pcgroups/src/main/java/io/synadia/pcg/ElasticConsumerGroup.java index 09d5042..a798323 100644 --- a/pcgroups/src/main/java/io/synadia/pcg/ElasticConsumerGroup.java +++ b/pcgroups/src/main/java/io/synadia/pcg/ElasticConsumerGroup.java @@ -52,17 +52,17 @@ private ElasticConsumerGroup() { * @param maxMembers Maximum number of members (partitions) * @param filter Subject filter with wildcards * @param partitioningWildcards Indexes of wildcards to use for partitioning - * @param maxBufferedMsgs Max messages in work queue (0 for unlimited) + * @param maxBufferedMessages Max messages in work queue (0 for unlimited) * @param maxBufferedBytes Max bytes in work queue (0 for unlimited) * @return The created configuration */ public static ElasticConsumerGroupConfig create(Connection nc, String streamName, String consumerGroupName, int maxMembers, String filter, int[] partitioningWildcards, - long maxBufferedMsgs, long maxBufferedBytes) + long maxBufferedMessages, long maxBufferedBytes) throws ConsumerGroupException, IOException, JetStreamApiException, InterruptedException { ElasticConsumerGroupConfig config = new ElasticConsumerGroupConfig( - maxMembers, filter, partitioningWildcards, maxBufferedMsgs, maxBufferedBytes, + maxMembers, filter, partitioningWildcards, maxBufferedMessages, maxBufferedBytes, new ArrayList<>(), new ArrayList<>()); config.validate(); @@ -96,7 +96,7 @@ public static ElasticConsumerGroupConfig create(Connection nc, String streamName if (existingConfig != null) { if (existingConfig.getMaxMembers() != maxMembers || !Objects.equals(existingConfig.getFilter(), filter) || - existingConfig.getMaxBufferedMessages() != maxBufferedMsgs || + existingConfig.getMaxBufferedMessages() != maxBufferedMessages || existingConfig.getMaxBufferedBytes() != maxBufferedBytes || !Arrays.equals(existingConfig.getPartitioningWildcards(), partitioningWildcards)) { throw new ConsumerGroupException( @@ -121,8 +121,8 @@ public static ElasticConsumerGroupConfig create(Connection nc, String streamName .discardPolicy(DiscardPolicy.New) .allowDirect(true); - if (maxBufferedMsgs > 0) { - scBuilder.maxMessages(maxBufferedMsgs); + if (maxBufferedMessages > 0) { + scBuilder.maxMessages(maxBufferedMessages); } if (maxBufferedBytes > 0) { scBuilder.maxBytes(maxBufferedBytes); From c5d08284c1cbc3f1bf1849e32e057a051b5f0ba8 Mon Sep 17 00:00:00 2001 From: scottf Date: Mon, 23 Feb 2026 13:44:19 -0500 Subject: [PATCH 6/7] javadoc file --- pcgroups/src/main/javadoc/images/favicon.ico | Bin 0 -> 1150 bytes pcgroups/src/main/javadoc/images/large-logo.png | Bin 0 -> 6533 bytes .../src/main/javadoc/images/synadia-logo.png | Bin 0 -> 19014 bytes pcgroups/src/main/javadoc/overview.html | 13 +++++++++++++ 4 files changed, 13 insertions(+) create mode 100644 pcgroups/src/main/javadoc/images/favicon.ico create mode 100644 pcgroups/src/main/javadoc/images/large-logo.png create mode 100644 pcgroups/src/main/javadoc/images/synadia-logo.png create mode 100644 pcgroups/src/main/javadoc/overview.html diff --git a/pcgroups/src/main/javadoc/images/favicon.ico b/pcgroups/src/main/javadoc/images/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..9464855b4b53e64a0b464a138e21734ece9a878b GIT binary patch literal 1150 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 + + + + +NATS JetStream Partitioned Consumer Groups Library for Java +

Synadia Logo

+ + + + From 67e692f05454eba10b1a3dfad631c75717e80a84 Mon Sep 17 00:00:00 2001 From: scottf Date: Tue, 24 Feb 2026 13:26:50 -0500 Subject: [PATCH 7/7] split pcgroups cli out into separate project --- .github/workflows/pcgcli-main.yml | 46 ++++ .github/workflows/pcgcli-pr.yml | 45 ++++ pcgroups-cli/build.gradle | 71 +++++ pcgroups-cli/gradle/libs.versions.toml | 12 + .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43764 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + pcgroups-cli/gradlew | 251 ++++++++++++++++++ pcgroups-cli/gradlew.bat | 94 +++++++ {pcgroups/cli => pcgroups-cli}/pom.xml | 18 +- pcgroups-cli/settings.gradle | 13 + .../java/io/synadia/pcg/cli/CgCommand.java | 0 .../java/io/synadia/pcg/cli/CliUtils.java | 0 .../io/synadia/pcg/cli/DurationConverter.java | 0 .../io/synadia/pcg/cli/ElasticCommands.java | 0 .../io/synadia/pcg/cli/PromptHandler.java | 0 .../io/synadia/pcg/cli/StaticCommands.java | 0 pcgroups/build.gradle | 18 +- 17 files changed, 546 insertions(+), 29 deletions(-) create mode 100644 .github/workflows/pcgcli-main.yml create mode 100644 .github/workflows/pcgcli-pr.yml create mode 100644 pcgroups-cli/build.gradle create mode 100644 pcgroups-cli/gradle/libs.versions.toml create mode 100644 pcgroups-cli/gradle/wrapper/gradle-wrapper.jar create mode 100644 pcgroups-cli/gradle/wrapper/gradle-wrapper.properties create mode 100644 pcgroups-cli/gradlew create mode 100644 pcgroups-cli/gradlew.bat rename {pcgroups/cli => pcgroups-cli}/pom.xml (90%) create mode 100644 pcgroups-cli/settings.gradle rename {pcgroups/cli => pcgroups-cli}/src/main/java/io/synadia/pcg/cli/CgCommand.java (100%) rename {pcgroups/cli => pcgroups-cli}/src/main/java/io/synadia/pcg/cli/CliUtils.java (100%) rename {pcgroups/cli => pcgroups-cli}/src/main/java/io/synadia/pcg/cli/DurationConverter.java (100%) rename {pcgroups/cli => pcgroups-cli}/src/main/java/io/synadia/pcg/cli/ElasticCommands.java (100%) rename {pcgroups/cli => pcgroups-cli}/src/main/java/io/synadia/pcg/cli/PromptHandler.java (100%) rename {pcgroups/cli => pcgroups-cli}/src/main/java/io/synadia/pcg/cli/StaticCommands.java (100%) diff --git a/.github/workflows/pcgcli-main.yml b/.github/workflows/pcgcli-main.yml new file mode 100644 index 0000000..dfb6d30 --- /dev/null +++ b/.github/workflows/pcgcli-main.yml @@ -0,0 +1,46 @@ +name: Partitioned Consumer Groups Main Snapshot + +on: + push: + branches: + - main + paths: + - 'pcgroups-cli/**' + +jobs: + build: + runs-on: ubuntu-latest + defaults: + run: + working-directory: ./pcgroups-cli + steps: + - name: Set up JDK + uses: actions/setup-java@v5 + with: + java-version: '21' + distribution: 'temurin' + - name: Check out code + uses: actions/checkout@v4 + - name: Build with Gradle + run: | + chmod +x gradlew && ./gradlew clean test uberJar + - name: Build with Maven + run: mvn clean package + - name: Validate Gradle Uber was created + run: | + FILE_PATH="build/libs/cg.jar" + if [ -f "$FILE_PATH" ]; then + echo "Validation successful: $FILE_PATH was created." + else + echo "Validation failed: $FILE_PATH was not found." + exit 1 # Fails the workflow step + fi + - name: Validate Maven Uber was created + run: | + FILE_PATH="target/cg.jar" + if [ -f "$FILE_PATH" ]; then + echo "Validation successful: $FILE_PATH was created." + else + echo "Validation failed: $FILE_PATH was not found." + exit 1 # Fails the workflow step + fi diff --git a/.github/workflows/pcgcli-pr.yml b/.github/workflows/pcgcli-pr.yml new file mode 100644 index 0000000..d5d243a --- /dev/null +++ b/.github/workflows/pcgcli-pr.yml @@ -0,0 +1,45 @@ +name: Partitioned Consumer Groups Pull Request + +on: + pull_request: + types: [opened, synchronize, reopened] + paths: + - 'pcgroups-cli/**' + +jobs: + build: + runs-on: ubuntu-latest + defaults: + run: + working-directory: ./pcgroups-cli + steps: + - name: Set up JDK + uses: actions/setup-java@v5 + with: + java-version: '21' + distribution: 'temurin' + - name: Check out code + uses: actions/checkout@v4 + - name: Build with Gradle + run: | + chmod +x gradlew && ./gradlew clean test uberJar + - name: Build with Maven + run: mvn clean package + - name: Validate Gradle Uber was created + run: | + FILE_PATH="build/libs/cg.jar" + if [ -f "$FILE_PATH" ]; then + echo "Validation successful: $FILE_PATH was created." + else + echo "Validation failed: $FILE_PATH was not found." + exit 1 # Fails the workflow step + fi + - name: Validate Maven Uber was created + run: | + FILE_PATH="target/cg.jar" + if [ -f "$FILE_PATH" ]; then + echo "Validation successful: $FILE_PATH was created." + else + echo "Validation failed: $FILE_PATH was not found." + exit 1 # Fails the workflow step + fi diff --git a/pcgroups-cli/build.gradle b/pcgroups-cli/build.gradle new file mode 100644 index 0000000..93a4161 --- /dev/null +++ b/pcgroups-cli/build.gradle @@ -0,0 +1,71 @@ +plugins { + id("java") + id("java-library") + id("maven-publish") + id("jacoco") + id("biz.aQute.bnd.builder") version "7.1.0" + id("org.gradle.test-retry") version "1.6.4" + id("io.github.gradle-nexus.publish-plugin") version "2.0.0" + id("signing") +} + +group = 'io.synadia' +version = "0.1.0" +def originalUber = 'pcg-cli-' + version + '-uber.jar' +System.out.println(originalUber) + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 +} + +repositories { + mavenCentral() + mavenLocal() + maven { url="https://repo1.maven.org/maven2/" } + maven { url="https://central.sonatype.com/repository/maven-snapshots" } +} + +dependencies { + implementation 'io.nats:jnats:2.25.1' + implementation 'org.jspecify:jspecify:1.0.0' + implementation 'io.synadia:pcgroups:0.1.0-SNAPSHOT' + implementation 'info.picocli:picocli:4.7.5' + + testImplementation 'io.nats:jnats-server-runner:3.1.0' + testImplementation 'org.junit.jupiter:junit-jupiter:5.14.1' + testImplementation 'org.junit.platform:junit-platform-launcher:1.14.3' +} + +tasks.register('copyToLib', Copy) { + into "build/libs" + from configurations.runtimeClasspath +} + +tasks.register('packageUberJar', Jar) { + archiveClassifier = 'uber' + + from sourceSets.main.output + + dependsOn configurations.runtimeClasspath + from { + configurations.runtimeClasspath.findAll { it.name.endsWith('jar') }.collect { zipTree(it) } + } + + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + dependsOn copyToLib +} + +tasks.register('uberJar', Copy) { + dependsOn packageUberJar + + // we want the file to be called cg.jar + from ('build/libs') + include originalUber + destinationDir file('build/libs/') + rename originalUber, "cg.jar" + + // this task actually does a copy, so this part removes the original + doLast { + delete('build/libs/' + originalUber) + } +} diff --git a/pcgroups-cli/gradle/libs.versions.toml b/pcgroups-cli/gradle/libs.versions.toml new file mode 100644 index 0000000..2cfe86a --- /dev/null +++ b/pcgroups-cli/gradle/libs.versions.toml @@ -0,0 +1,12 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format + +[versions] +commons-math3 = "3.6.1" +guava = "33.4.5-jre" +junit-jupiter = "5.12.1" + +[libraries] +commons-math3 = { module = "org.apache.commons:commons-math3", version.ref = "commons-math3" } +guava = { module = "com.google.guava:guava", version.ref = "guava" } +junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" } diff --git a/pcgroups-cli/gradle/wrapper/gradle-wrapper.jar b/pcgroups-cli/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..1b33c55baabb587c669f562ae36f953de2481846 GIT binary patch literal 43764 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/pcgroups-cli/gradlew.bat b/pcgroups-cli/gradlew.bat new file mode 100644 index 0000000..db3a6ac --- /dev/null +++ b/pcgroups-cli/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/pcgroups/cli/pom.xml b/pcgroups-cli/pom.xml similarity index 90% rename from pcgroups/cli/pom.xml rename to pcgroups-cli/pom.xml index f31a38f..9091eaf 100644 --- a/pcgroups/cli/pom.xml +++ b/pcgroups-cli/pom.xml @@ -19,7 +19,7 @@ 4.0.0 io.synadia - cg-cli + pcg-cli 0.1.0 jar @@ -27,20 +27,19 @@ CLI tool for managing NATS JetStream Partitioned Consumer Groups - 11 - 11 + 1.8 UTF-8 + 0.1.0-SNAPSHOT 4.7.5 2.25.1 - 2.11.0 io.synadia - partitioned-consumer-groups - 0.1.0 + pcgroups + ${pcgroups.version} @@ -50,13 +49,6 @@ ${jnats.version} - - - com.google.code.gson - gson - ${gson.version} - - info.picocli diff --git a/pcgroups-cli/settings.gradle b/pcgroups-cli/settings.gradle new file mode 100644 index 0000000..ce87931 --- /dev/null +++ b/pcgroups-cli/settings.gradle @@ -0,0 +1,13 @@ +pluginManagement { + repositories { + gradlePluginPortal() + mavenCentral() + maven { url="https://repo1.maven.org/maven2/" } + maven { url="https://central.sonatype.com/repository/maven-snapshots/" } + maven { url="https://plugins.gradle.org/m2/" } + } + plugins { + id("biz.aQute.bnd.builder") version "7.1.0" + } +} +rootProject.name = 'pcg-cli' diff --git a/pcgroups/cli/src/main/java/io/synadia/pcg/cli/CgCommand.java b/pcgroups-cli/src/main/java/io/synadia/pcg/cli/CgCommand.java similarity index 100% rename from pcgroups/cli/src/main/java/io/synadia/pcg/cli/CgCommand.java rename to pcgroups-cli/src/main/java/io/synadia/pcg/cli/CgCommand.java diff --git a/pcgroups/cli/src/main/java/io/synadia/pcg/cli/CliUtils.java b/pcgroups-cli/src/main/java/io/synadia/pcg/cli/CliUtils.java similarity index 100% rename from pcgroups/cli/src/main/java/io/synadia/pcg/cli/CliUtils.java rename to pcgroups-cli/src/main/java/io/synadia/pcg/cli/CliUtils.java diff --git a/pcgroups/cli/src/main/java/io/synadia/pcg/cli/DurationConverter.java b/pcgroups-cli/src/main/java/io/synadia/pcg/cli/DurationConverter.java similarity index 100% rename from pcgroups/cli/src/main/java/io/synadia/pcg/cli/DurationConverter.java rename to pcgroups-cli/src/main/java/io/synadia/pcg/cli/DurationConverter.java diff --git a/pcgroups/cli/src/main/java/io/synadia/pcg/cli/ElasticCommands.java b/pcgroups-cli/src/main/java/io/synadia/pcg/cli/ElasticCommands.java similarity index 100% rename from pcgroups/cli/src/main/java/io/synadia/pcg/cli/ElasticCommands.java rename to pcgroups-cli/src/main/java/io/synadia/pcg/cli/ElasticCommands.java diff --git a/pcgroups/cli/src/main/java/io/synadia/pcg/cli/PromptHandler.java b/pcgroups-cli/src/main/java/io/synadia/pcg/cli/PromptHandler.java similarity index 100% rename from pcgroups/cli/src/main/java/io/synadia/pcg/cli/PromptHandler.java rename to pcgroups-cli/src/main/java/io/synadia/pcg/cli/PromptHandler.java diff --git a/pcgroups/cli/src/main/java/io/synadia/pcg/cli/StaticCommands.java b/pcgroups-cli/src/main/java/io/synadia/pcg/cli/StaticCommands.java similarity index 100% rename from pcgroups/cli/src/main/java/io/synadia/pcg/cli/StaticCommands.java rename to pcgroups-cli/src/main/java/io/synadia/pcg/cli/StaticCommands.java diff --git a/pcgroups/build.gradle b/pcgroups/build.gradle index c84dda9..75f3332 100644 --- a/pcgroups/build.gradle +++ b/pcgroups/build.gradle @@ -35,28 +35,14 @@ repositories { } dependencies { - implementation 'io.nats:jnats:2.25.1' - implementation 'org.jspecify:jspecify:1.0.0' + api 'io.nats:jnats:2.25.1' + api 'org.jspecify:jspecify:1.0.0' testImplementation 'io.nats:jnats-server-runner:3.1.0' - testImplementation 'org.junit.jupiter:junit-jupiter:5.14.1' testImplementation 'org.junit.platform:junit-platform-launcher:1.14.3' } -sourceSets { - main { - java { - srcDirs = ['src/main/java'] - } - } - test { - java { - srcDirs = ['src/test/java'] - } - } -} - tasks.register('bundle', Bundle) { from sourceSets.main.output }