fix: Update swagger and API to latest alpha version (#77)

influxdata · Jan 6, 2020 · 235f288 · 235f288
1 parent 8b82d87
commit 235f288
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/client/src/generated/java/com/influxdb/client/JSON.java b/client/src/generated/java/com/influxdb/client/JSON.java
@@ -62,14 +62,14 @@ public Class getClassForElement(JsonElement readElement) {
                             getDiscriminatorValue(readElement, "type"));
             }
           })
-          .registerTypeSelector(NotificationEndpointDiscrimator.class, new TypeSelector() {
+          .registerTypeSelector(NotificationEndpointDiscriminator.class, new TypeSelector() {
             @Override
             public Class getClassForElement(JsonElement readElement) {
                 Map classByDiscriminatorValue = new HashMap();
                 classByDiscriminatorValue.put("slack".toUpperCase(Locale.ROOT), SlackNotificationEndpoint.class);
                 classByDiscriminatorValue.put("pagerduty".toUpperCase(Locale.ROOT), PagerDutyNotificationEndpoint.class);
                 classByDiscriminatorValue.put("http".toUpperCase(Locale.ROOT), HTTPNotificationEndpoint.class);
-                classByDiscriminatorValue.put("NotificationEndpointDiscrimator".toUpperCase(Locale.ROOT), NotificationEndpointDiscrimator.class);
+                classByDiscriminatorValue.put("NotificationEndpointDiscriminator".toUpperCase(Locale.ROOT), NotificationEndpointDiscriminator.class);
                 return getClassByDiscriminator(
                             classByDiscriminatorValue,
                             getDiscriminatorValue(readElement, "type"));

diff --git a/client/src/generated/java/com/influxdb/client/domain/NotificationEndpoint.java b/client/src/generated/java/com/influxdb/client/domain/NotificationEndpoint.java
@@ -15,7 +15,7 @@
 
 import java.util.Objects;
 import java.util.Arrays;
-import com.influxdb.client.domain.NotificationEndpointDiscrimator;
+import com.influxdb.client.domain.NotificationEndpointDiscriminator;
 
 /**
  * NotificationEndpoint

diff --git a/client/src/generated/java/com/influxdb/client/domain/NotificationEndpointBase.java b/client/src/generated/java/com/influxdb/client/domain/NotificationEndpointBase.java
@@ -34,7 +34,7 @@
  * NotificationEndpointBase
  */
 
-public class NotificationEndpointBase extends NotificationEndpointDiscrimator {
+public class NotificationEndpointBase extends NotificationEndpointDiscriminator {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
   private String id;

diff --git a/...main/NotificationEndpointDiscrimator.java → ...in/NotificationEndpointDiscriminator.java b/...main/NotificationEndpointDiscrimator.java → ...in/NotificationEndpointDiscriminator.java
@@ -26,10 +26,10 @@
 import java.util.Map;
 
 /**
- * NotificationEndpointDiscrimator
+ * NotificationEndpointDiscriminator
  */
 
-public class NotificationEndpointDiscrimator extends PostNotificationEndpoint {
+public class NotificationEndpointDiscriminator extends PostNotificationEndpoint {
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -51,7 +51,7 @@ public int hashCode() {
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
-    sb.append("class NotificationEndpointDiscrimator {\n");
+    sb.append("class NotificationEndpointDiscriminator {\n");
     sb.append("    ").append(toIndentedString(super.toString())).append("\n");
     sb.append("}");
     return sb.toString();

diff --git a/client/src/generated/java/com/influxdb/client/domain/PostNotificationEndpoint.java b/client/src/generated/java/com/influxdb/client/domain/PostNotificationEndpoint.java
@@ -15,7 +15,7 @@
 
 import java.util.Objects;
 import java.util.Arrays;
-import com.influxdb.client.domain.NotificationEndpointDiscrimator;
+import com.influxdb.client.domain.NotificationEndpointDiscriminator;
 
 /**
  * PostNotificationEndpoint

diff --git a/client/src/generated/java/com/influxdb/client/service/NotificationEndpointsService.java b/client/src/generated/java/com/influxdb/client/service/NotificationEndpointsService.java
@@ -12,7 +12,7 @@
 import com.influxdb.client.domain.LabelResponse;
 import com.influxdb.client.domain.LabelsResponse;
 import com.influxdb.client.domain.NotificationEndpoint;
-import com.influxdb.client.domain.NotificationEndpointDiscrimator;
+import com.influxdb.client.domain.NotificationEndpointDiscriminator;
 import com.influxdb.client.domain.NotificationEndpointUpdate;
 import com.influxdb.client.domain.NotificationEndpoints;
 import com.influxdb.client.domain.PostNotificationEndpoint;

diff --git a/client/src/main/resources/swagger.yml b/client/src/main/resources/swagger.yml
@@ -9728,7 +9728,7 @@ components:
           enum:
             - active
             - inactive
-    NotificationEndpointDiscrimator:
+    NotificationEndpointDiscriminator:
       oneOf:
         - $ref: "#/components/schemas/SlackNotificationEndpoint"
         - $ref: "#/components/schemas/PagerDutyNotificationEndpoint"
@@ -9741,10 +9741,10 @@ components:
           http: "#/components/schemas/HTTPNotificationEndpoint"
     NotificationEndpoint:
       allOf:
-        - $ref: "#/components/schemas/NotificationEndpointDiscrimator"
+        - $ref: "#/components/schemas/NotificationEndpointDiscriminator"
     PostNotificationEndpoint:
       allOf:
-        - $ref: "#/components/schemas/NotificationEndpointDiscrimator"
+        - $ref: "#/components/schemas/NotificationEndpointDiscriminator"
     NotificationEndpoints:
       properties:
         notificationEndpoints:

diff --git a/openapi-generator/src/main/java/com/influxdb/codegen/InfluxJavaGenerator.java b/openapi-generator/src/main/java/com/influxdb/codegen/InfluxJavaGenerator.java
@@ -161,7 +161,7 @@ public Map<String, Object> postProcessAllModels(final Map<String, Object> models
                 for (String interfaceModelName : pluginModel.interfaces) {
 
                     CodegenModel interfaceModel = getModel((HashMap) models.get(interfaceModelName));
-                    if (!interfaceModel.name.contains("NotificationRule") && !pluginModel.classname.endsWith("Discrimator")) {
+                    if (!interfaceModel.name.contains("NotificationRule") && !pluginModel.classname.endsWith("NotificationEndpointDiscriminator")) {
 
                         interfaceModel.setParent(pluginModel.classname);
                     }
@@ -189,7 +189,7 @@ public Map<String, Object> postProcessAllModels(final Map<String, Object> models
                 pluginModel.setParentSchema("NotificationEndpoint");
             }
 
-            if (modelName.equals("NotificationEndpointDiscrimator")) {
+            if (modelName.equals("NotificationEndpointDiscriminator")) {
                 pluginModel.setParent("PostNotificationEndpoint");
                 pluginModel.setParentSchema("PostNotificationEndpoint");
             }
@@ -565,8 +565,8 @@ else if (schema.get$ref() != null) {
         }
 
         if (codegenModel.name.equals("NotificationEndpointBase")) {
-            codegenModel.setParent("NotificationEndpointDiscrimator");
-            codegenModel.setParentSchema("NotificationEndpointDiscrimator");
+            codegenModel.setParent("NotificationEndpointDiscriminator");
+            codegenModel.setParentSchema("NotificationEndpointDiscriminator");
         }
 
         if (codegenModel.name.equals("PostCheck") || codegenModel.name.equals("PostNotificationEndpoint")) {