Upgrade to openapi-generator v7.0.0

Makefile

@@ -35,7 +35,7 @@ SPEC_FETCHED_PATCHES=patches/spec.fetched.json
 ##
 # openapi-generator-cli - docker
 ##
-OPENAPI_CODEGEN_IMAGE=openapitools/openapi-generator-cli:v6.6.0
+OPENAPI_CODEGEN_IMAGE=openapitools/openapi-generator-cli:v7.0.0
 DOCKER_OPENAPI=${CRI} run --rm -u ${CURRENT_UID}:${CURRENT_GID} -v $(CURDIR):/local ${OPENAPI_CODEGEN_IMAGE}
 
 docker_run: clean patch pull docker_generate move-workflow build_client

equinix-openapi-metal/.openapi-generator/FILES

@@ -110,10 +110,8 @@ docs/IPReservationRequestInput.md
 docs/IncidentsApi.md
 docs/InstancesBatchCreateInput.md
 docs/InstancesBatchCreateInputBatchesInner.md
-docs/InstancesBatchCreateInputBatchesInnerAllOf.md
 docs/Interconnection.md
 docs/InterconnectionList.md
-docs/InterconnectionMetro.md
 docs/InterconnectionPort.md
 docs/InterconnectionPortList.md
 docs/InterconnectionUpdateInput.md
@@ -447,10 +445,8 @@ src/main/java/com/equinix/openapi/metal/v1/model/IPReservationOrHref.java
 src/main/java/com/equinix/openapi/metal/v1/model/IPReservationRequestInput.java
 src/main/java/com/equinix/openapi/metal/v1/model/InstancesBatchCreateInput.java
 src/main/java/com/equinix/openapi/metal/v1/model/InstancesBatchCreateInputBatchesInner.java
-src/main/java/com/equinix/openapi/metal/v1/model/InstancesBatchCreateInputBatchesInnerAllOf.java
 src/main/java/com/equinix/openapi/metal/v1/model/Interconnection.java
 src/main/java/com/equinix/openapi/metal/v1/model/InterconnectionList.java
-src/main/java/com/equinix/openapi/metal/v1/model/InterconnectionMetro.java
 src/main/java/com/equinix/openapi/metal/v1/model/InterconnectionPort.java
 src/main/java/com/equinix/openapi/metal/v1/model/InterconnectionPortList.java
 src/main/java/com/equinix/openapi/metal/v1/model/InterconnectionUpdateInput.java
@@ -727,11 +723,9 @@ src/test/java/com/equinix/openapi/metal/v1/model/IPReservationMetroTest.java
 src/test/java/com/equinix/openapi/metal/v1/model/IPReservationOrHrefTest.java
 src/test/java/com/equinix/openapi/metal/v1/model/IPReservationRequestInputTest.java
 src/test/java/com/equinix/openapi/metal/v1/model/IPReservationTest.java
-src/test/java/com/equinix/openapi/metal/v1/model/InstancesBatchCreateInputBatchesInnerAllOfTest.java
 src/test/java/com/equinix/openapi/metal/v1/model/InstancesBatchCreateInputBatchesInnerTest.java
 src/test/java/com/equinix/openapi/metal/v1/model/InstancesBatchCreateInputTest.java
 src/test/java/com/equinix/openapi/metal/v1/model/InterconnectionListTest.java
-src/test/java/com/equinix/openapi/metal/v1/model/InterconnectionMetroTest.java
 src/test/java/com/equinix/openapi/metal/v1/model/InterconnectionPortListTest.java
 src/test/java/com/equinix/openapi/metal/v1/model/InterconnectionPortTest.java
 src/test/java/com/equinix/openapi/metal/v1/model/InterconnectionTest.java

equinix-openapi-metal/.openapi-generator/VERSION

@@ -1 +1 @@
-6.6.0
+7.0.0

equinix-openapi-metal/README.md

