Skip to content

Commit d695873

Browse files
authored
Use GREATER_THAN constant (#1174)
1 parent 197c04f commit d695873

8 files changed

+19
-16
lines changed

src/main/java/io/nats/client/api/OrderedConsumerConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import static io.nats.client.support.JsonUtils.beginJson;
2626
import static io.nats.client.support.JsonUtils.endJson;
2727
import static io.nats.client.support.JsonValueUtils.*;
28-
import static io.nats.client.support.NatsJetStreamConstants.DEFAULT_FILTER_SUBJECT;
28+
import static io.nats.client.support.NatsConstants.GREATER_THAN;
2929
import static io.nats.client.support.Validator.emptyAsNull;
3030

3131
public class OrderedConsumerConfiguration implements JsonSerializable {
@@ -45,7 +45,7 @@ public class OrderedConsumerConfiguration implements JsonSerializable {
4545
public OrderedConsumerConfiguration() {
4646
startSequence = ConsumerConfiguration.LONG_UNSET;
4747
filterSubjects = new ArrayList<>();
48-
filterSubjects.add(DEFAULT_FILTER_SUBJECT);
48+
filterSubjects.add(GREATER_THAN);
4949
}
5050

5151
public OrderedConsumerConfiguration(String json) throws JsonParseException {
@@ -118,7 +118,7 @@ public OrderedConsumerConfiguration filterSubjects(List<String> filterSubjects)
118118
}
119119
}
120120
if (this.filterSubjects.isEmpty()) {
121-
this.filterSubjects.add(DEFAULT_FILTER_SUBJECT);
121+
this.filterSubjects.add(GREATER_THAN);
122122
}
123123
return this;
124124
}

src/main/java/io/nats/client/api/StreamInfoOptions.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import static io.nats.client.support.ApiConstants.DELETED_DETAILS;
1919
import static io.nats.client.support.ApiConstants.SUBJECTS_FILTER;
2020
import static io.nats.client.support.JsonUtils.*;
21+
import static io.nats.client.support.NatsConstants.GREATER_THAN;
2122
import static io.nats.client.support.Validator.emptyAsNull;
2223

2324
/**
@@ -110,7 +111,7 @@ public Builder filterSubjects(String subjectsFilter) {
110111
* @return the builder
111112
*/
112113
public Builder allSubjects() {
113-
this.subjectsFilter = ">";
114+
this.subjectsFilter = GREATER_THAN;
114115
return this;
115116
}
116117

src/main/java/io/nats/client/impl/NatsJetStreamImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import java.util.List;
2626
import java.util.concurrent.ConcurrentHashMap;
2727

28-
import static io.nats.client.support.NatsConstants.GT;
28+
import static io.nats.client.support.NatsConstants.GREATER_THAN;
2929
import static io.nats.client.support.NatsJetStreamClientError.JsConsumerCreate290NotAvailable;
3030
import static io.nats.client.support.NatsJetStreamClientError.JsMultipleFilterSubjects210NotAvailable;
3131
import static io.nats.client.support.NatsRequestCompletableFuture.CancelAction;
@@ -104,7 +104,7 @@ ConsumerInfo _createConsumer(String streamName, ConsumerConfiguration config, Co
104104
consumerName = durable == null ? generateConsumerName() : durable;
105105
}
106106
String fs = config.getFilterSubject(); // we've already determined not multiple so this gives us 1 or null
107-
if (fs == null || fs.equals(GT)) {
107+
if (fs == null || fs.equals(GREATER_THAN)) {
108108
subj = String.format(JSAPI_CONSUMER_CREATE_V290, streamName, consumerName);
109109
}
110110
else {

src/main/java/io/nats/client/impl/NatsKeyValue.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@
3030
import java.util.concurrent.LinkedBlockingQueue;
3131

3232
import static io.nats.client.support.NatsConstants.DOT;
33-
import static io.nats.client.support.NatsJetStreamConstants.*;
33+
import static io.nats.client.support.NatsConstants.GREATER_THAN;
34+
import static io.nats.client.support.NatsJetStreamConstants.EXPECTED_LAST_SUB_SEQ_HDR;
35+
import static io.nats.client.support.NatsJetStreamConstants.JS_WRONG_LAST_SEQUENCE;
3436
import static io.nats.client.support.NatsKeyValueUtil.*;
3537
import static io.nats.client.support.Validator.*;
3638

@@ -266,20 +268,20 @@ public NatsKeyValueWatchSubscription watch(List<String> keys, KeyValueWatcher wa
266268

267269
@Override
268270
public NatsKeyValueWatchSubscription watchAll(KeyValueWatcher watcher, KeyValueWatchOption... watchOptions) throws IOException, JetStreamApiException, InterruptedException {
269-
return new NatsKeyValueWatchSubscription(this, Collections.singletonList(">"), watcher, -1, watchOptions);
271+
return new NatsKeyValueWatchSubscription(this, Collections.singletonList(GREATER_THAN), watcher, -1, watchOptions);
270272
}
271273

272274
@Override
273275
public NatsKeyValueWatchSubscription watchAll(KeyValueWatcher watcher, long fromRevision, KeyValueWatchOption... watchOptions) throws IOException, JetStreamApiException, InterruptedException {
274-
return new NatsKeyValueWatchSubscription(this, Collections.singletonList(">"), watcher, fromRevision, watchOptions);
276+
return new NatsKeyValueWatchSubscription(this, Collections.singletonList(GREATER_THAN), watcher, fromRevision, watchOptions);
275277
}
276278

277279
/**
278280
* {@inheritDoc}
279281
*/
280282
@Override
281283
public List<String> keys() throws IOException, JetStreamApiException, InterruptedException {
282-
return _keys(Collections.singletonList(readSubject(DEFAULT_FILTER_SUBJECT)));
284+
return _keys(Collections.singletonList(readSubject(GREATER_THAN)));
283285
}
284286

285287
@Override
@@ -312,7 +314,7 @@ private List<String> _keys(List<String> readSubjectFilters) throws IOException,
312314
*/
313315
@Override
314316
public LinkedBlockingQueue<KeyResult> consumeKeys() {
315-
return _consumeKeys(Collections.singletonList(readSubject(DEFAULT_FILTER_SUBJECT)));
317+
return _consumeKeys(Collections.singletonList(readSubject(GREATER_THAN)));
316318
}
317319

318320
@Override

src/main/java/io/nats/client/impl/NatsObjectStore.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import java.util.Arrays;
2828
import java.util.List;
2929

30+
import static io.nats.client.support.NatsConstants.GREATER_THAN;
3031
import static io.nats.client.support.NatsJetStreamClientError.*;
3132
import static io.nats.client.support.NatsObjectStoreUtil.*;
3233

@@ -73,7 +74,7 @@ String rawMetaSubject(String name) {
7374
}
7475

7576
String rawAllMetaSubject() {
76-
return rawMetaPrefix + ">";
77+
return rawMetaPrefix + GREATER_THAN;
7778
}
7879

7980
String pubSubMetaSubject(String name) {

src/main/java/io/nats/client/support/NatsConstants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public interface NatsConstants {
3838
String EMPTY = "";
3939
String CRLF = "\r\n";
4040
String DOT = ".";
41-
String GT = ">";
41+
String GREATER_THAN = ">";
4242
String STAR = "*";
4343

4444
byte TAB = '\t';

src/main/java/io/nats/client/support/NatsJetStreamConstants.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,4 @@ public interface NatsJetStreamConstants {
108108
int JS_CONSUMER_NOT_FOUND_ERR = 10014;
109109
int JS_NO_MESSAGE_FOUND_ERR = 10037;
110110
int JS_WRONG_LAST_SEQUENCE = 10071;
111-
112-
String DEFAULT_FILTER_SUBJECT = ">";
113111
}

src/main/java/io/nats/service/Group.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import java.util.Objects;
1919

2020
import static io.nats.client.support.NatsConstants.DOT;
21+
import static io.nats.client.support.NatsConstants.GREATER_THAN;
2122
import static io.nats.client.support.Validator.emptyAsNull;
2223

2324
/**
@@ -38,7 +39,7 @@ public Group(String name) {
3839
throw new IllegalArgumentException("Group name cannot be null or empty.");
3940
}
4041

41-
if (name.contains(">")) {
42+
if (name.contains(GREATER_THAN)) {
4243
throw new IllegalArgumentException("Group name cannot contain '>'.");
4344
}
4445

0 commit comments

Comments
 (0)