Skip to content

Commit

Permalink
fix: avoid requirements to jdk.unsupported module (#258)
Browse files Browse the repository at this point in the history
  • Loading branch information
bednar authored Aug 31, 2021
1 parent 050db6a commit 829f1ce
Show file tree
Hide file tree
Showing 25 changed files with 79 additions and 32 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
## 3.3.0 [unreleased]
### Bug Fixes
1. [#258](https://github.com/influxdata/influxdb-client-java/pull/258): Avoid requirements to `jdk.unsupported` module

### Dependencies
1. [#258](https://github.com/influxdata/influxdb-client-java/pull/258): Update dependencies:
- Gson to 2.8.8

## 3.2.0 [2021-08-20]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ private String toIndentedString(java.lang.Object o) {
return o.toString().replace("\n", "\n ");
}

public class ArrayExpressionElementsAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class ArrayExpressionElementsAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public ArrayExpressionElementsAdapter() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ private String toIndentedString(java.lang.Object o) {
return o.toString().replace("\n", "\n ");
}

public class BinaryExpressionLeftAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class BinaryExpressionLeftAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public BinaryExpressionLeftAdapter() {
}
Expand Down Expand Up @@ -277,7 +277,7 @@ private Object deserialize(final String[] types, final JsonElement json, final J
return context.deserialize(json, Object.class);
}
}
public class BinaryExpressionRightAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class BinaryExpressionRightAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public BinaryExpressionRightAdapter() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ private String toIndentedString(java.lang.Object o) {
return o.toString().replace("\n", "\n ");
}

public class BlockBodyAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class BlockBodyAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public BlockBodyAdapter() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ private String toIndentedString(java.lang.Object o) {
return o.toString().replace("\n", "\n ");
}

public class CallExpressionArgumentsAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class CallExpressionArgumentsAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public CallExpressionArgumentsAdapter() {
}
Expand Down Expand Up @@ -267,7 +267,7 @@ private Object deserialize(final String[] types, final JsonElement json, final J
return context.deserialize(json, Object.class);
}
}
public class CallExpressionCalleeAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class CallExpressionCalleeAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public CallExpressionCalleeAdapter() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ private String toIndentedString(java.lang.Object o) {
return o.toString().replace("\n", "\n ");
}

public class ConditionalExpressionAlternateAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class ConditionalExpressionAlternateAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public ConditionalExpressionAlternateAdapter() {
}
Expand Down Expand Up @@ -278,7 +278,7 @@ private Object deserialize(final String[] types, final JsonElement json, final J
return context.deserialize(json, Object.class);
}
}
public class ConditionalExpressionTestAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class ConditionalExpressionTestAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public ConditionalExpressionTestAdapter() {
}
Expand Down Expand Up @@ -376,7 +376,7 @@ private Object deserialize(final String[] types, final JsonElement json, final J
return context.deserialize(json, Object.class);
}
}
public class ConditionalExpressionConsequentAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class ConditionalExpressionConsequentAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public ConditionalExpressionConsequentAdapter() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ private String toIndentedString(java.lang.Object o) {
return o.toString().replace("\n", "\n ");
}

public class DictItemValAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class DictItemValAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public DictItemValAdapter() {
}
Expand Down Expand Up @@ -251,7 +251,7 @@ private Object deserialize(final String[] types, final JsonElement json, final J
return context.deserialize(json, Object.class);
}
}
public class DictItemKeyAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class DictItemKeyAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public DictItemKeyAdapter() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ private String toIndentedString(java.lang.Object o) {
return o.toString().replace("\n", "\n ");
}

public class ExpressionStatementExpressionAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class ExpressionStatementExpressionAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public ExpressionStatementExpressionAdapter() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ private String toIndentedString(java.lang.Object o) {
return o.toString().replace("\n", "\n ");
}

public class FileBodyAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class FileBodyAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public FileBodyAdapter() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ private String toIndentedString(java.lang.Object o) {
return o.toString().replace("\n", "\n ");
}

public class FunctionExpressionBodyAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class FunctionExpressionBodyAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public FunctionExpressionBodyAdapter() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ private String toIndentedString(java.lang.Object o) {
return o.toString().replace("\n", "\n ");
}

public class IndexExpressionArrayAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class IndexExpressionArrayAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public IndexExpressionArrayAdapter() {
}
Expand Down Expand Up @@ -253,7 +253,7 @@ private Object deserialize(final String[] types, final JsonElement json, final J
return context.deserialize(json, Object.class);
}
}
public class IndexExpressionIndexAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class IndexExpressionIndexAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public IndexExpressionIndexAdapter() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ private String toIndentedString(java.lang.Object o) {
return o.toString().replace("\n", "\n ");
}

