Skip to content

Commit 80f8d92

Browse files
feat: clone default options
1 parent 9f9d56a commit 80f8d92

File tree

5 files changed

+15
-13
lines changed

5 files changed

+15
-13
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
- Long precision string values added from v3 HTTP API: `"nanosecond"`, `"microsecond"`, `"millisecond"`,
1414
`"second"` (
1515
in addition to the existing `"ns"`, `"us"`, `"ms"`, `"s"`).
16+
3. [#241](https://github.com/InfluxCommunity/influxdb3-java/pull/241): Some default options will be used from a getter.
1617

1718
### Bug Fixes
1819

@@ -25,7 +26,6 @@
2526
public void writePoint(@Nullable final Point point);
2627
public void writePoints(@Nonnull final List<Point> points);
2728
```
28-
2. [#241](https://github.com/InfluxCommunity/influxdb3-java/pull/241): Some default options will be used from a getter.
2929

3030
## 1.1.0 [2025-05-22]
3131

src/main/java/com/influxdb/v3/client/internal/InfluxDBClientImpl.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public void writePoints(@Nonnull final List<Point> points, @Nonnull final WriteO
165165
@Nonnull
166166
@Override
167167
public Stream<Object[]> query(@Nonnull final String query) {
168-
return query(query, NO_PARAMETERS, QueryOptions.DEFAULTS);
168+
return query(query, NO_PARAMETERS, QueryOptions.defaultQueryOptions());
169169
}
170170

171171
@Nonnull
@@ -177,7 +177,7 @@ public Stream<Object[]> query(@Nonnull final String query, @Nonnull final QueryO
177177
@Nonnull
178178
@Override
179179
public Stream<Object[]> query(@Nonnull final String query, @Nonnull final Map<String, Object> parameters) {
180-
return query(query, parameters, QueryOptions.DEFAULTS);
180+
return query(query, parameters, QueryOptions.defaultQueryOptions());
181181
}
182182

183183
@Nonnull
@@ -198,15 +198,15 @@ public Stream<Object[]> query(@Nonnull final String query,
198198
@Nonnull
199199
@Override
200200
public Stream<Map<String, Object>> queryRows(@Nonnull final String query) {
201-
return queryRows(query, NO_PARAMETERS, QueryOptions.DEFAULTS);
201+
return queryRows(query, NO_PARAMETERS, QueryOptions.defaultQueryOptions());
202202
}
203203

204204
@Nonnull
205205
@Override
206206
public Stream<Map<String, Object>> queryRows(@Nonnull final String query,
207207
@Nonnull final Map<String, Object> parameters
208208
) {
209-
return queryRows(query, parameters, QueryOptions.DEFAULTS);
209+
return queryRows(query, parameters, QueryOptions.defaultQueryOptions());
210210
}
211211

212212
@Nonnull
@@ -233,7 +233,7 @@ public Stream<Map<String, Object>> queryRows(@Nonnull final String query,
233233
@Nonnull
234234
@Override
235235
public Stream<PointValues> queryPoints(@Nonnull final String query) {
236-
return queryPoints(query, QueryOptions.DEFAULTS);
236+
return queryPoints(query, QueryOptions.defaultQueryOptions());
237237
}
238238

239239
@Nonnull
@@ -245,7 +245,7 @@ public Stream<PointValues> queryPoints(@Nonnull final String query, @Nonnull fin
245245
@Nonnull
246246
@Override
247247
public Stream<PointValues> queryPoints(@Nonnull final String query, @Nonnull final Map<String, Object> parameters) {
248-
return queryPoints(query, parameters, QueryOptions.DEFAULTS);
248+
return queryPoints(query, parameters, QueryOptions.defaultQueryOptions());
249249
}
250250

251251
@Nonnull
@@ -266,7 +266,7 @@ public Stream<PointValues> queryPoints(@Nonnull final String query,
266266
@Nonnull
267267
@Override
268268
public Stream<VectorSchemaRoot> queryBatches(@Nonnull final String query) {
269-
return queryBatches(query, QueryOptions.DEFAULTS);
269+
return queryBatches(query, QueryOptions.defaultQueryOptions());
270270
}
271271

272272
@Nonnull
@@ -279,7 +279,7 @@ public Stream<VectorSchemaRoot> queryBatches(@Nonnull final String query, @Nonnu
279279
@Override
280280
public Stream<VectorSchemaRoot> queryBatches(@Nonnull final String query,
281281
@Nonnull final Map<String, Object> parameters) {
282-
return queryBatches(query, parameters, QueryOptions.DEFAULTS);
282+
return queryBatches(query, parameters, QueryOptions.defaultQueryOptions());
283283
}
284284

285285
@Nonnull

src/main/java/com/influxdb/v3/client/query/QueryOptions.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ public final class QueryOptions {
5252

5353
/**
5454
* Default QueryAPI options.<br>
55-
* Deprecated: use {@link #defaultQueryOptions()} instead.
55+
* Deprecated: use {@link #defaultQueryOptions} instead.
5656
*/
5757
@Deprecated(forRemoval = true)
5858
public static final QueryOptions DEFAULTS = new QueryOptions(null, QueryType.SQL);
5959

6060
/**
6161
* Default QueryAPI options for InfluxQL.<br>
62-
* Deprecated: use {@link #defaultInfluxQlQueryOptions()} instead.
62+
* Deprecated: use {@link #defaultInfluxQlQueryOptions} instead.
6363
*/
6464
@Deprecated(forRemoval = true)
6565
public static final QueryOptions INFLUX_QL = new QueryOptions(null, QueryType.InfluxQL);

src/main/java/com/influxdb/v3/client/write/WriteOptions.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ public final class WriteOptions {
6767
public static final boolean DEFAULT_NO_SYNC = false;
6868
/**
6969
* Default WriteOptions.
70+
* Deprecated use {@link #defaultWriteOptions} instead
7071
*/
72+
@Deprecated(forRemoval = true)
7173
public static final WriteOptions DEFAULTS = new WriteOptions(
7274
null, DEFAULT_WRITE_PRECISION, DEFAULT_GZIP_THRESHOLD, DEFAULT_NO_SYNC, null, null);
7375

@@ -85,7 +87,7 @@ public final class WriteOptions {
8587
* compression threshold, and no specified database.
8688
*/
8789
public static WriteOptions defaultWriteOptions() {
88-
return new WriteOptions(null, DEFAULT_WRITE_PRECISION, DEFAULT_GZIP_THRESHOLD);
90+
return new WriteOptions(null, DEFAULT_WRITE_PRECISION, DEFAULT_GZIP_THRESHOLD, DEFAULT_NO_SYNC, null, null);
8991
}
9092

9193
/**

src/test/java/com/influxdb/v3/client/integration/E2ETest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ public void testQueryRowWithOptions() throws Exception {
327327

328328
// Result set much be ordered by time
329329
String sql = String.format("Select * from %s where \"testId\"='%s' order by time", measurement, uuid);
330-
try (Stream<Map<String, Object>> stream = client.queryRows(sql, QueryOptions.DEFAULTS)) {
330+
try (Stream<Map<String, Object>> stream = client.queryRows(sql, QueryOptions.defaultQueryOptions())) {
331331
List<Map<String, Object>> results = stream.collect(Collectors.toList());
332332
for (int i = 0; i <= 9; i++) {
333333
Map<String, Object> row = results.get(i);

0 commit comments

Comments
 (0)