If you instead have the full backing stream configuration JSON (for example as returned + * by the server), use {@link #instanceViaStreamConfig(String)} — at your own risk, since it + * bypasses the Key Value validation and field derivation performed here. + * + * @param json the json representing the Key Value builder configuration + * @return KeyValueConfiguration for the given json + * @throws JsonParseException if there is a problem parsing the json + * @see #instanceViaStreamConfig(String) + */ + public static KeyValueConfiguration instance(String json) throws JsonParseException { + JsonValue v = JsonParser.parse(json); + // read each field that has a builder setter, then build() so KV validation/derivation runs. + return new Builder() + .name(readString(v, NAME)) + .description(readString(v, DESCRIPTION)) + .maxHistoryPerKey(readInteger(v, MAX_HISTORY_PER_KEY, 1)) + .maxBucketSize(readLong(v, MAX_BUCKET_SIZE, -1)) + .maximumValueSize(readInteger(v, MAX_VALUE_SIZE, -1)) + .ttl(readNanos(v, TTL)) + .storageType(StorageType.get(readString(v, STORAGE))) + .replicas(readInteger(v, REPLICAS, 1)) + .placement(Placement.optionalInstance(readValue(v, PLACEMENT))) + .republish(Republish.optionalInstance(readValue(v, REPUBLISH))) + .mirror(Mirror.optionalInstance(readValue(v, MIRROR))) + .sources(Source.optionalListOf(readValue(v, SOURCES))) + .compression(readBoolean(v, COMPRESSION)) + .metadata(readStringStringMap(v, METADATA)) + .limitMarker(readNanos(v, LIMIT_MARKER_TTL)) + .build(); + } + + /** + * Returns a KeyValueConfiguration built from the full backing stream configuration JSON, + * for example the JSON of the bucket's backing stream as returned by the server. Here + * {@code name} is the stream name (such as {@code KV_bucketName}) and the field names are the + * stream's (for example {@code max_msgs_per_subject}). Use at your own risk: this trusts the + * supplied stream and bypasses the Key Value validation and field derivation that + * {@link #instance(String)} performs. + * + * @param json the json representing the backing stream configuration + * @return KeyValueConfiguration for the given backing stream json + * @throws JsonParseException if there is a problem parsing the json + * @see #instance(String) + */ + public static KeyValueConfiguration instanceViaStreamConfig(String json) throws JsonParseException { + return new KeyValueConfiguration(StreamConfiguration.instance(json)); + } + /** * Creates a builder for the Key Value Configuration. * @return a KeyValueConfiguration Builder diff --git a/src/main/java/io/nats/client/api/ObjectStoreConfiguration.java b/src/main/java/io/nats/client/api/ObjectStoreConfiguration.java index b9e67c285..5bd4e153b 100644 --- a/src/main/java/io/nats/client/api/ObjectStoreConfiguration.java +++ b/src/main/java/io/nats/client/api/ObjectStoreConfiguration.java @@ -12,11 +12,16 @@ // limitations under the License. package io.nats.client.api; +import io.nats.client.support.JsonParseException; +import io.nats.client.support.JsonParser; +import io.nats.client.support.JsonValue; import io.nats.client.support.NatsObjectStoreUtil; import java.time.Duration; import java.util.Map; +import static io.nats.client.support.ApiConstants.*; +import static io.nats.client.support.JsonValueUtils.*; import static io.nats.client.support.NatsObjectStoreUtil.*; import static io.nats.client.support.Validator.required; @@ -41,6 +46,54 @@ public boolean isSealed() { return sc.getSealed(); } + /** + * Returns an ObjectStoreConfiguration deserialized from a JSON representation of an Object Store + * builder configuration, i.e. the values you would supply to the {@link Builder}. + * This is not the backing stream configuration, and it is not the JSON emitted + * by {@link #toJson()}. Accordingly, {@code name} is the bucket (simple) name, not the stream + * name, and the field names use the Object Store domain. + * + *
If you instead have the full backing stream configuration JSON (for example as returned
+ * by the server), use {@link #instanceViaStreamConfig(String)} — at your own risk, since it
+ * bypasses the Object Store validation and field derivation performed here.
+ *
+ * @param json the json representing the Object Store builder configuration
+ * @return ObjectStoreConfiguration for the given json
+ * @throws JsonParseException if there is a problem parsing the json
+ * @see #instanceViaStreamConfig(String)
+ */
+ public static ObjectStoreConfiguration instance(String json) throws JsonParseException {
+ JsonValue v = JsonParser.parse(json);
+ // read each field that has a builder setter, then build() so OS validation/derivation runs.
+ return new Builder()
+ .name(readString(v, NAME))
+ .description(readString(v, DESCRIPTION))
+ .maxBucketSize(readLong(v, MAX_BUCKET_SIZE, -1))
+ .ttl(readNanos(v, TTL))
+ .storageType(StorageType.get(readString(v, STORAGE)))
+ .replicas(readInteger(v, REPLICAS, 1))
+ .placement(Placement.optionalInstance(readValue(v, PLACEMENT)))
+ .compression(readBoolean(v, COMPRESSION))
+ .metadata(readStringStringMap(v, METADATA))
+ .build();
+ }
+
+ /**
+ * Returns an ObjectStoreConfiguration built from the full backing stream configuration JSON,
+ * for example the JSON of the bucket's backing stream as returned by the server. Here
+ * {@code name} is the stream name (such as {@code OBJ_bucketName}) and the field names are the
+ * stream's. Use at your own risk: this trusts the supplied stream and bypasses the Object Store
+ * validation and field derivation that {@link #instance(String)} performs.
+ *
+ * @param json the json representing the backing stream configuration
+ * @return ObjectStoreConfiguration for the given backing stream json
+ * @throws JsonParseException if there is a problem parsing the json
+ * @see #instance(String)
+ */
+ public static ObjectStoreConfiguration instanceViaStreamConfig(String json) throws JsonParseException {
+ return new ObjectStoreConfiguration(StreamConfiguration.instance(json));
+ }
+
/**
* Creates a builder for the Object Store Configuration.
* @return an ObjectStoreConfiguration Builder
diff --git a/src/main/java/io/nats/client/support/ApiConstants.java b/src/main/java/io/nats/client/support/ApiConstants.java
index 85f36c020..aecd1c8bc 100644
--- a/src/main/java/io/nats/client/support/ApiConstants.java
+++ b/src/main/java/io/nats/client/support/ApiConstants.java
@@ -110,18 +110,21 @@ public interface ApiConstants {
/** leader_since */ String LEADER_SINCE = "leader_since";
/** level */ String LEVEL = "level";
/** limit */ String LIMIT = "limit";
+ /** limit_marker_ttl */ String LIMIT_MARKER_TTL = "limit_marker_ttl";
/** limits */ String LIMITS = "limits";
/** link */ String LINK = "link";
/** lost */ String LOST = "lost";
/** max_ack_pending */ String MAX_ACK_PENDING = "max_ack_pending";
/** max_age */ String MAX_AGE = "max_age";
/** max_batch */ String MAX_BATCH = "max_batch";
+ /** max_bucket_size */ String MAX_BUCKET_SIZE = "max_bucket_size";
/** max_bytes */ String MAX_BYTES = "max_bytes";
/** max_bytes_required */ String MAX_BYTES_REQUIRED = "max_bytes_required";
/** max_consumers */ String MAX_CONSUMERS = "max_consumers";
/** max_chunk_size */ String MAX_CHUNK_SIZE = "max_chunk_size";
/** max_deliver */ String MAX_DELIVER = "max_deliver";
/** max_expires */ String MAX_EXPIRES = "max_expires";
+ /** max_history_per_key */ String MAX_HISTORY_PER_KEY = "max_history_per_key";
/** max_memory */ String MAX_MEMORY = "max_memory";
/** max_msg_size */ String MAX_MSG_SIZE = "max_msg_size";
/** max_msgs */ String MAX_MSGS = "max_msgs";
@@ -129,6 +132,7 @@ public interface ApiConstants {
/** max_payload */ String MAX_PAYLOAD = "max_payload";
/** max_storage */ String MAX_STORAGE = "max_storage";
/** max_streams */ String MAX_STREAMS = "max_streams";
+ /** max_value_size */ String MAX_VALUE_SIZE = "max_value_size";
/** max_waiting */ String MAX_WAITING = "max_waiting"; // this is correct! the meaning name is different than the field name
/** min_pending */ String MIN_PENDING = "min_pending";
/** min_ack_pending */ String MIN_ACK_PENDING = "min_ack_pending";
@@ -231,6 +235,7 @@ public interface ApiConstants {
/** tls_available */ String TLS_AVAILABLE = "tls_available";
/** total */ String TOTAL = "total";
/** traffic_account */ String TRAFFIC_ACCOUNT = "traffic_account";
+ /** ttl */ String TTL = "ttl";
/** type */ String TYPE = "type";
/** up_to_seq */ String UP_TO_SEQ = "up_to_seq";
/** up_to_time */ String UP_TO_TIME = "up_to_time";
diff --git a/src/test/java/io/nats/client/api/KeyValueConfigurationTests.java b/src/test/java/io/nats/client/api/KeyValueConfigurationTests.java
index 0abe4cda6..0b393663e 100644
--- a/src/test/java/io/nats/client/api/KeyValueConfigurationTests.java
+++ b/src/test/java/io/nats/client/api/KeyValueConfigurationTests.java
@@ -13,21 +13,26 @@
package io.nats.client.api;
import io.nats.client.impl.JetStreamTestBase;
-import io.nats.client.support.JsonParser;
-import io.nats.client.support.JsonValue;
+import io.nats.client.support.JsonParseException;
import org.junit.jupiter.api.Test;
import java.time.Duration;
+import java.util.HashMap;
+import java.util.Map;
import static io.nats.client.support.NatsConstants.EMPTY;
+import static io.nats.client.utils.ResourceUtils.dataAsString;
import static org.junit.jupiter.api.Assertions.*;
public class KeyValueConfigurationTests extends JetStreamTestBase {
@Test
- public void testConstruction() {
+ public void testConstruction() throws JsonParseException {
Placement p = Placement.builder().cluster("cluster").tags("a", "b").build();
Republish r = Republish.builder().source("src").destination("dest").headersOnly(true).build();
+ Map