@@ -519,10 +519,8 @@ Class | Method | HTTP request | Description
  - [IPReservationRequestInput](docs/IPReservationRequestInput.md)
  - [InstancesBatchCreateInput](docs/InstancesBatchCreateInput.md)
  - [InstancesBatchCreateInputBatchesInner](docs/InstancesBatchCreateInputBatchesInner.md)
- - [InstancesBatchCreateInputBatchesInnerAllOf](docs/InstancesBatchCreateInputBatchesInnerAllOf.md)
  - [Interconnection](docs/Interconnection.md)
  - [InterconnectionList](docs/InterconnectionList.md)
- - [InterconnectionMetro](docs/InterconnectionMetro.md)
  - [InterconnectionPort](docs/InterconnectionPort.md)
  - [InterconnectionPortList](docs/InterconnectionPortList.md)
  - [InterconnectionUpdateInput](docs/InterconnectionUpdateInput.md)

equinix-openapi-metal/api/openapi.yaml

@@ -14713,6 +14713,7 @@ components:
             \ should be 'dedicated'."
           enum:
           - dedicated
+          - shared
           type: string
         use_case:
           description: The intended use case of the dedicated port.
@@ -18318,6 +18319,7 @@ components:
           - public_ipv4
           - private_ipv4
           - public_ipv6
+          - vrf
           type: string
       required:
       - type
@@ -18428,7 +18430,7 @@ components:
         requested_by:
           href: href
         updated_at: 2000-01-23T04:56:07.000+00:00
-        metro: null
+        metro: ""
         organization:
           href: href
         name: name
@@ -18448,7 +18450,19 @@ components:
           format: uuid
           type: string
         metro:
-          $ref: '#/components/schemas/Interconnection_metro'
+          allOf:
+          - $ref: '#/components/schemas/Metro'
+          description: "The location of where the shared or Dedicated Port is located.\
+            \ For interconnections with Dedicated Ports,\n  this will be the location\
+            \ of the Dedicated Ports. For Fabric VCs (Metal Billed), this is where\
+            \ interconnection will be originating from, as we pre-authorize the use\
+            \ of one of our shared ports\n  as the origin of the interconnection using\
+            \ A-Side service tokens. We only allow local connections for Fabric VCs\
+            \ (Metal Billed), so the destination location must be the same as the\
+            \ origin. For Fabric VCs (Fabric Billed), \n  this will be the destination\
+            \ of the interconnection. We allow remote connections for Fabric VCs (Fabric\
+            \ Billed), so the origin of the interconnection can be a different metro\
+            \ set here."
         mode:
           description: |-
             The mode of the interconnection (only relevant to Dedicated Ports). Shared connections won't have this field. Can be either 'standard' or 'tunnel'.
@@ -18594,7 +18608,7 @@ components:
           requested_by:
             href: href
           updated_at: 2000-01-23T04:56:07.000+00:00
-          metro: null
+          metro: ""
           organization:
             href: href
           name: name
@@ -18656,7 +18670,7 @@ components:
           requested_by:
             href: href
           updated_at: 2000-01-23T04:56:07.000+00:00
-          metro: null
+          metro: ""
           organization:
             href: href
           name: name
@@ -28181,38 +28195,25 @@ components:
       anyOf:
       - $ref: '#/components/schemas/IPReservation'
       - $ref: '#/components/schemas/VrfIpReservation'
-    InstancesBatchCreateInput_batches_inner_allOf:
-      properties:
-        hostnames:
-          items:
-            type: string
-          type: array
-        quantity:
-          description: "The number of devices to create in this batch. The hostname\
-            \ may contain an `{{index}}` placeholder, which will be replaced with\
-            \ the index of the device in the batch. For example, if the hostname is\
-            \ `device-{{index}}`, the first device in the batch will have the hostname\
-            \ `device-01`, the second device will have the hostname `device-02`, and\
-            \ so on."
-          type: integer
-      type: object
     InstancesBatchCreateInput_batches_inner:
       allOf:
-      - $ref: '#/components/schemas/InstancesBatchCreateInput_batches_inner_allOf'
-      - $ref: '#/components/schemas/createDevice_request'
-    Interconnection_metro:
-      allOf:
-      - $ref: '#/components/schemas/Metro'
-      description: "The location of where the shared or Dedicated Port is located.\
-        \ For interconnections with Dedicated Ports,\n  this will be the location\
-        \ of the Dedicated Ports. For Fabric VCs (Metal Billed), this is where interconnection\
-        \ will be originating from, as we pre-authorize the use of one of our shared\
-        \ ports\n  as the origin of the interconnection using A-Side service tokens.\
-        \ We only allow local connections for Fabric VCs (Metal Billed), so the destination\
-        \ location must be the same as the origin. For Fabric VCs (Fabric Billed),\
-        \ \n  this will be the destination of the interconnection. We allow remote\
-        \ connections for Fabric VCs (Fabric Billed), so the origin of the interconnection\
-        \ can be a different metro set here."
+      - properties:
+          hostnames:
+            items:
+              type: string
+            type: array
+          quantity:
+            description: "The number of devices to create in this batch. The hostname\
+              \ may contain an `{{index}}` placeholder, which will be replaced with\
+              \ the index of the device in the batch. For example, if the hostname\
+              \ is `device-{{index}}`, the first device in the batch will have the\
+              \ hostname `device-01`, the second device will have the hostname `device-02`,\
+              \ and so on."
+            type: integer
+        type: object
+      - oneOf:
+        - $ref: '#/components/schemas/DeviceCreateInMetroInput'
+        - $ref: '#/components/schemas/DeviceCreateInFacilityInput'
     Metadata_network_network_bonding:
       example:
         link_aggregation: link_aggregation

equinix-openapi-metal/docs/CreateOrganizationInterconnectionRequest.md

@@ -17,7 +17,7 @@
 |**redundancy** | **String** | Either 'primary' or 'redundant'. |  |
 |**speed** | **Integer** | A interconnection speed, in bps, mbps, or gbps. For Fabric VCs, this represents the maximum speed of the interconnection. For Fabric VCs (Metal Billed), this can only be one of the following:  ''50mbps'', ''200mbps'', ''500mbps'', ''1gbps'', ''2gbps'', ''5gbps'' or ''10gbps'', and is required for creation. For Fabric VCs (Fabric Billed), this field will always default to ''10gbps'' even if it is not provided. For example, ''500000000'', ''50m'', or' ''500mbps'' will all work as valid inputs. |  [optional] |
 |**tags** | **List<String>** |  |  [optional] |