public class LogicalExpressionLeftAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class LogicalExpressionLeftAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public LogicalExpressionLeftAdapter() {
}
Expand Down Expand Up @@ -277,7 +277,7 @@ private Object deserialize(final String[] types, final JsonElement json, final J
return context.deserialize(json, Object.class);
}
}
public class LogicalExpressionRightAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class LogicalExpressionRightAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public LogicalExpressionRightAdapter() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ private String toIndentedString(java.lang.Object o) {
return o.toString().replace("\n", "\n ");
}

public class MemberAssignmentInitAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class MemberAssignmentInitAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public MemberAssignmentInitAdapter() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ private String toIndentedString(java.lang.Object o) {
return o.toString().replace("\n", "\n ");
}

public class MemberExpressionPropertyAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class MemberExpressionPropertyAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public MemberExpressionPropertyAdapter() {
}
Expand Down Expand Up @@ -191,7 +191,7 @@ private Object deserialize(final String[] types, final JsonElement json, final J
return context.deserialize(json, Object.class);
}
}
public class MemberExpressionObjectAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class MemberExpressionObjectAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public MemberExpressionObjectAdapter() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ private String toIndentedString(java.lang.Object o) {
return o.toString().replace("\n", "\n ");
}

public class OptionStatementAssignmentAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class OptionStatementAssignmentAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public OptionStatementAssignmentAdapter() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ private String toIndentedString(java.lang.Object o) {
return o.toString().replace("\n", "\n ");
}

public class ParenExpressionExpressionAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class ParenExpressionExpressionAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public ParenExpressionExpressionAdapter() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ private String toIndentedString(java.lang.Object o) {
return o.toString().replace("\n", "\n ");
}

public class PipeExpressionArgumentAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class PipeExpressionArgumentAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public PipeExpressionArgumentAdapter() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ private String toIndentedString(java.lang.Object o) {
return o.toString().replace("\n", "\n ");
}

public class PropertyKeyAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class PropertyKeyAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public PropertyKeyAdapter() {
}
Expand Down Expand Up @@ -189,7 +189,7 @@ private Object deserialize(final String[] types, final JsonElement json, final J
return context.deserialize(json, Object.class);
}
}
public class PropertyValueAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class PropertyValueAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public PropertyValueAdapter() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ private String toIndentedString(java.lang.Object o) {
return o.toString().replace("\n", "\n ");
}

public class ReturnStatementArgumentAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class ReturnStatementArgumentAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public ReturnStatementArgumentAdapter() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ private String toIndentedString(java.lang.Object o) {
return o.toString().replace("\n", "\n ");
}

public class UnaryExpressionArgumentAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class UnaryExpressionArgumentAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public UnaryExpressionArgumentAdapter() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ private String toIndentedString(java.lang.Object o) {
return o.toString().replace("\n", "\n ");
}

public class VariableArgumentsAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class VariableArgumentsAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public VariableArgumentsAdapter() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ private String toIndentedString(java.lang.Object o) {
return o.toString().replace("\n", "\n ");
}

public class VariableAssignmentInitAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class VariableAssignmentInitAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public VariableAssignmentInitAdapter() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ private String toIndentedString(java.lang.Object o) {
return o.toString().replace("\n", "\n ");
}

public class ViewPropertiesAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {
public static class ViewPropertiesAdapter implements JsonDeserializer<Object>, JsonSerializer<Object> {

public ViewPropertiesAdapter() {
}
Expand Down
40 changes: 40 additions & 0 deletions client/src/test/java/com/influxdb/client/GeneratedCodeTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/*
* The MIT License
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package com.influxdb.client;

import com.influxdb.client.domain.File;

import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.platform.runner.JUnitPlatform;
import org.junit.runner.RunWith;

/**
* @author Jakub Bednar (26/08/2021 6:24)
*/
@RunWith(JUnitPlatform.class)
class GeneratedCodeTest {
@Test
void adapterCanBeInstantiateWithoutParameters() {
Assertions.assertThat(new File.FileBodyAdapter()).isNotNull();
}
}
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@

<dependency.retrofit.version>2.9.0</dependency.retrofit.version>
<dependency.okhttp3.version>4.7.2</dependency.okhttp3.version>
<dependency.gson.version>2.8.5</dependency.gson.version>
<dependency.gson.version>2.8.8</dependency.gson.version>

<plugin.surefire.version>2.22.2</plugin.surefire.version>
<plugin.javadoc.version>3.2.0</plugin.javadoc.version>
Expand Down

0 comments on commit 829f1ce

Please sign in to comment.