Skip to content

Commit 829f1ce

Browse files
bednarbednar
authored
fix: avoid requirements to jdk.unsupported module (#258)
1 parent 050db6a commit 829f1ce

25 files changed

+79
-32
lines changed

‎CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
## 3.3.0 [unreleased]
2+
3+
### Bug Fixes
4+
1. [#258](https://github.com/influxdata/influxdb-client-java/pull/258): Avoid requirements to `jdk.unsupported` module
5+
6+
### Dependencies
7+
1. [#258](https://github.com/influxdata/influxdb-client-java/pull/258): Update dependencies:
8+
- Gson to 2.8.8
29

310
## 3.2.0 [2021-08-20]
411

‎client/src/generated/java/com/influxdb/client/domain/ArrayExpression.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ private String toIndentedString(java.lang.Object o) {
138138
return o.toString().replace("\n", "\n ");
139139
}
140140

141-
public class ArrayExpressionElementsAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
141+
public static class ArrayExpressionElementsAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
142142

143143
public ArrayExpressionElementsAdapter() {
144144
}

‎client/src/generated/java/com/influxdb/client/domain/BinaryExpression.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ private String toIndentedString(java.lang.Object o) {
179179
return o.toString().replace("\n", "\n ");
180180
}
181181

182-
public class BinaryExpressionLeftAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
182+
public static class BinaryExpressionLeftAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
183183

184184
public BinaryExpressionLeftAdapter() {
185185
}
@@ -277,7 +277,7 @@ private Object deserialize(final String[] types, final JsonElement json, final J
277277
return context.deserialize(json, Object.class);
278278
}
279279
}
280-
public class BinaryExpressionRightAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
280+
public static class BinaryExpressionRightAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
281281

282282
public BinaryExpressionRightAdapter() {
283283
}

‎client/src/generated/java/com/influxdb/client/domain/Block.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ private String toIndentedString(java.lang.Object o) {
138138
return o.toString().replace("\n", "\n ");
139139
}
140140

141-
public class BlockBodyAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
141+
public static class BlockBodyAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
142142

143143
public BlockBodyAdapter() {
144144
}

‎client/src/generated/java/com/influxdb/client/domain/CallExpression.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ private String toIndentedString(java.lang.Object o) {
163163
return o.toString().replace("\n", "\n ");
164164
}
165165

166-
public class CallExpressionArgumentsAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
166+
public static class CallExpressionArgumentsAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
167167

168168
public CallExpressionArgumentsAdapter() {
169169
}
@@ -267,7 +267,7 @@ private Object deserialize(final String[] types, final JsonElement json, final J
267267
return context.deserialize(json, Object.class);
268268
}
269269
}
270-
public class CallExpressionCalleeAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
270+
public static class CallExpressionCalleeAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
271271

272272
public CallExpressionCalleeAdapter() {
273273
}

‎client/src/generated/java/com/influxdb/client/domain/ConditionalExpression.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ private String toIndentedString(java.lang.Object o) {
180180
return o.toString().replace("\n", "\n ");
181181
}
182182

183-
public class ConditionalExpressionAlternateAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
183+
public static class ConditionalExpressionAlternateAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
184184

185185
public ConditionalExpressionAlternateAdapter() {
186186
}
@@ -278,7 +278,7 @@ private Object deserialize(final String[] types, final JsonElement json, final J
278278
return context.deserialize(json, Object.class);
279279
}
280280
}
281-
public class ConditionalExpressionTestAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
281+
public static class ConditionalExpressionTestAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
282282

283283
public ConditionalExpressionTestAdapter() {
284284
}
@@ -376,7 +376,7 @@ private Object deserialize(final String[] types, final JsonElement json, final J
376376
return context.deserialize(json, Object.class);
377377
}
378378
}
379-
public class ConditionalExpressionConsequentAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
379+
public static class ConditionalExpressionConsequentAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
380380

381381
public ConditionalExpressionConsequentAdapter() {
382382
}

‎client/src/generated/java/com/influxdb/client/domain/DictItem.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ private String toIndentedString(java.lang.Object o) {
153153
return o.toString().replace("\n", "\n ");
154154
}
155155

156-
public class DictItemValAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
156+
public static class DictItemValAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
157157

158158
public DictItemValAdapter() {
159159
}
@@ -251,7 +251,7 @@ private Object deserialize(final String[] types, final JsonElement json, final J
251251
return context.deserialize(json, Object.class);
252252
}
253253
}
254-
public class DictItemKeyAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
254+
public static class DictItemKeyAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
255255