-|**type** | [**TypeEnum**](#TypeEnum) | When requesting for a Fabric VC, the value of this field should be 'shared'. |  |
+|**type** | [**TypeEnum**](#TypeEnum) | When requesting for a dedicated port, the value of this field should be 'dedicated'. |  |
 |**useCase** | **String** | The intended use case of the dedicated port. |  [optional] |
 |**serviceTokenType** | [**ServiceTokenTypeEnum**](#ServiceTokenTypeEnum) | Either 'a_side' or 'z_side'. Setting this field to 'a_side' will create an interconnection with Fabric VCs (Metal Billed). Setting this field to 'z_side' will create an interconnection with Fabric VCs (Fabric Billed). This is required when the 'type' is 'shared', but this is not applicable when the 'type' is 'dedicated'. This parameter is included in the specification as a developer preview and is generally unavailable. Please contact our Support team for more details. |  |
 |**vlans** | **List<Integer>** | A list of one or two metro-based VLANs that will be set on the virtual circuits of primary and/or secondary (if redundant) interconnections respectively when creating Fabric VCs. VLANs can also be set after the interconnection is created, but are required to fully activate the virtual circuits. |  [optional] |
@@ -38,6 +38,7 @@
 
 | Name | Value |
 |---- | -----|
+| DEDICATED | "dedicated" |
 | SHARED | "shared" |
 
 

equinix-openapi-metal/docs/DevicesApi.md

@@ -1145,7 +1145,7 @@ public class Example {
     String direction = "inbound"; // String | Traffic direction
     String interval = "minute"; // String | Traffic interval
     String bucket = "internal"; // String | Traffic bucket
-    FindTrafficTimeframeParameter timeframe = new HashMap(); // FindTrafficTimeframeParameter | 
+    FindTrafficTimeframeParameter timeframe = new FindTrafficTimeframeParameter(); // FindTrafficTimeframeParameter | 
     try {
       apiInstance.findTraffic(id, direction, interval, bucket, timeframe);
     } catch (ApiException e) {

equinix-openapi-metal/docs/FindIPAddressById200Response.md

@@ -48,6 +48,10 @@
 
 | Name | Value |
 |---- | -----|
+| GLOBAL_IPV4 | "global_ipv4" |
+| PUBLIC_IPV4 | "public_ipv4" |
+| PRIVATE_IPV4 | "private_ipv4" |
+| PUBLIC_IPV6 | "public_ipv6" |
 | VRF | "vrf" |
 
 

equinix-openapi-metal/docs/IPReservationListIpAddressesInner.md

@@ -45,6 +45,10 @@
 
 | Name | Value |
 |---- | -----|
+| GLOBAL_IPV4 | "global_ipv4" |
+| PUBLIC_IPV4 | "public_ipv4" |
+| PRIVATE_IPV4 | "private_ipv4" |
+| PUBLIC_IPV6 | "public_ipv6" |
 | VRF | "vrf" |
 
 

equinix-openapi-metal/docs/Interconnection.md

@@ -11,7 +11,7 @@
 |**description** | **String** |  |  [optional] |
 |**facility** | [**Href**](Href.md) |  |  [optional] |
 |**id** | **UUID** |  |  [optional] |
-|**metro** | [**InterconnectionMetro**](InterconnectionMetro.md) |  |  [optional] |
+|**metro** | [**Metro**](Metro.md) |  |  [optional] |
 |**mode** | [**ModeEnum**](#ModeEnum) | The mode of the interconnection (only relevant to Dedicated Ports). Shared connections won't have this field. Can be either 'standard' or 'tunnel'.   The default mode of an interconnection on a Dedicated Port is 'standard'. The mode can only be changed when there are no associated virtual circuits on the interconnection.   In tunnel mode, an 802.1q tunnel is added to a port to send/receive double tagged packets from server instances. |  [optional] |
 |**name** | **String** |  |  [optional] |
 |**organization** | [**Href**](Href.md) |  |  [optional] |

equinix-openapi-metal/docs/RequestIPReservation201Response.md

@@ -45,6 +45,10 @@
 
 | Name | Value |
 |---- | -----|
+| GLOBAL_IPV4 | "global_ipv4" |
+| PUBLIC_IPV4 | "public_ipv4" |
+| PRIVATE_IPV4 | "private_ipv4" |
+| PUBLIC_IPV6 | "public_ipv6" |
 | VRF | "vrf" |
 
 

equinix-openapi-metal/pom.xml

@@ -336,7 +336,6 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <gson-fire-version>1.8.5</gson-fire-version>
-        <swagger-annotations-version>1.6.6</swagger-annotations-version>
         <okhttp-version>4.10.0</okhttp-version>
         <gson-version>2.9.1</gson-version>
         <commons-lang3-version>3.12.0</commons-lang3-version>

equinix-openapi-metal/src/main/java/com/equinix/openapi/ApiClient.java

@@ -1168,12 +1168,15 @@ public Request buildRequest(String baseUrl, String path, String method, List<Pai
         // prepare HTTP request body
         RequestBody reqBody;
         String contentType = headerParams.get("Content-Type");
-
+        String contentTypePure = contentType;
+        if (contentTypePure != null && contentTypePure.contains(";")) {
+            contentTypePure = contentType.substring(0, contentType.indexOf(";"));
+        }
         if (!HttpMethod.permitsRequestBody(method)) {
             reqBody = null;
-        } else if ("application/x-www-form-urlencoded".equals(contentType)) {
+        } else if ("application/x-www-form-urlencoded".equals(contentTypePure)) {
             reqBody = buildRequestBodyFormEncoding(formParams);
-        } else if ("multipart/form-data".equals(contentType)) {
+        } else if ("multipart/form-data".equals(contentTypePure)) {
             reqBody = buildRequestBodyMultipart(formParams);
         } else if (body == null) {
             if ("DELETE".equals(method)) {

equinix-openapi-metal/src/main/java/com/equinix/openapi/ApiException.java

@@ -16,7 +16,6 @@
 import java.util.Map;
 import java.util.List;
 
-import javax.ws.rs.core.GenericType;
 
 /**
  * <p>ApiException class.</p>
@@ -27,7 +26,7 @@ public class ApiException extends Exception {
     private int code = 0;
     private Map<String, List<String>> responseHeaders = null;
     private String responseBody = null;
- 
+
     /**
      * <p>Constructor for ApiException.</p>
      */

equinix-openapi-metal/src/main/java/com/equinix/openapi/JSON.java

@@ -186,10 +186,8 @@ private static Class getClassByDiscriminator(Map classByDiscriminatorValue, Stri
         gsonBuilder.registerTypeAdapterFactory(new com.equinix.openapi.metal.v1.model.IPReservationRequestInput.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new com.equinix.openapi.metal.v1.model.InstancesBatchCreateInput.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new com.equinix.openapi.metal.v1.model.InstancesBatchCreateInputBatchesInner.CustomTypeAdapterFactory());
-        gsonBuilder.registerTypeAdapterFactory(new com.equinix.openapi.metal.v1.model.InstancesBatchCreateInputBatchesInnerAllOf.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new com.equinix.openapi.metal.v1.model.Interconnection.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new com.equinix.openapi.metal.v1.model.InterconnectionList.CustomTypeAdapterFactory());
-        gsonBuilder.registerTypeAdapterFactory(new com.equinix.openapi.metal.v1.model.InterconnectionMetro.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new com.equinix.openapi.metal.v1.model.InterconnectionPort.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new com.equinix.openapi.metal.v1.model.InterconnectionPortList.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new com.equinix.openapi.metal.v1.model.InterconnectionUpdateInput.CustomTypeAdapterFactory());

equinix-openapi-metal/src/main/java/com/equinix/openapi/metal/v1/api/AuthenticationApi.java

@@ -38,7 +38,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.ws.rs.core.GenericType;
 
 public class AuthenticationApi {
     private ApiClient localVarApiClient;

equinix-openapi-metal/src/main/java/com/equinix/openapi/metal/v1/api/BatchesApi.java

@@ -38,7 +38,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.ws.rs.core.GenericType;
 
 public class BatchesApi {
     private ApiClient localVarApiClient;

equinix-openapi-metal/src/main/java/com/equinix/openapi/metal/v1/api/BgpApi.java

@@ -40,7 +40,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.ws.rs.core.GenericType;
 
 public class BgpApi {
     private ApiClient localVarApiClient;

equinix-openapi-metal/src/main/java/com/equinix/openapi/metal/v1/api/CapacityApi.java

@@ -39,7 +39,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.ws.rs.core.GenericType;
 
 public class CapacityApi {
     private ApiClient localVarApiClient;

equinix-openapi-metal/src/main/java/com/equinix/openapi/metal/v1/api/DevicesApi.java

@@ -52,7 +52,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.ws.rs.core.GenericType;
 
 public class DevicesApi {
     private ApiClient localVarApiClient;

equinix-openapi-metal/src/main/java/com/equinix/openapi/metal/v1/api/EmailsApi.java

@@ -38,7 +38,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.ws.rs.core.GenericType;
 
 public class EmailsApi {
     private ApiClient localVarApiClient;

equinix-openapi-metal/src/main/java/com/equinix/openapi/metal/v1/api/EventsApi.java

@@ -37,7 +37,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.ws.rs.core.GenericType;
 
 public class EventsApi {
     private ApiClient localVarApiClient;

equinix-openapi-metal/src/main/java/com/equinix/openapi/metal/v1/api/FacilitiesApi.java

@@ -36,7 +36,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.ws.rs.core.GenericType;
 
 public class FacilitiesApi {
     private ApiClient localVarApiClient;