Skip to content

Commit 135b2c9

Browse files
committed
Javadoc fixes found by jdk12
1 parent 64dd9e8 commit 135b2c9

File tree

6 files changed

+32
-26
lines changed

6 files changed

+32
-26
lines changed

compile-and-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
set -e
66

77
DEFAULT_INFLUXDB_VERSION="1.7"
8-
DEFAULT_MAVEN_JAVA_VERSION="3-jdk-11-slim"
8+
DEFAULT_MAVEN_JAVA_VERSION="3-jdk-12-alpine"
99

1010
INFLUXDB_VERSION="${INFLUXDB_VERSION:-$DEFAULT_INFLUXDB_VERSION}"
1111
MAVEN_JAVA_VERSION="${MAVEN_JAVA_VERSION:-$DEFAULT_MAVEN_JAVA_VERSION}"

src/main/java/org/influxdb/InfluxDB.java

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,8 @@ public interface Cancellable {
166166
* Note that batch processing needs to be explicitly stopped before the application is shutdown.
167167
* To do so call disableBatch().
168168
*
169+
* @param batchOptions
170+
* the options to set for batching the writes.
169171
* @return the InfluxDB instance to be able to use it in a fluent manner.
170172
*/
171173
public InfluxDB enableBatch(final BatchOptions batchOptions);
@@ -551,8 +553,8 @@ public void query(Query query, int chunkSize, BiConsumer<Cancellable, QueryResul
551553
*
552554
* @param name
553555
* the name of the new database.
554-
* @deprecated (since 2.9, removed in 3.0) Use <tt>org.influxdb.InfluxDB.query(Query)</tt> to execute a parameterized
555-
* <strong>CREATE DATABASE</strong> query.
556+
* @deprecated (since 2.9, removed in 3.0) Use <code>org.influxdb.InfluxDB.query(Query)</code>
557+
* to execute a parameterized <strong>CREATE DATABASE</strong> query.
556558
*/
557559
@Deprecated
558560
public void createDatabase(final String name);
@@ -562,8 +564,8 @@ public void query(Query query, int chunkSize, BiConsumer<Cancellable, QueryResul
562564
*
563565
* @param name
564566
* the name of the database to delete.
565-
* @deprecated (since 2.9, removed in 3.0) Use <tt>org.influxdb.InfluxDB.query(Query)</tt> to execute a
566-
* <strong>DROP DATABASE</strong> query.
567+
* @deprecated (since 2.9, removed in 3.0) Use <code>org.influxdb.InfluxDB.query(Query)</code>
568+
* to execute a <strong>DROP DATABASE</strong> query.
567569
*/
568570
@Deprecated
569571
public void deleteDatabase(final String name);
@@ -572,8 +574,8 @@ public void query(Query query, int chunkSize, BiConsumer<Cancellable, QueryResul
572574
* Describe all available databases.
573575
*
574576
* @return a List of all Database names.
575-
* @deprecated (since 2.9, removed in 3.0) Use <tt>org.influxdb.InfluxDB.query(Query)</tt> to execute a
576-
* <strong>SHOW DATABASES</strong> query.
577+
* @deprecated (since 2.9, removed in 3.0) Use <code>org.influxdb.InfluxDB.query(Query)</code>
578+
* to execute a <strong>SHOW DATABASES</strong> query.
577579
*/
578580
@Deprecated
579581
public List<String> describeDatabases();
@@ -585,8 +587,8 @@ public void query(Query query, int chunkSize, BiConsumer<Cancellable, QueryResul
585587
* the name of the database to search.
586588
*
587589
* @return true if the database exists or false if it doesn't exist
588-
* @deprecated (since 2.9, removed in 3.0) Use <tt>org.influxdb.InfluxDB.query(Query)</tt> to execute a
589-
* <strong>SHOW DATABASES</strong> query and inspect the result.
590+
* @deprecated (since 2.9, removed in 3.0) Use <code>org.influxdb.InfluxDB.query(Query)</code>
591+
* to execute a <strong>SHOW DATABASES</strong> query and inspect the result.
590592
*/
591593
@Deprecated
592594
public boolean databaseExists(final String name);
@@ -639,8 +641,8 @@ public void query(Query query, int chunkSize, BiConsumer<Cancellable, QueryResul
639641
* @param shardDuration the shardDuration
640642
* @param replicationFactor the replicationFactor of the rp
641643
* @param isDefault if the rp is the default rp for the database or not
642-
* @deprecated (since 2.9, removed in 3.0) Use <tt>org.influxdb.InfluxDB.query(Query)</tt> to execute a parameterized
643-
* <strong>CREATE RETENTION POLICY</strong> query.
644+
* @deprecated (since 2.9, removed in 3.0) Use <code>org.influxdb.InfluxDB.query(Query)</code>
645+
* to execute a parameterized <strong>CREATE RETENTION POLICY</strong> query.
644646
*/
645647
@Deprecated
646648
public void createRetentionPolicy(final String rpName, final String database, final String duration,
@@ -653,8 +655,8 @@ public void createRetentionPolicy(final String rpName, final String database, fi
653655
* @param duration the duration of the rp
654656
* @param replicationFactor the replicationFactor of the rp
655657
* @param isDefault if the rp is the default rp for the database or not
656-
* @deprecated (since 2.9, removed in 3.0) Use <tt>org.influxdb.InfluxDB.query(Query)</tt> to execute a parameterized
657-
* <strong>CREATE RETENTION POLICY</strong> query.
658+
* @deprecated (since 2.9, removed in 3.0) Use <code>org.influxdb.InfluxDB.query(Query)</code>
659+
* to execute a parameterized <strong>CREATE RETENTION POLICY</strong> query.
658660
*/
659661
@Deprecated
660662
public void createRetentionPolicy(final String rpName, final String database, final String duration,
@@ -667,8 +669,8 @@ public void createRetentionPolicy(final String rpName, final String database, fi
667669
* @param duration the duration of the rp
668670
* @param shardDuration the shardDuration
669671
* @param replicationFactor the replicationFactor of the rp
670-
* @deprecated (since 2.9, removed in 3.0) Use <tt>org.influxdb.InfluxDB.query(Query)</tt> to execute a parameterized
671-
* <strong>CREATE RETENTION POLICY</strong> query.
672+
* @deprecated (since 2.9, removed in 3.0) Use <code>org.influxdb.InfluxDB.query(Query)</code>
673+
* to execute a parameterized <strong>CREATE RETENTION POLICY</strong> query.
672674
*/
673675
@Deprecated
674676
public void createRetentionPolicy(final String rpName, final String database, final String duration,
@@ -678,8 +680,8 @@ public void createRetentionPolicy(final String rpName, final String database, fi
678680
* Drops a retentionPolicy in a database.
679681
* @param rpName the name of the retentionPolicy
680682
* @param database the name of the database
681-
* @deprecated (since 2.9, removed in 3.0) Use <tt>org.influxdb.InfluxDB.query(Query)</tt> to execute a
682-
* <strong>DROP RETENTION POLICY</strong> query.
683+
* @deprecated (since 2.9, removed in 3.0) Use <code>org.influxdb.InfluxDB.query(Query)</code>
684+
* to execute a <strong>DROP RETENTION POLICY</strong> query.
683685
*/
684686
@Deprecated
685687
public void dropRetentionPolicy(final String rpName, final String database);

src/main/java/org/influxdb/InfluxDBException.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,8 @@ public static InfluxDBException buildExceptionForErrorState(final String errorBo
179179
/**
180180
* Create corresponding InfluxDBException from the message pack error body.
181181
* @param messagePackErrorBody
182-
* @return
182+
* the error body if any
183+
* @return the Exception
183184
*/
184185
public static InfluxDBException buildExceptionForErrorState(final InputStream messagePackErrorBody) {
185186
try {

src/main/java/org/influxdb/dto/BatchPoints.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public Builder consistency(final ConsistencyLevel consistencyLevel) {
140140

141141
/**
142142
* Set the time precision to use for the whole batch. If unspecified, will default to {@link TimeUnit#NANOSECONDS}
143-
* @param precision
143+
* @param precision the precision of the points
144144
* @return the Builder instance
145145
*/
146146
public Builder precision(final TimeUnit precision) {

src/main/java/org/influxdb/impl/InfluxDBResultMapper.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public class InfluxDBResultMapper {
5656
private static final boolean ADD_DECIMAL_POINT = true;
5757

5858
/**
59-
* When a query is executed without {@link TimeUnit}, InfluxDB returns the <tt>time</tt>
59+
* When a query is executed without {@link TimeUnit}, InfluxDB returns the <code>time</code>
6060
* column as a RFC3339 date.
6161
*/
6262
private static final DateTimeFormatter RFC3339_FORMATTER = new DateTimeFormatterBuilder()
@@ -80,7 +80,7 @@ public class InfluxDBResultMapper {
8080
* same order as received from InfluxDB.
8181
*
8282
* @throws InfluxDBMapperException If {@link QueryResult} parameter contain errors,
83-
* <tt>clazz</tt> parameter is not annotated with &#64;Measurement or it was not
83+
* <code>clazz</code> parameter is not annotated with &#64;Measurement or it was not
8484
* possible to define the values of your POJO (e.g. due to an unsupported field type).
8585
*/
8686
public <T> List<T> toPOJO(final QueryResult queryResult, final Class<T> clazz) throws InfluxDBMapperException {
@@ -103,7 +103,7 @@ public <T> List<T> toPOJO(final QueryResult queryResult, final Class<T> clazz) t
103103
* same order as received from InfluxDB.
104104
*
105105
* @throws InfluxDBMapperException If {@link QueryResult} parameter contain errors,
106-
* <tt>clazz</tt> parameter is not annotated with &#64;Measurement or it was not
106+
* <code>clazz</code> parameter is not annotated with &#64;Measurement or it was not
107107
* possible to define the values of your POJO (e.g. due to an unsupported field type).
108108
*/
109109
public <T> List<T> toPOJO(final QueryResult queryResult, final Class<T> clazz,
@@ -129,7 +129,7 @@ public <T> List<T> toPOJO(final QueryResult queryResult, final Class<T> clazz,
129129
* same order as received from InfluxDB.
130130
*
131131
* @throws InfluxDBMapperException If {@link QueryResult} parameter contain errors,
132-
* <tt>clazz</tt> parameter is not annotated with &#64;Measurement or it was not
132+
* <code>clazz</code> parameter is not annotated with &#64;Measurement or it was not
133133
* possible to define the values of your POJO (e.g. due to an unsupported field type).
134134
*/
135135
public <T> List<T> toPOJO(final QueryResult queryResult, final Class<T> clazz, final String measurementName)
@@ -154,7 +154,7 @@ public <T> List<T> toPOJO(final QueryResult queryResult, final Class<T> clazz, f
154154
* same order as received from InfluxDB.
155155
*
156156
* @throws InfluxDBMapperException If {@link QueryResult} parameter contain errors,
157-
* <tt>clazz</tt> parameter is not annotated with &#64;Measurement or it was not
157+
* <code>clazz</code> parameter is not annotated with &#64;Measurement or it was not
158158
* possible to define the values of your POJO (e.g. due to an unsupported field type).
159159
*/
160160
public <T> List<T> toPOJO(final QueryResult queryResult, final Class<T> clazz, final String measurementName,

src/main/java/org/influxdb/querybuilder/BuiltQuery.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,15 +153,18 @@ public static Clause subTime(final long interval, final String literal) {
153153
return new SubRelativeTimeClause(new TimeInterval(interval, literal));
154154
}
155155

156-
/** @return */
156+
/**
157+
*
158+
* @return the Ordering
159+
*/
157160
public static Ordering asc() {
158161
return new Ordering(false);
159162
}
160163

161164
/**
162165
* InfluxDB supports only time for ordering.
163166
*
164-
* @return
167+
* @return the Ordering
165168
*/
166169
public static Ordering desc() {
167170
return new Ordering(true);

0 commit comments

Comments
 (0)