256256
public DictItemKeyAdapter() {
257257
}

‎client/src/generated/java/com/influxdb/client/domain/ExpressionStatement.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ private String toIndentedString(java.lang.Object o) {
130130
return o.toString().replace("\n", "\n ");
131131
}
132132

133-
public class ExpressionStatementExpressionAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
133+
public static class ExpressionStatementExpressionAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
134134

135135
public ExpressionStatementExpressionAdapter() {
136136
}

‎client/src/generated/java/com/influxdb/client/domain/File.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ private String toIndentedString(java.lang.Object o) {
218218
return o.toString().replace("\n", "\n ");
219219
}
220220

221-
public class FileBodyAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
221+
public static class FileBodyAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
222222

223223
public FileBodyAdapter() {
224224
}

‎client/src/generated/java/com/influxdb/client/domain/FunctionExpression.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ private String toIndentedString(java.lang.Object o) {
163163
return o.toString().replace("\n", "\n ");
164164
}
165165

166-
public class FunctionExpressionBodyAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
166+
public static class FunctionExpressionBodyAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
167167

168168
public FunctionExpressionBodyAdapter() {
169169
}

‎client/src/generated/java/com/influxdb/client/domain/IndexExpression.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ private String toIndentedString(java.lang.Object o) {
155155
return o.toString().replace("\n", "\n ");
156156
}
157157

158-
public class IndexExpressionArrayAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
158+
public static class IndexExpressionArrayAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
159159

160160
public IndexExpressionArrayAdapter() {
161161
}
@@ -253,7 +253,7 @@ private Object deserialize(final String[] types, final JsonElement json, final J
253253
return context.deserialize(json, Object.class);
254254
}
255255
}
256-
public class IndexExpressionIndexAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
256+
public static class IndexExpressionIndexAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
257257

258258
public IndexExpressionIndexAdapter() {
259259
}

‎client/src/generated/java/com/influxdb/client/domain/LogicalExpression.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ private String toIndentedString(java.lang.Object o) {
179179
return o.toString().replace("\n", "\n ");
180180
}
181181

182-
public class LogicalExpressionLeftAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
182+
public static class LogicalExpressionLeftAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
183183

184184
public LogicalExpressionLeftAdapter() {
185185
}
@@ -277,7 +277,7 @@ private Object deserialize(final String[] types, final JsonElement json, final J
277277
return context.deserialize(json, Object.class);
278278
}
279279
}
280-
public class LogicalExpressionRightAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
280+
public static class LogicalExpressionRightAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
281281

282282
public LogicalExpressionRightAdapter() {
283283
}

‎client/src/generated/java/com/influxdb/client/domain/MemberAssignment.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ private String toIndentedString(java.lang.Object o) {
155155
return o.toString().replace("\n", "\n ");
156156
}
157157

158-
public class MemberAssignmentInitAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
158+
public static class MemberAssignmentInitAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
159159

160160
public MemberAssignmentInitAdapter() {
161161
}

‎client/src/generated/java/com/influxdb/client/domain/MemberExpression.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ private String toIndentedString(java.lang.Object o) {
156156
return o.toString().replace("\n", "\n ");
157157
}
158158

159-
public class MemberExpressionPropertyAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
159+
public static class MemberExpressionPropertyAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
160160

161161
public MemberExpressionPropertyAdapter() {
162162
}
@@ -191,7 +191,7 @@ private Object deserialize(final String[] types, final JsonElement json, final J
191191
return context.deserialize(json, Object.class);
192192
}
193193
}
194-
public class MemberExpressionObjectAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
194+
public static class MemberExpressionObjectAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
195195

196196
public MemberExpressionObjectAdapter() {
197197
}

‎client/src/generated/java/com/influxdb/client/domain/OptionStatement.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ private String toIndentedString(java.lang.Object o) {
129129
return o.toString().replace("\n", "\n ");
130130
}
131131

132-
public class OptionStatementAssignmentAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
132+
public static class OptionStatementAssignmentAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
133133

134134
public OptionStatementAssignmentAdapter() {
135135
}

‎client/src/generated/java/com/influxdb/client/domain/ParenExpression.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ private String toIndentedString(java.lang.Object o) {
130130
return o.toString().replace("\n", "\n ");
131131
}
132132

133-
public class ParenExpressionExpressionAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
133+
public static class ParenExpressionExpressionAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
134134

135135
public ParenExpressionExpressionAdapter() {
136136
}

‎client/src/generated/java/com/influxdb/client/domain/PipeExpression.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ private String toIndentedString(java.lang.Object o) {
155155
return o.toString().replace("\n", "\n ");
156156
}
157157

