From 7f2c7e233a5a9d644131e7ea0ba87fa924765a0d Mon Sep 17 00:00:00 2001 From: Jakub Bednar Date: Mon, 21 Feb 2022 11:59:54 +0100 Subject: [PATCH 1/4] feat(c#, java): change type of `PermissionResource.type` to String --- influxdb-client-csharp.patch | 185 +++++++ influxdb-client-java.patch | 491 ++++++++++++++++++ .../codegen/InfluxCSharpGenerator.java | 6 + .../com/influxdb/codegen/InfluxGenerator.java | 4 + .../influxdb/codegen/InfluxJavaGenerator.java | 6 + .../influxdb/codegen/InfluxPhpGenerator.java | 6 + .../codegen/InfluxPythonGenerator.java | 6 + .../influxdb/codegen/PostProcessHelper.java | 19 + .../src/main/resources/Java/pojo.mustache | 6 + .../resources/csharp/modelGeneric.mustache | 7 + 10 files changed, 736 insertions(+) create mode 100644 influxdb-client-csharp.patch diff --git a/influxdb-client-csharp.patch b/influxdb-client-csharp.patch new file mode 100644 index 0000000..589e3cb --- /dev/null +++ b/influxdb-client-csharp.patch @@ -0,0 +1,185 @@ +diff --git a/Client.Test/ItAuthorizationsApiTest.cs b/Client.Test/ItAuthorizationsApiTest.cs +index c5c82e6..4de4de3 100644 +--- a/Client.Test/ItAuthorizationsApiTest.cs ++++ b/Client.Test/ItAuthorizationsApiTest.cs +@@ -26,13 +26,13 @@ namespace InfluxDB.Client.Test + { + var readUsers = new Permission( + Permission.ActionEnum.Read, +- new PermissionResource { Type = PermissionResource.TypeEnum.Users, OrgID = _organization.Id } ++ new PermissionResource { Type = PermissionResource.TypeUsers, OrgID = _organization.Id } + ); + + var writeOrganizations = new Permission + ( + Permission.ActionEnum.Write, +- new PermissionResource { Type = PermissionResource.TypeEnum.Orgs, OrgID = _organization.Id } ++ new PermissionResource { Type = PermissionResource.TypeOrgs, OrgID = _organization.Id } + ); + + var permissions = new List { readUsers, writeOrganizations }; +@@ -47,11 +47,11 @@ namespace InfluxDB.Client.Test + Assert.AreEqual(authorization.Status, AuthorizationUpdateRequest.StatusEnum.Active); + + Assert.AreEqual(authorization.Permissions.Count, 2); +- Assert.AreEqual(authorization.Permissions[0].Resource.Type, PermissionResource.TypeEnum.Users); ++ Assert.AreEqual(authorization.Permissions[0].Resource.Type, PermissionResource.TypeUsers); + Assert.AreEqual(authorization.Permissions[0].Resource.OrgID, _organization.Id); + Assert.AreEqual(authorization.Permissions[0].Action, Permission.ActionEnum.Read); + +- Assert.AreEqual(authorization.Permissions[1].Resource.Type, PermissionResource.TypeEnum.Orgs); ++ Assert.AreEqual(authorization.Permissions[1].Resource.Type, PermissionResource.TypeOrgs); + Assert.AreEqual(authorization.Permissions[1].Resource.OrgID, _organization.Id); + Assert.AreEqual(authorization.Permissions[1].Action, Permission.ActionEnum.Write); + +@@ -66,7 +66,7 @@ namespace InfluxDB.Client.Test + public async Task AuthorizationDescription() + { + var writeSources = new Permission(Permission.ActionEnum.Write, +- new PermissionResource { Type = PermissionResource.TypeEnum.Sources, OrgID = _organization.Id } ++ new PermissionResource { Type = PermissionResource.TypeSources, OrgID = _organization.Id } + ); + + var authorization = new AuthorizationPostRequest +@@ -86,7 +86,7 @@ namespace InfluxDB.Client.Test + public async Task UpdateAuthorizationStatus() + { + var readUsers = new Permission(Permission.ActionEnum.Read, +- new PermissionResource { Type = PermissionResource.TypeEnum.Users, OrgID = _organization.Id } ++ new PermissionResource { Type = PermissionResource.TypeUsers, OrgID = _organization.Id } + ); + + var permissions = new List { readUsers }; +@@ -200,7 +200,7 @@ namespace InfluxDB.Client.Test + Assert.AreEqual(source.Description, cloned.Description); + Assert.AreEqual(1, cloned.Permissions.Count); + Assert.AreEqual(Permission.ActionEnum.Read, cloned.Permissions[0].Action); +- Assert.AreEqual(PermissionResource.TypeEnum.Users, cloned.Permissions[0].Resource.Type); ++ Assert.AreEqual(PermissionResource.TypeUsers, cloned.Permissions[0].Resource.Type); + Assert.AreEqual(_organization.Id, cloned.Permissions[0].Resource.OrgID); + } + +@@ -217,7 +217,7 @@ namespace InfluxDB.Client.Test + private List NewPermissions() + { + var resource = new PermissionResource +- { Type = PermissionResource.TypeEnum.Users, OrgID = _organization.Id }; ++ { Type = PermissionResource.TypeUsers, OrgID = _organization.Id }; + + var permission = new Permission(Permission.ActionEnum.Read, resource); + +diff --git a/Client.Test/ItDeleteApiTest.cs b/Client.Test/ItDeleteApiTest.cs +index f1b6453..3888116 100644 +--- a/Client.Test/ItDeleteApiTest.cs ++++ b/Client.Test/ItDeleteApiTest.cs +@@ -25,7 +25,7 @@ namespace InfluxDB.Client.Test + // Add Permissions to read and write to the Bucket + // + var resource = +- new PermissionResource(PermissionResource.TypeEnum.Buckets, _bucket.Id, null, ++ new PermissionResource(PermissionResource.TypeBuckets, _bucket.Id, null, + _organization.Id); + + var readBucket = new Permission(Permission.ActionEnum.Read, resource); +diff --git a/Client.Test/ItTasksApiTest.cs b/Client.Test/ItTasksApiTest.cs +index 9bf4e7f..deaace6 100644 +--- a/Client.Test/ItTasksApiTest.cs ++++ b/Client.Test/ItTasksApiTest.cs +@@ -45,13 +45,13 @@ namespace InfluxDB.Client.Test + + private async Task AddAuthorization(Organization organization) + { +- var resourceTask = new PermissionResource(PermissionResource.TypeEnum.Tasks, null, null, organization.Id); +- var resourceBucket = new PermissionResource(PermissionResource.TypeEnum.Buckets, ++ var resourceTask = new PermissionResource(PermissionResource.TypeTasks, null, null, organization.Id); ++ var resourceBucket = new PermissionResource(PermissionResource.TypeBuckets, + (await Client.GetBucketsApi().FindBucketByNameAsync("my-bucket")).Id, null, organization.Id); +- var resourceOrg = new PermissionResource(PermissionResource.TypeEnum.Orgs); +- var resourceUser = new PermissionResource(PermissionResource.TypeEnum.Users); +- var resourceAuthorization = new PermissionResource(PermissionResource.TypeEnum.Authorizations); +- var resourceLabels = new PermissionResource(PermissionResource.TypeEnum.Labels); ++ var resourceOrg = new PermissionResource(PermissionResource.TypeOrgs); ++ var resourceUser = new PermissionResource(PermissionResource.TypeUsers); ++ var resourceAuthorization = new PermissionResource(PermissionResource.TypeAuthorizations); ++ var resourceLabels = new PermissionResource(PermissionResource.TypeLabels); + + + var authorization = await Client.GetAuthorizationsApi() +diff --git a/Client.Test/ItWriteApiAsyncTest.cs b/Client.Test/ItWriteApiAsyncTest.cs +index 7b2346b..77c2222 100644 +--- a/Client.Test/ItWriteApiAsyncTest.cs ++++ b/Client.Test/ItWriteApiAsyncTest.cs +@@ -28,7 +28,7 @@ namespace InfluxDB.Client.Test + // + // Add Permissions to read and write to the Bucket + // +- var resource = new PermissionResource(PermissionResource.TypeEnum.Buckets, _bucket.Id, null, ++ var resource = new PermissionResource(PermissionResource.TypeBuckets, _bucket.Id, null, + _organization.Id); + + var readBucket = new Permission(Permission.ActionEnum.Read, resource); +diff --git a/Client.Test/ItWriteApiRaceTest.cs b/Client.Test/ItWriteApiRaceTest.cs +index edf1477..3aa2bab 100644 +--- a/Client.Test/ItWriteApiRaceTest.cs ++++ b/Client.Test/ItWriteApiRaceTest.cs +@@ -24,7 +24,7 @@ namespace InfluxDB.Client.Test + // Add Permissions to read and write to the Bucket + // + var resource = +- new PermissionResource(PermissionResource.TypeEnum.Buckets, _bucket.Id, null, _organization.Id); ++ new PermissionResource(PermissionResource.TypeBuckets, _bucket.Id, null, _organization.Id); + + var readBucket = new Permission(Permission.ActionEnum.Read, resource); + var writeBucket = new Permission(Permission.ActionEnum.Write, resource); +diff --git a/Client.Test/ItWriteQueryApiTest.cs b/Client.Test/ItWriteQueryApiTest.cs +index ce1a64a..56e158a 100644 +--- a/Client.Test/ItWriteQueryApiTest.cs ++++ b/Client.Test/ItWriteQueryApiTest.cs +@@ -31,7 +31,7 @@ namespace InfluxDB.Client.Test + // Add Permissions to read and write to the Bucket + // + var resource = +- new PermissionResource(PermissionResource.TypeEnum.Buckets, _bucket.Id, null, _organization.Id); ++ new PermissionResource(PermissionResource.TypeBuckets, _bucket.Id, null, _organization.Id); + + var readBucket = new Permission(Permission.ActionEnum.Read, resource); + var writeBucket = new Permission(Permission.ActionEnum.Write, resource); +diff --git a/Client/README.md b/Client/README.md +index 8d987ce..f3966ad 100644 +--- a/Client/README.md ++++ b/Client/README.md +@@ -815,7 +815,7 @@ namespace Examples + // + // Create access token to "iot_bucket" + // +- var resource = new PermissionResource(PermissionResource.TypeEnum.Buckets, bucket.Id, null, ++ var resource = new PermissionResource(PermissionResource.TypeBuckets, bucket.Id, null, + orgId); + + // Read permission +diff --git a/Examples/ManagementExample.cs b/Examples/ManagementExample.cs +index 7b8b5d7..0cf43c3 100644 +--- a/Examples/ManagementExample.cs ++++ b/Examples/ManagementExample.cs +@@ -30,7 +30,7 @@ namespace Examples + // + // Create access token to "iot_bucket" + // +- var resource = new PermissionResource(PermissionResource.TypeEnum.Buckets, bucket.Id, null, ++ var resource = new PermissionResource(PermissionResource.TypeBuckets, bucket.Id, null, + orgId); + + // Read permission +diff --git a/Examples/PlatformExample.cs b/Examples/PlatformExample.cs +index 6980c8c..150d134 100644 +--- a/Examples/PlatformExample.cs ++++ b/Examples/PlatformExample.cs +@@ -50,7 +50,7 @@ namespace Examples + // Add Permissions to read and write to the Bucket + // + var resource = new PermissionResource +- { Type = PermissionResource.TypeEnum.Buckets, OrgID = medicalGMBH.Id, Id = temperatureBucket.Id }; ++ { Type = PermissionResource.TypeBuckets, OrgID = medicalGMBH.Id, Id = temperatureBucket.Id }; + + var readBucket = new Permission(Permission.ActionEnum.Read, resource); + var writeBucket = new Permission(Permission.ActionEnum.Write, resource); diff --git a/influxdb-client-java.patch b/influxdb-client-java.patch index b159595..76bbac9 100644 --- a/influxdb-client-java.patch +++ b/influxdb-client-java.patch @@ -1,3 +1,229 @@ +diff --git a/README.md b/README.md +index a810e1681b..3a2c186cc8 100644 +--- a/README.md ++++ b/README.md +@@ -264,7 +264,7 @@ public class InfluxDB2ManagementExample { + PermissionResource resource = new PermissionResource(); + resource.setId(bucket.getId()); + resource.setOrgID("12bdc4164c2e8141"); +- resource.setType(PermissionResource.TypeEnum.BUCKETS); ++ resource.setType(PermissionResource.TYPE_BUCKETS); + + // Read permission + Permission read = new Permission(); +diff --git a/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITQueryKotlinApi.kt b/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITQueryKotlinApi.kt +index 0d9c0e010c..7034f526b9 100644 +--- a/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITQueryKotlinApi.kt ++++ b/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITQueryKotlinApi.kt +@@ -84,7 +84,7 @@ internal class ITQueryKotlinApi : AbstractITInfluxDBClientKotlin() { + + val resource = PermissionResource() + resource.orgID = organization.id +- resource.type = PermissionResource.TypeEnum.BUCKETS ++ resource.type = PermissionResource.TYPE_BUCKETS + resource.id = bucket.id + + val readBucket = Permission() +diff --git a/client-reactive/src/test/java/com/influxdb/client/reactive/ITWriteQueryReactiveApi.java b/client-reactive/src/test/java/com/influxdb/client/reactive/ITWriteQueryReactiveApi.java +index b2f3337cfa..f0633102ff 100644 +--- a/client-reactive/src/test/java/com/influxdb/client/reactive/ITWriteQueryReactiveApi.java ++++ b/client-reactive/src/test/java/com/influxdb/client/reactive/ITWriteQueryReactiveApi.java +@@ -80,7 +80,7 @@ class ITWriteQueryReactiveApi extends AbstractITInfluxDBClientTest { + + PermissionResource resource = new PermissionResource(); + resource.setOrgID(organization.getId()); +- resource.setType(PermissionResource.TypeEnum.BUCKETS); ++ resource.setType(PermissionResource.TYPE_BUCKETS); + resource.setId(bucket.getId()); + + Permission readBucket = new Permission(); +diff --git a/client-scala/src/test/scala/com/influxdb/client/scala/ITQueryScalaApiQuery.scala b/client-scala/src/test/scala/com/influxdb/client/scala/ITQueryScalaApiQuery.scala +index 2d61d76439..f5dfc2400a 100644 +--- a/client-scala/src/test/scala/com/influxdb/client/scala/ITQueryScalaApiQuery.scala ++++ b/client-scala/src/test/scala/com/influxdb/client/scala/ITQueryScalaApiQuery.scala +@@ -73,7 +73,7 @@ class ITQueryScalaApiQuery extends AbstractITQueryScalaApi with Matchers { + + val resource = new PermissionResource + resource.setOrgID(organization.getId) +- resource.setType(PermissionResource.TypeEnum.BUCKETS) ++ resource.setType(PermissionResource.TYPE_BUCKETS) + resource.setId(bucket.getId) + + val readBucket = new Permission +diff --git a/client/README.md b/client/README.md +index 7523728984..d2f4ec03ab 100644 +--- a/client/README.md ++++ b/client/README.md +@@ -835,7 +835,7 @@ public class InfluxDB2ManagementExample { + PermissionResource resource = new PermissionResource(); + resource.setId(bucket.getId()); + resource.setOrgID("12bdc4164c2e8141"); +- resource.setType(PermissionResource.TypeEnum.BUCKETS); ++ resource.setType(PermissionResource.TYPE_BUCKETS); + + // Read permission + Permission read = new Permission(); +diff --git a/client/src/generated/java/com/influxdb/client/domain/PermissionResource.java b/client/src/generated/java/com/influxdb/client/domain/PermissionResource.java +index 9c4770474c..1a915ec83a 100644 +--- a/client/src/generated/java/com/influxdb/client/domain/PermissionResource.java ++++ b/client/src/generated/java/com/influxdb/client/domain/PermissionResource.java +@@ -1,5 +1,5 @@ + /* +- * Influx OSS API Service ++ * InfluxDB OSS API Service + * The InfluxDB v2 API provides a programmatic interface for all interactions with InfluxDB. Access the InfluxDB API using the `/api/v2/` endpoint. + * + * OpenAPI spec version: 2.0.0 +@@ -29,100 +29,34 @@ import java.io.IOException; + */ + + public class PermissionResource { +- /** +- * Gets or Sets type +- */ +- @JsonAdapter(TypeEnum.Adapter.class) +- public enum TypeEnum { +- AUTHORIZATIONS("authorizations"), +- +- BUCKETS("buckets"), +- +- DASHBOARDS("dashboards"), +- +- ORGS("orgs"), +- +- SOURCES("sources"), +- +- TASKS("tasks"), +- +- TELEGRAFS("telegrafs"), +- +- USERS("users"), +- +- VARIABLES("variables"), +- +- SCRAPERS("scrapers"), +- +- SECRETS("secrets"), +- +- LABELS("labels"), +- +- VIEWS("views"), +- +- DOCUMENTS("documents"), +- +- NOTIFICATIONRULES("notificationRules"), +- +- NOTIFICATIONENDPOINTS("notificationEndpoints"), +- +- CHECKS("checks"), +- +- DBRP("dbrp"), +- +- NOTEBOOKS("notebooks"), +- +- ANNOTATIONS("annotations"), +- +- REMOTES("remotes"), +- +- REPLICATIONS("replications"), +- +- FLOWS("flows"), +- +- FUNCTIONS("functions"); +- +- private String value; +- +- TypeEnum(String value) { +- this.value = value; +- } +- +- public String getValue() { +- return value; +- } +- +- @Override +- public String toString() { +- return String.valueOf(value); +- } +- +- public static TypeEnum fromValue(String text) { +- for (TypeEnum b : TypeEnum.values()) { +- if (String.valueOf(b.value).equals(text)) { +- return b; +- } +- } +- return null; +- } +- +- public static class Adapter extends TypeAdapter { +- @Override +- public void write(final JsonWriter jsonWriter, final TypeEnum enumeration) throws IOException { +- jsonWriter.value(enumeration.getValue()); +- } +- +- @Override +- public TypeEnum read(final JsonReader jsonReader) throws IOException { +- String value = jsonReader.nextString(); +- return TypeEnum.fromValue(String.valueOf(value)); +- } +- } +- } +- ++ // Possible values for type property: ++ public static String TYPE_AUTHORIZATIONS = "authorizations"; ++ public static String TYPE_BUCKETS = "buckets"; ++ public static String TYPE_DASHBOARDS = "dashboards"; ++ public static String TYPE_ORGS = "orgs"; ++ public static String TYPE_SOURCES = "sources"; ++ public static String TYPE_TASKS = "tasks"; ++ public static String TYPE_TELEGRAFS = "telegrafs"; ++ public static String TYPE_USERS = "users"; ++ public static String TYPE_VARIABLES = "variables"; ++ public static String TYPE_SCRAPERS = "scrapers"; ++ public static String TYPE_SECRETS = "secrets"; ++ public static String TYPE_LABELS = "labels"; ++ public static String TYPE_VIEWS = "views"; ++ public static String TYPE_DOCUMENTS = "documents"; ++ public static String TYPE_NOTIFICATIONRULES = "notificationRules"; ++ public static String TYPE_NOTIFICATIONENDPOINTS = "notificationEndpoints"; ++ public static String TYPE_CHECKS = "checks"; ++ public static String TYPE_DBRP = "dbrp"; ++ public static String TYPE_NOTEBOOKS = "notebooks"; ++ public static String TYPE_ANNOTATIONS = "annotations"; ++ public static String TYPE_REMOTES = "remotes"; ++ public static String TYPE_REPLICATIONS = "replications"; ++ public static String TYPE_FLOWS = "flows"; ++ public static String TYPE_FUNCTIONS = "functions"; + public static final String SERIALIZED_NAME_TYPE = "type"; + @SerializedName(SERIALIZED_NAME_TYPE) +- private TypeEnum type; ++ private String type; + + public static final String SERIALIZED_NAME_ID = "id"; + @SerializedName(SERIALIZED_NAME_ID) +@@ -140,7 +74,7 @@ public class PermissionResource { + @SerializedName(SERIALIZED_NAME_ORG) + private String org; + +- public PermissionResource type(TypeEnum type) { ++ public PermissionResource type(String type) { + this.type = type; + return this; + } +@@ -150,11 +84,11 @@ public class PermissionResource { + * @return type + **/ + @ApiModelProperty(required = true, value = "") +- public TypeEnum getType() { ++ public String getType() { + return type; + } + +- public void setType(TypeEnum type) { ++ public void setType(String type) { + this.type = type; + } + diff --git a/client/src/main/java/com/influxdb/client/TelegrafsApi.java b/client/src/main/java/com/influxdb/client/TelegrafsApi.java index fd886a48e0..836d2d5721 100644 --- a/client/src/main/java/com/influxdb/client/TelegrafsApi.java @@ -215,6 +441,205 @@ index e171a4a62e..c42e31455a 100644 - } } \ No newline at end of file +diff --git a/client/src/test/java/com/influxdb/client/AbstractITWrite.java b/client/src/test/java/com/influxdb/client/AbstractITWrite.java +index 554fb22ba4..9f40028498 100644 +--- a/client/src/test/java/com/influxdb/client/AbstractITWrite.java ++++ b/client/src/test/java/com/influxdb/client/AbstractITWrite.java +@@ -52,7 +52,7 @@ abstract class AbstractITWrite extends AbstractITClientTest { + PermissionResource resource = new PermissionResource(); + resource.setId(bucket.getId()); + resource.setOrgID(organization.getId()); +- resource.setType(PermissionResource.TypeEnum.BUCKETS); ++ resource.setType(PermissionResource.TYPE_BUCKETS); + + // + // Add Permissions to read and write to the Bucket +diff --git a/client/src/test/java/com/influxdb/client/ITAuthorizationsApi.java b/client/src/test/java/com/influxdb/client/ITAuthorizationsApi.java +index 3f4038dbfc..779869e0d4 100644 +--- a/client/src/test/java/com/influxdb/client/ITAuthorizationsApi.java ++++ b/client/src/test/java/com/influxdb/client/ITAuthorizationsApi.java +@@ -68,7 +68,7 @@ class ITAuthorizationsApi extends AbstractITClientTest { + + PermissionResource userResource = new PermissionResource(); + userResource.setOrgID(organization.getId()); +- userResource.setType(PermissionResource.TypeEnum.USERS); ++ userResource.setType(PermissionResource.TYPE_USERS); + + Permission readUsers = new Permission(); + readUsers.setAction(Permission.ActionEnum.READ); +@@ -76,7 +76,7 @@ class ITAuthorizationsApi extends AbstractITClientTest { + + PermissionResource orgResource = new PermissionResource(); + orgResource.setOrgID(organization.getId()); +- orgResource.setType(PermissionResource.TypeEnum.ORGS); ++ orgResource.setType(PermissionResource.TYPE_ORGS); + + Permission writeOrganizations = new Permission(); + writeOrganizations.setAction(Permission.ActionEnum.WRITE); +@@ -100,11 +100,11 @@ class ITAuthorizationsApi extends AbstractITClientTest { + Assertions.assertThat(authorization.getStatus()).isEqualTo(Authorization.StatusEnum.ACTIVE); + + Assertions.assertThat(authorization.getPermissions()).hasSize(2); +- Assertions.assertThat(authorization.getPermissions().get(0).getResource().getType()).isEqualTo(PermissionResource.TypeEnum.USERS); ++ Assertions.assertThat(authorization.getPermissions().get(0).getResource().getType()).isEqualTo(PermissionResource.TYPE_USERS); + Assertions.assertThat(authorization.getPermissions().get(0).getResource().getOrgID()).isEqualTo(organization.getId()); + Assertions.assertThat(authorization.getPermissions().get(0).getAction()).isEqualTo(Permission.ActionEnum.READ); + +- Assertions.assertThat(authorization.getPermissions().get(1).getResource().getType()).isEqualTo(PermissionResource.TypeEnum.ORGS); ++ Assertions.assertThat(authorization.getPermissions().get(1).getResource().getType()).isEqualTo(PermissionResource.TYPE_ORGS); + Assertions.assertThat(authorization.getPermissions().get(1).getResource().getOrgID()).isEqualTo(organization.getId()); + Assertions.assertThat(authorization.getPermissions().get(1).getAction()).isEqualTo(Permission.ActionEnum.WRITE); + +@@ -118,7 +118,7 @@ class ITAuthorizationsApi extends AbstractITClientTest { + + PermissionResource resource = new PermissionResource(); + resource.setOrgID(organization.getId()); +- resource.setType(PermissionResource.TypeEnum.SOURCES); ++ resource.setType(PermissionResource.TYPE_SOURCES); + + Permission createSource = new Permission(); + createSource.setResource(resource); +@@ -144,7 +144,7 @@ class ITAuthorizationsApi extends AbstractITClientTest { + + PermissionResource resource = new PermissionResource(); + resource.setOrgID(organization.getId()); +- resource.setType(PermissionResource.TypeEnum.TASKS); ++ resource.setType(PermissionResource.TYPE_TASKS); + + Permission createTask = new Permission(); + createTask.setResource(resource); +@@ -161,10 +161,10 @@ class ITAuthorizationsApi extends AbstractITClientTest { + Authorization authorization = authorizationsApi.createAuthorization(organization, permissions); + + Assertions.assertThat(authorization.getPermissions()).hasSize(2); +- Assertions.assertThat(authorization.getPermissions().get(0).getResource().getType()).isEqualTo(PermissionResource.TypeEnum.TASKS); ++ Assertions.assertThat(authorization.getPermissions().get(0).getResource().getType()).isEqualTo(PermissionResource.TYPE_TASKS); + Assertions.assertThat(authorization.getPermissions().get(0).getResource().getOrgID()).isEqualTo(organization.getId()); + Assertions.assertThat(authorization.getPermissions().get(0).getAction()).isEqualTo(Permission.ActionEnum.READ); +- Assertions.assertThat(authorization.getPermissions().get(1).getResource().getType()).isEqualTo(PermissionResource.TypeEnum.TASKS); ++ Assertions.assertThat(authorization.getPermissions().get(1).getResource().getType()).isEqualTo(PermissionResource.TYPE_TASKS); + Assertions.assertThat(authorization.getPermissions().get(1).getResource().getOrgID()).isEqualTo(organization.getId()); + Assertions.assertThat(authorization.getPermissions().get(1).getAction()).isEqualTo(Permission.ActionEnum.WRITE); + } +@@ -177,7 +177,7 @@ class ITAuthorizationsApi extends AbstractITClientTest { + + PermissionResource resource = new PermissionResource(); + resource.setOrgID(organization.getId()); +- resource.setType(PermissionResource.TypeEnum.BUCKETS); ++ resource.setType(PermissionResource.TYPE_BUCKETS); + resource.setId(bucket.getId()); + + Permission readBucket = new Permission(); +@@ -196,10 +196,10 @@ class ITAuthorizationsApi extends AbstractITClientTest { + + Assertions.assertThat(authorization.getPermissions()).hasSize(2); + Assertions.assertThat(authorization.getPermissions().get(0).getResource().getId()).isEqualTo(bucket.getId()); +- Assertions.assertThat(authorization.getPermissions().get(0).getResource().getType()).isEqualTo(PermissionResource.TypeEnum.BUCKETS); ++ Assertions.assertThat(authorization.getPermissions().get(0).getResource().getType()).isEqualTo(PermissionResource.TYPE_BUCKETS); + Assertions.assertThat(authorization.getPermissions().get(0).getAction()).isEqualTo(Permission.ActionEnum.READ); + Assertions.assertThat(authorization.getPermissions().get(1).getResource().getId()).isEqualTo(bucket.getId()); +- Assertions.assertThat(authorization.getPermissions().get(1).getResource().getType()).isEqualTo(PermissionResource.TypeEnum.BUCKETS); ++ Assertions.assertThat(authorization.getPermissions().get(1).getResource().getType()).isEqualTo(PermissionResource.TYPE_BUCKETS); + Assertions.assertThat(authorization.getPermissions().get(1).getAction()).isEqualTo(Permission.ActionEnum.WRITE); + } + +@@ -283,7 +283,7 @@ class ITAuthorizationsApi extends AbstractITClientTest { + + PermissionResource resource = new PermissionResource(); + resource.setOrgID(organization.getId()); +- resource.setType(PermissionResource.TypeEnum.USERS); ++ resource.setType(PermissionResource.TYPE_USERS); + + Permission readUsers = new Permission(); + readUsers.setAction(Permission.ActionEnum.READ); +@@ -341,7 +341,7 @@ class ITAuthorizationsApi extends AbstractITClientTest { + Assertions.assertThat(cloned.getDescription()).isEqualTo(source.getDescription()); + Assertions.assertThat(cloned.getPermissions()).hasSize(1); + Assertions.assertThat(cloned.getPermissions().get(0).getAction()).isEqualTo(Permission.ActionEnum.READ); +- Assertions.assertThat(cloned.getPermissions().get(0).getResource().getType()).isEqualTo(PermissionResource.TypeEnum.USERS); ++ Assertions.assertThat(cloned.getPermissions().get(0).getResource().getType()).isEqualTo(PermissionResource.TYPE_USERS); + Assertions.assertThat(cloned.getPermissions().get(0).getResource().getOrgID()).isEqualTo(organization.getId()); + } + +@@ -358,7 +358,7 @@ class ITAuthorizationsApi extends AbstractITClientTest { + + PermissionResource resource = new PermissionResource(); + resource.setOrgID(organization.getId()); +- resource.setType(PermissionResource.TypeEnum.USERS); ++ resource.setType(PermissionResource.TYPE_USERS); + + Permission permission = new Permission(); + permission.setAction(Permission.ActionEnum.READ); +diff --git a/client/src/test/java/com/influxdb/client/ITDeleteApi.java b/client/src/test/java/com/influxdb/client/ITDeleteApi.java +index b9fe2470c0..e813812046 100644 +--- a/client/src/test/java/com/influxdb/client/ITDeleteApi.java ++++ b/client/src/test/java/com/influxdb/client/ITDeleteApi.java +@@ -67,7 +67,7 @@ class ITDeleteApi extends AbstractITClientTest { + PermissionResource resource = new PermissionResource(); + resource.setId(bucket.getId()); + resource.setOrgID(organization.getId()); +- resource.setType(PermissionResource.TypeEnum.BUCKETS); ++ resource.setType(PermissionResource.TYPE_BUCKETS); + + // + // Add Permissions to read and write to the Bucket +diff --git a/client/src/test/java/com/influxdb/client/ITTasksApi.java b/client/src/test/java/com/influxdb/client/ITTasksApi.java +index a2b1a8f69b..1c930fd21e 100644 +--- a/client/src/test/java/com/influxdb/client/ITTasksApi.java ++++ b/client/src/test/java/com/influxdb/client/ITTasksApi.java +@@ -731,7 +731,7 @@ class ITTasksApi extends AbstractITClientTest { + + PermissionResource resource = new PermissionResource(); + resource.setOrgID(organization.getId()); +- resource.setType(PermissionResource.TypeEnum.TASKS); ++ resource.setType(PermissionResource.TYPE_TASKS); + + Permission createTask = new Permission(); + createTask.setResource(resource); +@@ -742,7 +742,7 @@ class ITTasksApi extends AbstractITClientTest { + deleteTask.setAction(Permission.ActionEnum.WRITE); + + PermissionResource orgResource = new PermissionResource(); +- orgResource.setType(PermissionResource.TypeEnum.ORGS); ++ orgResource.setType(PermissionResource.TYPE_ORGS); + + Permission createOrg = new Permission(); + createOrg.setAction(Permission.ActionEnum.WRITE); +@@ -753,14 +753,14 @@ class ITTasksApi extends AbstractITClientTest { + readOrg.setResource(orgResource); + + PermissionResource userResource = new PermissionResource(); +- userResource.setType(PermissionResource.TypeEnum.USERS); ++ userResource.setType(PermissionResource.TYPE_USERS); + + Permission createUsers = new Permission(); + createUsers.setAction(Permission.ActionEnum.WRITE); + createUsers.setResource(userResource); + + PermissionResource labelResource = new PermissionResource(); +- labelResource.setType(PermissionResource.TypeEnum.LABELS); ++ labelResource.setType(PermissionResource.TYPE_LABELS); + + Permission createLabels = new Permission(); + createLabels.setAction(Permission.ActionEnum.WRITE); +@@ -771,7 +771,7 @@ class ITTasksApi extends AbstractITClientTest { + readLabels.setResource(labelResource); + + PermissionResource authResource = new PermissionResource(); +- authResource.setType(PermissionResource.TypeEnum.AUTHORIZATIONS); ++ authResource.setType(PermissionResource.TYPE_AUTHORIZATIONS); + + Permission createAuth = new Permission(); + createAuth.setAction(Permission.ActionEnum.WRITE); +@@ -782,7 +782,7 @@ class ITTasksApi extends AbstractITClientTest { + + PermissionResource bucketResource = new PermissionResource(); + bucketResource.setOrgID(organization.getId()); +- bucketResource.setType(PermissionResource.TypeEnum.BUCKETS); ++ bucketResource.setType(PermissionResource.TYPE_BUCKETS); + bucketResource.setId(bucket.getId()); + + Permission readBucket = new Permission(); diff --git a/client/src/test/java/com/influxdb/client/ITTelegrafsApi.java b/client/src/test/java/com/influxdb/client/ITTelegrafsApi.java index 24239705fe..64b71bf80e 100644 --- a/client/src/test/java/com/influxdb/client/ITTelegrafsApi.java @@ -313,3 +738,69 @@ index 24239705fe..64b71bf80e 100644 .name("influxdb_v2") .description("my instance") .putConfigItem("organization", "my-org") +diff --git a/client/src/test/java/com/influxdb/client/ITWriteQueryApi.java b/client/src/test/java/com/influxdb/client/ITWriteQueryApi.java +index 1bef8d0732..c05d04680e 100644 +--- a/client/src/test/java/com/influxdb/client/ITWriteQueryApi.java ++++ b/client/src/test/java/com/influxdb/client/ITWriteQueryApi.java +@@ -78,7 +78,7 @@ class ITWriteQueryApi extends AbstractITClientTest { + PermissionResource resource = new PermissionResource(); + resource.setId(bucket.getId()); + resource.setOrgID(organization.getId()); +- resource.setType(PermissionResource.TypeEnum.BUCKETS); ++ resource.setType(PermissionResource.TYPE_BUCKETS); + + // + // Add Permissions to read and write to the Bucket +@@ -409,7 +409,7 @@ class ITWriteQueryApi extends AbstractITClientTest { + PermissionResource bucketResource = new PermissionResource(); + bucketResource.setId(bucket.getId()); + bucketResource.setOrgID(organization.getId()); +- bucketResource.setType(PermissionResource.TypeEnum.BUCKETS); ++ bucketResource.setType(PermissionResource.TYPE_BUCKETS); + + Permission readBucket = new Permission(); + readBucket.setResource(bucketResource); +@@ -422,7 +422,7 @@ class ITWriteQueryApi extends AbstractITClientTest { + PermissionResource orgResource = new PermissionResource(); + orgResource.setId(organization.getId()); + orgResource.setOrgID(organization.getId()); +- orgResource.setType(PermissionResource.TypeEnum.ORGS); ++ orgResource.setType(PermissionResource.TYPE_ORGS); + + Permission readOrganization = new Permission(); + readOrganization.setResource(orgResource); +diff --git a/examples/src/main/java/example/InfluxDB2ManagementExample.java b/examples/src/main/java/example/InfluxDB2ManagementExample.java +index b343261d80..7c5c611581 100644 +--- a/examples/src/main/java/example/InfluxDB2ManagementExample.java ++++ b/examples/src/main/java/example/InfluxDB2ManagementExample.java +@@ -53,7 +53,7 @@ public class InfluxDB2ManagementExample { + PermissionResource resource = new PermissionResource(); + resource.setId(bucket.getId()); + resource.setOrgID("12bdc4164c2e8141"); +- resource.setType(PermissionResource.TypeEnum.BUCKETS); ++ resource.setType(PermissionResource.TYPE_BUCKETS); + + // Read permission + Permission read = new Permission(); +diff --git a/examples/src/main/java/example/PlatformExample.java b/examples/src/main/java/example/PlatformExample.java +index 1759b0f25e..ae5bd67733 100644 +--- a/examples/src/main/java/example/PlatformExample.java ++++ b/examples/src/main/java/example/PlatformExample.java +@@ -92,7 +92,7 @@ public class PlatformExample { + PermissionResource resource = new PermissionResource(); + resource.setId(temperatureBucket.getId()); + resource.setOrgID(medicalGMBH.getId()); +- resource.setType(PermissionResource.TypeEnum.BUCKETS); ++ resource.setType(PermissionResource.TYPE_BUCKETS); + + Permission readBucket = new Permission(); + readBucket.setResource(resource); +@@ -180,7 +180,7 @@ public class PlatformExample { + .filter(authorization -> authorization.getPermissions().stream() + .map(Permission::getResource) + .anyMatch(resource -> +- resource.getType().equals(PermissionResource.TypeEnum.ORGS) && ++ resource.getType().equals(PermissionResource.TYPE_ORGS) && + resource.getId() == null && + resource.getOrgID() == null)) + .findFirst() diff --git a/openapi-generator/src/main/java/com/influxdb/codegen/InfluxCSharpGenerator.java b/openapi-generator/src/main/java/com/influxdb/codegen/InfluxCSharpGenerator.java index 3df875b..28d9abf 100644 --- a/openapi-generator/src/main/java/com/influxdb/codegen/InfluxCSharpGenerator.java +++ b/openapi-generator/src/main/java/com/influxdb/codegen/InfluxCSharpGenerator.java @@ -244,6 +244,12 @@ public boolean supportsStacksTemplates() return true; } + @Override + public boolean permissionResourceTypeAsString() + { + return true; + } + @NotNull @Override public Collection getTypeAdapterImports() diff --git a/openapi-generator/src/main/java/com/influxdb/codegen/InfluxGenerator.java b/openapi-generator/src/main/java/com/influxdb/codegen/InfluxGenerator.java index 7a85d52..0443ddc 100644 --- a/openapi-generator/src/main/java/com/influxdb/codegen/InfluxGenerator.java +++ b/openapi-generator/src/main/java/com/influxdb/codegen/InfluxGenerator.java @@ -17,6 +17,8 @@ public interface InfluxGenerator String toEnumConstructorDefaultValue(String value, String datatype); + String toEnumVarName(String value, String datatype); + @Nullable String optionalDatatypeKeyword(); @@ -28,6 +30,8 @@ public interface InfluxGenerator boolean supportsStacksTemplates(); + boolean permissionResourceTypeAsString(); + @Nonnull Collection getTypeAdapterImports(); } diff --git a/openapi-generator/src/main/java/com/influxdb/codegen/InfluxJavaGenerator.java b/openapi-generator/src/main/java/com/influxdb/codegen/InfluxJavaGenerator.java index 6184825..e83d70d 100644 --- a/openapi-generator/src/main/java/com/influxdb/codegen/InfluxJavaGenerator.java +++ b/openapi-generator/src/main/java/com/influxdb/codegen/InfluxJavaGenerator.java @@ -451,6 +451,12 @@ public boolean supportsStacksTemplates() return false; } + @Override + public boolean permissionResourceTypeAsString() + { + return true; + } + @NotNull @Override public Collection getTypeAdapterImports() diff --git a/openapi-generator/src/main/java/com/influxdb/codegen/InfluxPhpGenerator.java b/openapi-generator/src/main/java/com/influxdb/codegen/InfluxPhpGenerator.java index 1ab8e1f..47df650 100644 --- a/openapi-generator/src/main/java/com/influxdb/codegen/InfluxPhpGenerator.java +++ b/openapi-generator/src/main/java/com/influxdb/codegen/InfluxPhpGenerator.java @@ -209,6 +209,12 @@ public boolean supportsStacksTemplates() return false; } + @Override + public boolean permissionResourceTypeAsString() + { + return false; + } + @NotNull @Override public Collection getTypeAdapterImports() diff --git a/openapi-generator/src/main/java/com/influxdb/codegen/InfluxPythonGenerator.java b/openapi-generator/src/main/java/com/influxdb/codegen/InfluxPythonGenerator.java index e69bc7e..8bfab38 100644 --- a/openapi-generator/src/main/java/com/influxdb/codegen/InfluxPythonGenerator.java +++ b/openapi-generator/src/main/java/com/influxdb/codegen/InfluxPythonGenerator.java @@ -205,6 +205,12 @@ public boolean supportsStacksTemplates() return true; } + @Override + public boolean permissionResourceTypeAsString() + { + return false; + } + @NotNull @Override public Collection getTypeAdapterImports() diff --git a/openapi-generator/src/main/java/com/influxdb/codegen/PostProcessHelper.java b/openapi-generator/src/main/java/com/influxdb/codegen/PostProcessHelper.java index 2ff5b3b..38d9994 100644 --- a/openapi-generator/src/main/java/com/influxdb/codegen/PostProcessHelper.java +++ b/openapi-generator/src/main/java/com/influxdb/codegen/PostProcessHelper.java @@ -192,6 +192,25 @@ void postProcessOpenAPI() } } + // + // Change PermissionResource type to String schema - fixup to avoid exception for non-existing item + // + if (generator.permissionResourceTypeAsString()) + { + StringSchema oldSchema = (StringSchema) openAPI.getComponents().getSchemas().get("Resource").getProperties().get("type"); + StringSchema newSchema = new StringSchema(); + List> staticValues = oldSchema.getEnum().stream().map(item -> { + Map map = new HashMap<>(); + map.put("title", generator.toEnumVarName("type_" + org.openapitools.codegen.utils.StringUtils.camelize(item), oldSchema.getType())); + map.put("value", item); + + return map; + }).collect(Collectors.toList()); + newSchema.addExtension("x-static-values", staticValues); + newSchema.addExtension("x-has-static-values", true); + changePropertySchema("type", "Resource", newSchema); + } + // // Drop supports for Geo // diff --git a/openapi-generator/src/main/resources/Java/pojo.mustache b/openapi-generator/src/main/resources/Java/pojo.mustache index 426c59c..94a1074 100644 --- a/openapi-generator/src/main/resources/Java/pojo.mustache +++ b/openapi-generator/src/main/resources/Java/pojo.mustache @@ -78,6 +78,12 @@ public class {{classname}}{{#vendorExtensions.x-has-generic-type}}{{{vendorExten {{/isContainer}} {{/isXmlAttribute}} {{/withXml}} + {{#vendorExtensions.x-has-static-values}} + // Possible values for {{name}} property: + {{/vendorExtensions.x-has-static-values}} + {{#vendorExtensions.x-static-values}} + public static String {{title}} = "{{value}}"; + {{/vendorExtensions.x-static-values}} {{#gson}} public static final String SERIALIZED_NAME_{{nameInSnakeCase}} = "{{baseName}}"; @SerializedName(SERIALIZED_NAME_{{nameInSnakeCase}}) diff --git a/openapi-generator/src/main/resources/csharp/modelGeneric.mustache b/openapi-generator/src/main/resources/csharp/modelGeneric.mustache index 44f19c7..2a439f8 100644 --- a/openapi-generator/src/main/resources/csharp/modelGeneric.mustache +++ b/openapi-generator/src/main/resources/csharp/modelGeneric.mustache @@ -99,6 +99,13 @@ this.{{name}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}; {{#vars}} {{^isInherited}} {{^isEnum}} + {{#vendorExtensions.x-has-static-values}} + // Possible values for {{name}} property: + {{#vendorExtensions.x-static-values}} + public const string {{title}} = "{{value}}"; + {{/vendorExtensions.x-static-values}} + + {{/vendorExtensions.x-has-static-values}} /// /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{description}}{{/description}} /// {{#description}} From c5dd1b60f0bdd5c2f91daaf92d4d69b228368248 Mon Sep 17 00:00:00 2001 From: Jakub Bednar Date: Mon, 21 Feb 2022 12:02:46 +0100 Subject: [PATCH 2/4] feat(c#, java): rollback patches --- influxdb-client-csharp.patch | 185 ------------- influxdb-client-java.patch | 491 ----------------------------------- 2 files changed, 676 deletions(-) delete mode 100644 influxdb-client-csharp.patch diff --git a/influxdb-client-csharp.patch b/influxdb-client-csharp.patch deleted file mode 100644 index 589e3cb..0000000 --- a/influxdb-client-csharp.patch +++ /dev/null @@ -1,185 +0,0 @@ -diff --git a/Client.Test/ItAuthorizationsApiTest.cs b/Client.Test/ItAuthorizationsApiTest.cs -index c5c82e6..4de4de3 100644 ---- a/Client.Test/ItAuthorizationsApiTest.cs -+++ b/Client.Test/ItAuthorizationsApiTest.cs -@@ -26,13 +26,13 @@ namespace InfluxDB.Client.Test - { - var readUsers = new Permission( - Permission.ActionEnum.Read, -- new PermissionResource { Type = PermissionResource.TypeEnum.Users, OrgID = _organization.Id } -+ new PermissionResource { Type = PermissionResource.TypeUsers, OrgID = _organization.Id } - ); - - var writeOrganizations = new Permission - ( - Permission.ActionEnum.Write, -- new PermissionResource { Type = PermissionResource.TypeEnum.Orgs, OrgID = _organization.Id } -+ new PermissionResource { Type = PermissionResource.TypeOrgs, OrgID = _organization.Id } - ); - - var permissions = new List { readUsers, writeOrganizations }; -@@ -47,11 +47,11 @@ namespace InfluxDB.Client.Test - Assert.AreEqual(authorization.Status, AuthorizationUpdateRequest.StatusEnum.Active); - - Assert.AreEqual(authorization.Permissions.Count, 2); -- Assert.AreEqual(authorization.Permissions[0].Resource.Type, PermissionResource.TypeEnum.Users); -+ Assert.AreEqual(authorization.Permissions[0].Resource.Type, PermissionResource.TypeUsers); - Assert.AreEqual(authorization.Permissions[0].Resource.OrgID, _organization.Id); - Assert.AreEqual(authorization.Permissions[0].Action, Permission.ActionEnum.Read); - -- Assert.AreEqual(authorization.Permissions[1].Resource.Type, PermissionResource.TypeEnum.Orgs); -+ Assert.AreEqual(authorization.Permissions[1].Resource.Type, PermissionResource.TypeOrgs); - Assert.AreEqual(authorization.Permissions[1].Resource.OrgID, _organization.Id); - Assert.AreEqual(authorization.Permissions[1].Action, Permission.ActionEnum.Write); - -@@ -66,7 +66,7 @@ namespace InfluxDB.Client.Test - public async Task AuthorizationDescription() - { - var writeSources = new Permission(Permission.ActionEnum.Write, -- new PermissionResource { Type = PermissionResource.TypeEnum.Sources, OrgID = _organization.Id } -+ new PermissionResource { Type = PermissionResource.TypeSources, OrgID = _organization.Id } - ); - - var authorization = new AuthorizationPostRequest -@@ -86,7 +86,7 @@ namespace InfluxDB.Client.Test - public async Task UpdateAuthorizationStatus() - { - var readUsers = new Permission(Permission.ActionEnum.Read, -- new PermissionResource { Type = PermissionResource.TypeEnum.Users, OrgID = _organization.Id } -+ new PermissionResource { Type = PermissionResource.TypeUsers, OrgID = _organization.Id } - ); - - var permissions = new List { readUsers }; -@@ -200,7 +200,7 @@ namespace InfluxDB.Client.Test - Assert.AreEqual(source.Description, cloned.Description); - Assert.AreEqual(1, cloned.Permissions.Count); - Assert.AreEqual(Permission.ActionEnum.Read, cloned.Permissions[0].Action); -- Assert.AreEqual(PermissionResource.TypeEnum.Users, cloned.Permissions[0].Resource.Type); -+ Assert.AreEqual(PermissionResource.TypeUsers, cloned.Permissions[0].Resource.Type); - Assert.AreEqual(_organization.Id, cloned.Permissions[0].Resource.OrgID); - } - -@@ -217,7 +217,7 @@ namespace InfluxDB.Client.Test - private List NewPermissions() - { - var resource = new PermissionResource -- { Type = PermissionResource.TypeEnum.Users, OrgID = _organization.Id }; -+ { Type = PermissionResource.TypeUsers, OrgID = _organization.Id }; - - var permission = new Permission(Permission.ActionEnum.Read, resource); - -diff --git a/Client.Test/ItDeleteApiTest.cs b/Client.Test/ItDeleteApiTest.cs -index f1b6453..3888116 100644 ---- a/Client.Test/ItDeleteApiTest.cs -+++ b/Client.Test/ItDeleteApiTest.cs -@@ -25,7 +25,7 @@ namespace InfluxDB.Client.Test - // Add Permissions to read and write to the Bucket - // - var resource = -- new PermissionResource(PermissionResource.TypeEnum.Buckets, _bucket.Id, null, -+ new PermissionResource(PermissionResource.TypeBuckets, _bucket.Id, null, - _organization.Id); - - var readBucket = new Permission(Permission.ActionEnum.Read, resource); -diff --git a/Client.Test/ItTasksApiTest.cs b/Client.Test/ItTasksApiTest.cs -index 9bf4e7f..deaace6 100644 ---- a/Client.Test/ItTasksApiTest.cs -+++ b/Client.Test/ItTasksApiTest.cs -@@ -45,13 +45,13 @@ namespace InfluxDB.Client.Test - - private async Task AddAuthorization(Organization organization) - { -- var resourceTask = new PermissionResource(PermissionResource.TypeEnum.Tasks, null, null, organization.Id); -- var resourceBucket = new PermissionResource(PermissionResource.TypeEnum.Buckets, -+ var resourceTask = new PermissionResource(PermissionResource.TypeTasks, null, null, organization.Id); -+ var resourceBucket = new PermissionResource(PermissionResource.TypeBuckets, - (await Client.GetBucketsApi().FindBucketByNameAsync("my-bucket")).Id, null, organization.Id); -- var resourceOrg = new PermissionResource(PermissionResource.TypeEnum.Orgs); -- var resourceUser = new PermissionResource(PermissionResource.TypeEnum.Users); -- var resourceAuthorization = new PermissionResource(PermissionResource.TypeEnum.Authorizations); -- var resourceLabels = new PermissionResource(PermissionResource.TypeEnum.Labels); -+ var resourceOrg = new PermissionResource(PermissionResource.TypeOrgs); -+ var resourceUser = new PermissionResource(PermissionResource.TypeUsers); -+ var resourceAuthorization = new PermissionResource(PermissionResource.TypeAuthorizations); -+ var resourceLabels = new PermissionResource(PermissionResource.TypeLabels); - - - var authorization = await Client.GetAuthorizationsApi() -diff --git a/Client.Test/ItWriteApiAsyncTest.cs b/Client.Test/ItWriteApiAsyncTest.cs -index 7b2346b..77c2222 100644 ---- a/Client.Test/ItWriteApiAsyncTest.cs -+++ b/Client.Test/ItWriteApiAsyncTest.cs -@@ -28,7 +28,7 @@ namespace InfluxDB.Client.Test - // - // Add Permissions to read and write to the Bucket - // -- var resource = new PermissionResource(PermissionResource.TypeEnum.Buckets, _bucket.Id, null, -+ var resource = new PermissionResource(PermissionResource.TypeBuckets, _bucket.Id, null, - _organization.Id); - - var readBucket = new Permission(Permission.ActionEnum.Read, resource); -diff --git a/Client.Test/ItWriteApiRaceTest.cs b/Client.Test/ItWriteApiRaceTest.cs -index edf1477..3aa2bab 100644 ---- a/Client.Test/ItWriteApiRaceTest.cs -+++ b/Client.Test/ItWriteApiRaceTest.cs -@@ -24,7 +24,7 @@ namespace InfluxDB.Client.Test - // Add Permissions to read and write to the Bucket - // - var resource = -- new PermissionResource(PermissionResource.TypeEnum.Buckets, _bucket.Id, null, _organization.Id); -+ new PermissionResource(PermissionResource.TypeBuckets, _bucket.Id, null, _organization.Id); - - var readBucket = new Permission(Permission.ActionEnum.Read, resource); - var writeBucket = new Permission(Permission.ActionEnum.Write, resource); -diff --git a/Client.Test/ItWriteQueryApiTest.cs b/Client.Test/ItWriteQueryApiTest.cs -index ce1a64a..56e158a 100644 ---- a/Client.Test/ItWriteQueryApiTest.cs -+++ b/Client.Test/ItWriteQueryApiTest.cs -@@ -31,7 +31,7 @@ namespace InfluxDB.Client.Test - // Add Permissions to read and write to the Bucket - // - var resource = -- new PermissionResource(PermissionResource.TypeEnum.Buckets, _bucket.Id, null, _organization.Id); -+ new PermissionResource(PermissionResource.TypeBuckets, _bucket.Id, null, _organization.Id); - - var readBucket = new Permission(Permission.ActionEnum.Read, resource); - var writeBucket = new Permission(Permission.ActionEnum.Write, resource); -diff --git a/Client/README.md b/Client/README.md -index 8d987ce..f3966ad 100644 ---- a/Client/README.md -+++ b/Client/README.md -@@ -815,7 +815,7 @@ namespace Examples - // - // Create access token to "iot_bucket" - // -- var resource = new PermissionResource(PermissionResource.TypeEnum.Buckets, bucket.Id, null, -+ var resource = new PermissionResource(PermissionResource.TypeBuckets, bucket.Id, null, - orgId); - - // Read permission -diff --git a/Examples/ManagementExample.cs b/Examples/ManagementExample.cs -index 7b8b5d7..0cf43c3 100644 ---- a/Examples/ManagementExample.cs -+++ b/Examples/ManagementExample.cs -@@ -30,7 +30,7 @@ namespace Examples - // - // Create access token to "iot_bucket" - // -- var resource = new PermissionResource(PermissionResource.TypeEnum.Buckets, bucket.Id, null, -+ var resource = new PermissionResource(PermissionResource.TypeBuckets, bucket.Id, null, - orgId); - - // Read permission -diff --git a/Examples/PlatformExample.cs b/Examples/PlatformExample.cs -index 6980c8c..150d134 100644 ---- a/Examples/PlatformExample.cs -+++ b/Examples/PlatformExample.cs -@@ -50,7 +50,7 @@ namespace Examples - // Add Permissions to read and write to the Bucket - // - var resource = new PermissionResource -- { Type = PermissionResource.TypeEnum.Buckets, OrgID = medicalGMBH.Id, Id = temperatureBucket.Id }; -+ { Type = PermissionResource.TypeBuckets, OrgID = medicalGMBH.Id, Id = temperatureBucket.Id }; - - var readBucket = new Permission(Permission.ActionEnum.Read, resource); - var writeBucket = new Permission(Permission.ActionEnum.Write, resource); diff --git a/influxdb-client-java.patch b/influxdb-client-java.patch index 76bbac9..b159595 100644 --- a/influxdb-client-java.patch +++ b/influxdb-client-java.patch @@ -1,229 +1,3 @@ -diff --git a/README.md b/README.md -index a810e1681b..3a2c186cc8 100644 ---- a/README.md -+++ b/README.md -@@ -264,7 +264,7 @@ public class InfluxDB2ManagementExample { - PermissionResource resource = new PermissionResource(); - resource.setId(bucket.getId()); - resource.setOrgID("12bdc4164c2e8141"); -- resource.setType(PermissionResource.TypeEnum.BUCKETS); -+ resource.setType(PermissionResource.TYPE_BUCKETS); - - // Read permission - Permission read = new Permission(); -diff --git a/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITQueryKotlinApi.kt b/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITQueryKotlinApi.kt -index 0d9c0e010c..7034f526b9 100644 ---- a/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITQueryKotlinApi.kt -+++ b/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITQueryKotlinApi.kt -@@ -84,7 +84,7 @@ internal class ITQueryKotlinApi : AbstractITInfluxDBClientKotlin() { - - val resource = PermissionResource() - resource.orgID = organization.id -- resource.type = PermissionResource.TypeEnum.BUCKETS -+ resource.type = PermissionResource.TYPE_BUCKETS - resource.id = bucket.id - - val readBucket = Permission() -diff --git a/client-reactive/src/test/java/com/influxdb/client/reactive/ITWriteQueryReactiveApi.java b/client-reactive/src/test/java/com/influxdb/client/reactive/ITWriteQueryReactiveApi.java -index b2f3337cfa..f0633102ff 100644 ---- a/client-reactive/src/test/java/com/influxdb/client/reactive/ITWriteQueryReactiveApi.java -+++ b/client-reactive/src/test/java/com/influxdb/client/reactive/ITWriteQueryReactiveApi.java -@@ -80,7 +80,7 @@ class ITWriteQueryReactiveApi extends AbstractITInfluxDBClientTest { - - PermissionResource resource = new PermissionResource(); - resource.setOrgID(organization.getId()); -- resource.setType(PermissionResource.TypeEnum.BUCKETS); -+ resource.setType(PermissionResource.TYPE_BUCKETS); - resource.setId(bucket.getId()); - - Permission readBucket = new Permission(); -diff --git a/client-scala/src/test/scala/com/influxdb/client/scala/ITQueryScalaApiQuery.scala b/client-scala/src/test/scala/com/influxdb/client/scala/ITQueryScalaApiQuery.scala -index 2d61d76439..f5dfc2400a 100644 ---- a/client-scala/src/test/scala/com/influxdb/client/scala/ITQueryScalaApiQuery.scala -+++ b/client-scala/src/test/scala/com/influxdb/client/scala/ITQueryScalaApiQuery.scala -@@ -73,7 +73,7 @@ class ITQueryScalaApiQuery extends AbstractITQueryScalaApi with Matchers { - - val resource = new PermissionResource - resource.setOrgID(organization.getId) -- resource.setType(PermissionResource.TypeEnum.BUCKETS) -+ resource.setType(PermissionResource.TYPE_BUCKETS) - resource.setId(bucket.getId) - - val readBucket = new Permission -diff --git a/client/README.md b/client/README.md -index 7523728984..d2f4ec03ab 100644 ---- a/client/README.md -+++ b/client/README.md -@@ -835,7 +835,7 @@ public class InfluxDB2ManagementExample { - PermissionResource resource = new PermissionResource(); - resource.setId(bucket.getId()); - resource.setOrgID("12bdc4164c2e8141"); -- resource.setType(PermissionResource.TypeEnum.BUCKETS); -+ resource.setType(PermissionResource.TYPE_BUCKETS); - - // Read permission - Permission read = new Permission(); -diff --git a/client/src/generated/java/com/influxdb/client/domain/PermissionResource.java b/client/src/generated/java/com/influxdb/client/domain/PermissionResource.java -index 9c4770474c..1a915ec83a 100644 ---- a/client/src/generated/java/com/influxdb/client/domain/PermissionResource.java -+++ b/client/src/generated/java/com/influxdb/client/domain/PermissionResource.java -@@ -1,5 +1,5 @@ - /* -- * Influx OSS API Service -+ * InfluxDB OSS API Service - * The InfluxDB v2 API provides a programmatic interface for all interactions with InfluxDB. Access the InfluxDB API using the `/api/v2/` endpoint. - * - * OpenAPI spec version: 2.0.0 -@@ -29,100 +29,34 @@ import java.io.IOException; - */ - - public class PermissionResource { -- /** -- * Gets or Sets type -- */ -- @JsonAdapter(TypeEnum.Adapter.class) -- public enum TypeEnum { -- AUTHORIZATIONS("authorizations"), -- -- BUCKETS("buckets"), -- -- DASHBOARDS("dashboards"), -- -- ORGS("orgs"), -- -- SOURCES("sources"), -- -- TASKS("tasks"), -- -- TELEGRAFS("telegrafs"), -- -- USERS("users"), -- -- VARIABLES("variables"), -- -- SCRAPERS("scrapers"), -- -- SECRETS("secrets"), -- -- LABELS("labels"), -- -- VIEWS("views"), -- -- DOCUMENTS("documents"), -- -- NOTIFICATIONRULES("notificationRules"), -- -- NOTIFICATIONENDPOINTS("notificationEndpoints"), -- -- CHECKS("checks"), -- -- DBRP("dbrp"), -- -- NOTEBOOKS("notebooks"), -- -- ANNOTATIONS("annotations"), -- -- REMOTES("remotes"), -- -- REPLICATIONS("replications"), -- -- FLOWS("flows"), -- -- FUNCTIONS("functions"); -- -- private String value; -- -- TypeEnum(String value) { -- this.value = value; -- } -- -- public String getValue() { -- return value; -- } -- -- @Override -- public String toString() { -- return String.valueOf(value); -- } -- -- public static TypeEnum fromValue(String text) { -- for (TypeEnum b : TypeEnum.values()) { -- if (String.valueOf(b.value).equals(text)) { -- return b; -- } -- } -- return null; -- } -- -- public static class Adapter extends TypeAdapter { -- @Override -- public void write(final JsonWriter jsonWriter, final TypeEnum enumeration) throws IOException { -- jsonWriter.value(enumeration.getValue()); -- } -- -- @Override -- public TypeEnum read(final JsonReader jsonReader) throws IOException { -- String value = jsonReader.nextString(); -- return TypeEnum.fromValue(String.valueOf(value)); -- } -- } -- } -- -+ // Possible values for type property: -+ public static String TYPE_AUTHORIZATIONS = "authorizations"; -+ public static String TYPE_BUCKETS = "buckets"; -+ public static String TYPE_DASHBOARDS = "dashboards"; -+ public static String TYPE_ORGS = "orgs"; -+ public static String TYPE_SOURCES = "sources"; -+ public static String TYPE_TASKS = "tasks"; -+ public static String TYPE_TELEGRAFS = "telegrafs"; -+ public static String TYPE_USERS = "users"; -+ public static String TYPE_VARIABLES = "variables"; -+ public static String TYPE_SCRAPERS = "scrapers"; -+ public static String TYPE_SECRETS = "secrets"; -+ public static String TYPE_LABELS = "labels"; -+ public static String TYPE_VIEWS = "views"; -+ public static String TYPE_DOCUMENTS = "documents"; -+ public static String TYPE_NOTIFICATIONRULES = "notificationRules"; -+ public static String TYPE_NOTIFICATIONENDPOINTS = "notificationEndpoints"; -+ public static String TYPE_CHECKS = "checks"; -+ public static String TYPE_DBRP = "dbrp"; -+ public static String TYPE_NOTEBOOKS = "notebooks"; -+ public static String TYPE_ANNOTATIONS = "annotations"; -+ public static String TYPE_REMOTES = "remotes"; -+ public static String TYPE_REPLICATIONS = "replications"; -+ public static String TYPE_FLOWS = "flows"; -+ public static String TYPE_FUNCTIONS = "functions"; - public static final String SERIALIZED_NAME_TYPE = "type"; - @SerializedName(SERIALIZED_NAME_TYPE) -- private TypeEnum type; -+ private String type; - - public static final String SERIALIZED_NAME_ID = "id"; - @SerializedName(SERIALIZED_NAME_ID) -@@ -140,7 +74,7 @@ public class PermissionResource { - @SerializedName(SERIALIZED_NAME_ORG) - private String org; - -- public PermissionResource type(TypeEnum type) { -+ public PermissionResource type(String type) { - this.type = type; - return this; - } -@@ -150,11 +84,11 @@ public class PermissionResource { - * @return type - **/ - @ApiModelProperty(required = true, value = "") -- public TypeEnum getType() { -+ public String getType() { - return type; - } - -- public void setType(TypeEnum type) { -+ public void setType(String type) { - this.type = type; - } - diff --git a/client/src/main/java/com/influxdb/client/TelegrafsApi.java b/client/src/main/java/com/influxdb/client/TelegrafsApi.java index fd886a48e0..836d2d5721 100644 --- a/client/src/main/java/com/influxdb/client/TelegrafsApi.java @@ -441,205 +215,6 @@ index e171a4a62e..c42e31455a 100644 - } } \ No newline at end of file -diff --git a/client/src/test/java/com/influxdb/client/AbstractITWrite.java b/client/src/test/java/com/influxdb/client/AbstractITWrite.java -index 554fb22ba4..9f40028498 100644 ---- a/client/src/test/java/com/influxdb/client/AbstractITWrite.java -+++ b/client/src/test/java/com/influxdb/client/AbstractITWrite.java -@@ -52,7 +52,7 @@ abstract class AbstractITWrite extends AbstractITClientTest { - PermissionResource resource = new PermissionResource(); - resource.setId(bucket.getId()); - resource.setOrgID(organization.getId()); -- resource.setType(PermissionResource.TypeEnum.BUCKETS); -+ resource.setType(PermissionResource.TYPE_BUCKETS); - - // - // Add Permissions to read and write to the Bucket -diff --git a/client/src/test/java/com/influxdb/client/ITAuthorizationsApi.java b/client/src/test/java/com/influxdb/client/ITAuthorizationsApi.java -index 3f4038dbfc..779869e0d4 100644 ---- a/client/src/test/java/com/influxdb/client/ITAuthorizationsApi.java -+++ b/client/src/test/java/com/influxdb/client/ITAuthorizationsApi.java -@@ -68,7 +68,7 @@ class ITAuthorizationsApi extends AbstractITClientTest { - - PermissionResource userResource = new PermissionResource(); - userResource.setOrgID(organization.getId()); -- userResource.setType(PermissionResource.TypeEnum.USERS); -+ userResource.setType(PermissionResource.TYPE_USERS); - - Permission readUsers = new Permission(); - readUsers.setAction(Permission.ActionEnum.READ); -@@ -76,7 +76,7 @@ class ITAuthorizationsApi extends AbstractITClientTest { - - PermissionResource orgResource = new PermissionResource(); - orgResource.setOrgID(organization.getId()); -- orgResource.setType(PermissionResource.TypeEnum.ORGS); -+ orgResource.setType(PermissionResource.TYPE_ORGS); - - Permission writeOrganizations = new Permission(); - writeOrganizations.setAction(Permission.ActionEnum.WRITE); -@@ -100,11 +100,11 @@ class ITAuthorizationsApi extends AbstractITClientTest { - Assertions.assertThat(authorization.getStatus()).isEqualTo(Authorization.StatusEnum.ACTIVE); - - Assertions.assertThat(authorization.getPermissions()).hasSize(2); -- Assertions.assertThat(authorization.getPermissions().get(0).getResource().getType()).isEqualTo(PermissionResource.TypeEnum.USERS); -+ Assertions.assertThat(authorization.getPermissions().get(0).getResource().getType()).isEqualTo(PermissionResource.TYPE_USERS); - Assertions.assertThat(authorization.getPermissions().get(0).getResource().getOrgID()).isEqualTo(organization.getId()); - Assertions.assertThat(authorization.getPermissions().get(0).getAction()).isEqualTo(Permission.ActionEnum.READ); - -- Assertions.assertThat(authorization.getPermissions().get(1).getResource().getType()).isEqualTo(PermissionResource.TypeEnum.ORGS); -+ Assertions.assertThat(authorization.getPermissions().get(1).getResource().getType()).isEqualTo(PermissionResource.TYPE_ORGS); - Assertions.assertThat(authorization.getPermissions().get(1).getResource().getOrgID()).isEqualTo(organization.getId()); - Assertions.assertThat(authorization.getPermissions().get(1).getAction()).isEqualTo(Permission.ActionEnum.WRITE); - -@@ -118,7 +118,7 @@ class ITAuthorizationsApi extends AbstractITClientTest { - - PermissionResource resource = new PermissionResource(); - resource.setOrgID(organization.getId()); -- resource.setType(PermissionResource.TypeEnum.SOURCES); -+ resource.setType(PermissionResource.TYPE_SOURCES); - - Permission createSource = new Permission(); - createSource.setResource(resource); -@@ -144,7 +144,7 @@ class ITAuthorizationsApi extends AbstractITClientTest { - - PermissionResource resource = new PermissionResource(); - resource.setOrgID(organization.getId()); -- resource.setType(PermissionResource.TypeEnum.TASKS); -+ resource.setType(PermissionResource.TYPE_TASKS); - - Permission createTask = new Permission(); - createTask.setResource(resource); -@@ -161,10 +161,10 @@ class ITAuthorizationsApi extends AbstractITClientTest { - Authorization authorization = authorizationsApi.createAuthorization(organization, permissions); - - Assertions.assertThat(authorization.getPermissions()).hasSize(2); -- Assertions.assertThat(authorization.getPermissions().get(0).getResource().getType()).isEqualTo(PermissionResource.TypeEnum.TASKS); -+ Assertions.assertThat(authorization.getPermissions().get(0).getResource().getType()).isEqualTo(PermissionResource.TYPE_TASKS); - Assertions.assertThat(authorization.getPermissions().get(0).getResource().getOrgID()).isEqualTo(organization.getId()); - Assertions.assertThat(authorization.getPermissions().get(0).getAction()).isEqualTo(Permission.ActionEnum.READ); -- Assertions.assertThat(authorization.getPermissions().get(1).getResource().getType()).isEqualTo(PermissionResource.TypeEnum.TASKS); -+ Assertions.assertThat(authorization.getPermissions().get(1).getResource().getType()).isEqualTo(PermissionResource.TYPE_TASKS); - Assertions.assertThat(authorization.getPermissions().get(1).getResource().getOrgID()).isEqualTo(organization.getId()); - Assertions.assertThat(authorization.getPermissions().get(1).getAction()).isEqualTo(Permission.ActionEnum.WRITE); - } -@@ -177,7 +177,7 @@ class ITAuthorizationsApi extends AbstractITClientTest { - - PermissionResource resource = new PermissionResource(); - resource.setOrgID(organization.getId()); -- resource.setType(PermissionResource.TypeEnum.BUCKETS); -+ resource.setType(PermissionResource.TYPE_BUCKETS); - resource.setId(bucket.getId()); - - Permission readBucket = new Permission(); -@@ -196,10 +196,10 @@ class ITAuthorizationsApi extends AbstractITClientTest { - - Assertions.assertThat(authorization.getPermissions()).hasSize(2); - Assertions.assertThat(authorization.getPermissions().get(0).getResource().getId()).isEqualTo(bucket.getId()); -- Assertions.assertThat(authorization.getPermissions().get(0).getResource().getType()).isEqualTo(PermissionResource.TypeEnum.BUCKETS); -+ Assertions.assertThat(authorization.getPermissions().get(0).getResource().getType()).isEqualTo(PermissionResource.TYPE_BUCKETS); - Assertions.assertThat(authorization.getPermissions().get(0).getAction()).isEqualTo(Permission.ActionEnum.READ); - Assertions.assertThat(authorization.getPermissions().get(1).getResource().getId()).isEqualTo(bucket.getId()); -- Assertions.assertThat(authorization.getPermissions().get(1).getResource().getType()).isEqualTo(PermissionResource.TypeEnum.BUCKETS); -+ Assertions.assertThat(authorization.getPermissions().get(1).getResource().getType()).isEqualTo(PermissionResource.TYPE_BUCKETS); - Assertions.assertThat(authorization.getPermissions().get(1).getAction()).isEqualTo(Permission.ActionEnum.WRITE); - } - -@@ -283,7 +283,7 @@ class ITAuthorizationsApi extends AbstractITClientTest { - - PermissionResource resource = new PermissionResource(); - resource.setOrgID(organization.getId()); -- resource.setType(PermissionResource.TypeEnum.USERS); -+ resource.setType(PermissionResource.TYPE_USERS); - - Permission readUsers = new Permission(); - readUsers.setAction(Permission.ActionEnum.READ); -@@ -341,7 +341,7 @@ class ITAuthorizationsApi extends AbstractITClientTest { - Assertions.assertThat(cloned.getDescription()).isEqualTo(source.getDescription()); - Assertions.assertThat(cloned.getPermissions()).hasSize(1); - Assertions.assertThat(cloned.getPermissions().get(0).getAction()).isEqualTo(Permission.ActionEnum.READ); -- Assertions.assertThat(cloned.getPermissions().get(0).getResource().getType()).isEqualTo(PermissionResource.TypeEnum.USERS); -+ Assertions.assertThat(cloned.getPermissions().get(0).getResource().getType()).isEqualTo(PermissionResource.TYPE_USERS); - Assertions.assertThat(cloned.getPermissions().get(0).getResource().getOrgID()).isEqualTo(organization.getId()); - } - -@@ -358,7 +358,7 @@ class ITAuthorizationsApi extends AbstractITClientTest { - - PermissionResource resource = new PermissionResource(); - resource.setOrgID(organization.getId()); -- resource.setType(PermissionResource.TypeEnum.USERS); -+ resource.setType(PermissionResource.TYPE_USERS); - - Permission permission = new Permission(); - permission.setAction(Permission.ActionEnum.READ); -diff --git a/client/src/test/java/com/influxdb/client/ITDeleteApi.java b/client/src/test/java/com/influxdb/client/ITDeleteApi.java -index b9fe2470c0..e813812046 100644 ---- a/client/src/test/java/com/influxdb/client/ITDeleteApi.java -+++ b/client/src/test/java/com/influxdb/client/ITDeleteApi.java -@@ -67,7 +67,7 @@ class ITDeleteApi extends AbstractITClientTest { - PermissionResource resource = new PermissionResource(); - resource.setId(bucket.getId()); - resource.setOrgID(organization.getId()); -- resource.setType(PermissionResource.TypeEnum.BUCKETS); -+ resource.setType(PermissionResource.TYPE_BUCKETS); - - // - // Add Permissions to read and write to the Bucket -diff --git a/client/src/test/java/com/influxdb/client/ITTasksApi.java b/client/src/test/java/com/influxdb/client/ITTasksApi.java -index a2b1a8f69b..1c930fd21e 100644 ---- a/client/src/test/java/com/influxdb/client/ITTasksApi.java -+++ b/client/src/test/java/com/influxdb/client/ITTasksApi.java -@@ -731,7 +731,7 @@ class ITTasksApi extends AbstractITClientTest { - - PermissionResource resource = new PermissionResource(); - resource.setOrgID(organization.getId()); -- resource.setType(PermissionResource.TypeEnum.TASKS); -+ resource.setType(PermissionResource.TYPE_TASKS); - - Permission createTask = new Permission(); - createTask.setResource(resource); -@@ -742,7 +742,7 @@ class ITTasksApi extends AbstractITClientTest { - deleteTask.setAction(Permission.ActionEnum.WRITE); - - PermissionResource orgResource = new PermissionResource(); -- orgResource.setType(PermissionResource.TypeEnum.ORGS); -+ orgResource.setType(PermissionResource.TYPE_ORGS); - - Permission createOrg = new Permission(); - createOrg.setAction(Permission.ActionEnum.WRITE); -@@ -753,14 +753,14 @@ class ITTasksApi extends AbstractITClientTest { - readOrg.setResource(orgResource); - - PermissionResource userResource = new PermissionResource(); -- userResource.setType(PermissionResource.TypeEnum.USERS); -+ userResource.setType(PermissionResource.TYPE_USERS); - - Permission createUsers = new Permission(); - createUsers.setAction(Permission.ActionEnum.WRITE); - createUsers.setResource(userResource); - - PermissionResource labelResource = new PermissionResource(); -- labelResource.setType(PermissionResource.TypeEnum.LABELS); -+ labelResource.setType(PermissionResource.TYPE_LABELS); - - Permission createLabels = new Permission(); - createLabels.setAction(Permission.ActionEnum.WRITE); -@@ -771,7 +771,7 @@ class ITTasksApi extends AbstractITClientTest { - readLabels.setResource(labelResource); - - PermissionResource authResource = new PermissionResource(); -- authResource.setType(PermissionResource.TypeEnum.AUTHORIZATIONS); -+ authResource.setType(PermissionResource.TYPE_AUTHORIZATIONS); - - Permission createAuth = new Permission(); - createAuth.setAction(Permission.ActionEnum.WRITE); -@@ -782,7 +782,7 @@ class ITTasksApi extends AbstractITClientTest { - - PermissionResource bucketResource = new PermissionResource(); - bucketResource.setOrgID(organization.getId()); -- bucketResource.setType(PermissionResource.TypeEnum.BUCKETS); -+ bucketResource.setType(PermissionResource.TYPE_BUCKETS); - bucketResource.setId(bucket.getId()); - - Permission readBucket = new Permission(); diff --git a/client/src/test/java/com/influxdb/client/ITTelegrafsApi.java b/client/src/test/java/com/influxdb/client/ITTelegrafsApi.java index 24239705fe..64b71bf80e 100644 --- a/client/src/test/java/com/influxdb/client/ITTelegrafsApi.java @@ -738,69 +313,3 @@ index 24239705fe..64b71bf80e 100644 .name("influxdb_v2") .description("my instance") .putConfigItem("organization", "my-org") -diff --git a/client/src/test/java/com/influxdb/client/ITWriteQueryApi.java b/client/src/test/java/com/influxdb/client/ITWriteQueryApi.java -index 1bef8d0732..c05d04680e 100644 ---- a/client/src/test/java/com/influxdb/client/ITWriteQueryApi.java -+++ b/client/src/test/java/com/influxdb/client/ITWriteQueryApi.java -@@ -78,7 +78,7 @@ class ITWriteQueryApi extends AbstractITClientTest { - PermissionResource resource = new PermissionResource(); - resource.setId(bucket.getId()); - resource.setOrgID(organization.getId()); -- resource.setType(PermissionResource.TypeEnum.BUCKETS); -+ resource.setType(PermissionResource.TYPE_BUCKETS); - - // - // Add Permissions to read and write to the Bucket -@@ -409,7 +409,7 @@ class ITWriteQueryApi extends AbstractITClientTest { - PermissionResource bucketResource = new PermissionResource(); - bucketResource.setId(bucket.getId()); - bucketResource.setOrgID(organization.getId()); -- bucketResource.setType(PermissionResource.TypeEnum.BUCKETS); -+ bucketResource.setType(PermissionResource.TYPE_BUCKETS); - - Permission readBucket = new Permission(); - readBucket.setResource(bucketResource); -@@ -422,7 +422,7 @@ class ITWriteQueryApi extends AbstractITClientTest { - PermissionResource orgResource = new PermissionResource(); - orgResource.setId(organization.getId()); - orgResource.setOrgID(organization.getId()); -- orgResource.setType(PermissionResource.TypeEnum.ORGS); -+ orgResource.setType(PermissionResource.TYPE_ORGS); - - Permission readOrganization = new Permission(); - readOrganization.setResource(orgResource); -diff --git a/examples/src/main/java/example/InfluxDB2ManagementExample.java b/examples/src/main/java/example/InfluxDB2ManagementExample.java -index b343261d80..7c5c611581 100644 ---- a/examples/src/main/java/example/InfluxDB2ManagementExample.java -+++ b/examples/src/main/java/example/InfluxDB2ManagementExample.java -@@ -53,7 +53,7 @@ public class InfluxDB2ManagementExample { - PermissionResource resource = new PermissionResource(); - resource.setId(bucket.getId()); - resource.setOrgID("12bdc4164c2e8141"); -- resource.setType(PermissionResource.TypeEnum.BUCKETS); -+ resource.setType(PermissionResource.TYPE_BUCKETS); - - // Read permission - Permission read = new Permission(); -diff --git a/examples/src/main/java/example/PlatformExample.java b/examples/src/main/java/example/PlatformExample.java -index 1759b0f25e..ae5bd67733 100644 ---- a/examples/src/main/java/example/PlatformExample.java -+++ b/examples/src/main/java/example/PlatformExample.java -@@ -92,7 +92,7 @@ public class PlatformExample { - PermissionResource resource = new PermissionResource(); - resource.setId(temperatureBucket.getId()); - resource.setOrgID(medicalGMBH.getId()); -- resource.setType(PermissionResource.TypeEnum.BUCKETS); -+ resource.setType(PermissionResource.TYPE_BUCKETS); - - Permission readBucket = new Permission(); - readBucket.setResource(resource); -@@ -180,7 +180,7 @@ public class PlatformExample { - .filter(authorization -> authorization.getPermissions().stream() - .map(Permission::getResource) - .anyMatch(resource -> -- resource.getType().equals(PermissionResource.TypeEnum.ORGS) && -+ resource.getType().equals(PermissionResource.TYPE_ORGS) && - resource.getId() == null && - resource.getOrgID() == null)) - .findFirst() From a74aafa43c4f9cb0fcc627d1f861eda85f4c9c6f Mon Sep 17 00:00:00 2001 From: Jakub Bednar Date: Mon, 21 Feb 2022 12:25:11 +0100 Subject: [PATCH 3/4] fix(c#): if we use static values then we don't strictly check the requirements --- .../src/main/resources/csharp/modelGeneric.mustache | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openapi-generator/src/main/resources/csharp/modelGeneric.mustache b/openapi-generator/src/main/resources/csharp/modelGeneric.mustache index 2a439f8..7cc8e1a 100644 --- a/openapi-generator/src/main/resources/csharp/modelGeneric.mustache +++ b/openapi-generator/src/main/resources/csharp/modelGeneric.mustache @@ -62,12 +62,12 @@ {{^isReadOnly}} {{#required}} // to ensure "{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}" is required (not null) - {{^isEnum}} + {{^isEnum}}{{^vendorExtensions.x-has-static-values}} if ({{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} == null) { throw new InvalidDataException("{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} is a required property for {{classname}} and cannot be null"); } - {{/isEnum}} + {{/vendorExtensions.x-has-static-values}}{{/isEnum}} this.{{name}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}; {{/required}} {{/isReadOnly}} From ca689d6be4bbd0c10c999120fea8f5cc8a58b95b Mon Sep 17 00:00:00 2001 From: Jakub Bednar Date: Mon, 21 Feb 2022 12:31:51 +0100 Subject: [PATCH 4/4] fix(c#): if we use static values then we don't strictly check the requirements --- .../src/main/resources/csharp/modelGeneric.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openapi-generator/src/main/resources/csharp/modelGeneric.mustache b/openapi-generator/src/main/resources/csharp/modelGeneric.mustache index 7cc8e1a..b46c95a 100644 --- a/openapi-generator/src/main/resources/csharp/modelGeneric.mustache +++ b/openapi-generator/src/main/resources/csharp/modelGeneric.mustache @@ -61,7 +61,7 @@ {{^isInherited}} {{^isReadOnly}} {{#required}} - // to ensure "{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}" is required (not null) + {{^vendorExtensions.x-has-static-values}}// to ensure "{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}" is required (not null){{/vendorExtensions.x-has-static-values}} {{^isEnum}}{{^vendorExtensions.x-has-static-values}} if ({{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} == null) {