158-
public class PipeExpressionArgumentAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
158+
public static class PipeExpressionArgumentAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
159159

160160
public PipeExpressionArgumentAdapter() {
161161
}

‎client/src/generated/java/com/influxdb/client/domain/Property.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ private String toIndentedString(java.lang.Object o) {
154154
return o.toString().replace("\n", "\n ");
155155
}
156156

157-
public class PropertyKeyAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
157+
public static class PropertyKeyAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
158158

159159
public PropertyKeyAdapter() {
160160
}
@@ -189,7 +189,7 @@ private Object deserialize(final String[] types, final JsonElement json, final J
189189
return context.deserialize(json, Object.class);
190190
}
191191
}
192-
public class PropertyValueAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
192+
public static class PropertyValueAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
193193

194194
public PropertyValueAdapter() {
195195
}

‎client/src/generated/java/com/influxdb/client/domain/ReturnStatement.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ private String toIndentedString(java.lang.Object o) {
130130
return o.toString().replace("\n", "\n ");
131131
}
132132

133-
public class ReturnStatementArgumentAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
133+
public static class ReturnStatementArgumentAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
134134

135135
public ReturnStatementArgumentAdapter() {
136136
}

‎client/src/generated/java/com/influxdb/client/domain/UnaryExpression.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ private String toIndentedString(java.lang.Object o) {
154154
return o.toString().replace("\n", "\n ");
155155
}
156156

157-
public class UnaryExpressionArgumentAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
157+
public static class UnaryExpressionArgumentAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
158158

159159
public UnaryExpressionArgumentAdapter() {
160160
}

‎client/src/generated/java/com/influxdb/client/domain/Variable.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ private String toIndentedString(java.lang.Object o) {
329329
return o.toString().replace("\n", "\n ");
330330
}
331331

332-
public class VariableArgumentsAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
332+
public static class VariableArgumentsAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
333333

334334
public VariableArgumentsAdapter() {
335335
}

‎client/src/generated/java/com/influxdb/client/domain/VariableAssignment.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ private String toIndentedString(java.lang.Object o) {
155155
return o.toString().replace("\n", "\n ");
156156
}
157157

158-
public class VariableAssignmentInitAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
158+
public static class VariableAssignmentInitAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
159159

160160
public VariableAssignmentInitAdapter() {
161161
}

‎client/src/generated/java/com/influxdb/client/domain/View.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ private String toIndentedString(java.lang.Object o) {
167167
return o.toString().replace("\n", "\n ");
168168
}
169169

170-
public class ViewPropertiesAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
170+
public static class ViewPropertiesAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
171171

172172
public ViewPropertiesAdapter() {
173173
}

‎client/src/test/java/com/influxdb/client/GeneratedCodeTest.java

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/*
2+
* The MIT License
3+
*
4+
* Permission is hereby granted, free of charge, to any person obtaining a copy
5+
* of this software and associated documentation files (the "Software"), to deal
6+
* in the Software without restriction, including without limitation the rights
7+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
* copies of the Software, and to permit persons to whom the Software is
9+
* furnished to do so, subject to the following conditions:
10+
*
11+
* The above copyright notice and this permission notice shall be included in
12+
* all copies or substantial portions of the Software.
13+
*
14+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
20+
* THE SOFTWARE.
21+
*/
22+
package com.influxdb.client;
23+
24+
import com.influxdb.client.domain.File;
25+
26+
import org.assertj.core.api.Assertions;
27+
import org.junit.jupiter.api.Test;
28+
import org.junit.platform.runner.JUnitPlatform;
29+
import org.junit.runner.RunWith;
30+
31+
/**
32+
* @author Jakub Bednar (26/08/2021 6:24)
33+
*/
34+
@RunWith(JUnitPlatform.class)
35+
class GeneratedCodeTest {
36+
@Test
37+
void adapterCanBeInstantiateWithoutParameters() {
38+
Assertions.assertThat(new File.FileBodyAdapter()).isNotNull();
39+
}
40+
}

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109

110110
<dependency.retrofit.version>2.9.0</dependency.retrofit.version>
111111
<dependency.okhttp3.version>4.7.2</dependency.okhttp3.version>
112-
<dependency.gson.version>2.8.5</dependency.gson.version>
112+
<dependency.gson.version>2.8.8</dependency.gson.version>
113113

114114
<plugin.surefire.version>2.22.2</plugin.surefire.version>
115115
<plugin.javadoc.version>3.2.0</plugin.javadoc.version>

0 commit comments

Comments
 (0)