openapi_azureipranges 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 600d3728c4c13b831562aa4ad73a583930ccd960285ddf8747ed3560ee4f42b2
-  data.tar.gz: 6f2f9e2d987a1200c66a31609e9e459f56b9ca99816d5f0f337d6a6c60607921
+  metadata.gz: ac0a1c0a718e6f725cb8e3f2f366c0c055c1ad608ce9335ff90f60ccba04fcad
+  data.tar.gz: 7a6844f40399604383bc549e0f51785e51321484993e738feeec3a23253dddc2
 SHA512:
-  metadata.gz: 12f53d2794c088cb0815fd08e5436243be06d99976299239c8687357b41f092286954fc7563beb4f02a8f6a403f7a2b22bc7c56770a8d09f96643b8db1423c0e
-  data.tar.gz: 40ad66fa39ac0bd7e795f029e8c82493f0bc48f5c82fa8fd3a5eb86252d2743814bc2a03665e33f0aaa418baeb83f6973eb278d61f2a67bcf9d4c57ff8d5fa77
+  metadata.gz: af406d715dfcc7d1a877887189bee5d8cdf93d38e40b5bc8d1391131275e814f3946693e31d089489d201fd8674eaff4ccf7caeb790f717e398bab7bac19a821
+  data.tar.gz: a597962afa10e91e41387761ccfd1ef075ce7ce284bfd281d5e721a34575dbb2f4895137f25001debbc727288ae59f1cb873808c631f45136103931a37b2aa81

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    openapi_azureipranges (1.1.0)
+    openapi_azureipranges (1.2.0)
       typhoeus (~> 1.0, >= 1.0.1)
 
 GEM
@@ -11,9 +11,9 @@ GEM
     byebug (13.0.0)
       reline (>= 0.6.0)
     coderay (1.1.3)
-    date (3.5.1)
+    date (3.6.0)
     diff-lcs (1.6.2)
-    ethon (0.18.0)
+    ethon (0.19.1)
       ffi (>= 1.15.0)
       logger
     ffi (1.17.4)
@@ -27,15 +27,15 @@ GEM
     ffi (1.17.4-x86_64-darwin)
     ffi (1.17.4-x86_64-linux-gnu)
     ffi (1.17.4-x86_64-linux-musl)
-    io-console (0.9.2)
+    io-console (0.9.5)
     jaro_winkler (1.5.6)
     logger (1.7.0)
     method_source (1.1.0)
     parallel (1.28.0)
-    parser (3.3.12.0)
+    parser (3.3.13.0)
       ast (~> 2.4.1)
       racc
-    pry (0.16.0)
+    pry (0.16.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
       reline (>= 0.6.0)
@@ -54,15 +54,15 @@ GEM
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.6)
+    rspec-core (3.13.7)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.5)
+    rspec-expectations (3.13.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.8)
+    rspec-mocks (3.13.9)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.7)
+    rspec-support (3.13.8)
     rubocop (0.66.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -73,8 +73,8 @@ GEM
       unicode-display_width (>= 1.4.0, < 1.6)
     ruby-progressbar (1.13.0)
     stringio (3.2.0)
-    typhoeus (1.6.0)
-      ethon (>= 0.18.0)
+    typhoeus (1.7.1)
+      ethon (>= 0.19.1, < 0.20.0)
     unicode-display_width (1.5.0)
 
 PLATFORMS
@@ -99,12 +99,12 @@ DEPENDENCIES
 
 CHECKSUMS
   ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383
-  bundler (4.0.19) sha256=b48056e4c77fb3853cc47775b5447ede44aaa4f53c32f168014ab4fe86587d47
+  bundler (4.0.24) sha256=16ca64e20816a0cf151a948fb141d788602996d2b4d73577b74388fe84fa98bc
   byebug (13.0.0) sha256=d2263efe751941ca520fa29744b71972d39cbc41839496706f5d9b22e92ae05d
   coderay (1.1.3) sha256=dc530018a4684512f8f38143cd2a096c9f02a1fc2459edcfe534787a7fc77d4b
-  date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0
+  date (3.6.0) sha256=18ac945c4e24ebd93534f8eab8c2fd8c5604b3e977105b3798d62a1e8d27b580
   diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962
-  ethon (0.18.0) sha256=b598afc9f30448cb068b850714b7d6948e941476095d04f90a4ac65b8d6efcb2
+  ethon (0.19.1) sha256=f309dec67cfdefaf96b3d1ee0ed4f186eac518f131340f607bb3df3b4e13ddc4
   ffi (1.17.4) sha256=bcd1642e06f0d16fc9e09ac6d49c3a7298b9789bcb58127302f934e437d60acf
   ffi (1.17.4-aarch64-linux-gnu) sha256=b208f06f91ffd8f5e1193da3cae3d2ccfc27fc36fba577baf698d26d91c080df
   ffi (1.17.4-aarch64-linux-musl) sha256=9286b7a615f2676245283aef0a0a3b475ae3aae2bb5448baace630bb77b91f39
@@ -116,14 +116,14 @@ CHECKSUMS
   ffi (1.17.4-x86_64-darwin) sha256=aa70390523cf3235096cf64962b709b4cfbd5c082a2cb2ae714eb0fe2ccda496
   ffi (1.17.4-x86_64-linux-gnu) sha256=9d3db14c2eae074b382fa9c083fe95aec6e0a1451da249eab096c34002bc752d
   ffi (1.17.4-x86_64-linux-musl) sha256=3fdf9888483de005f8ef8d1cf2d3b20d86626af206cbf780f6a6a12439a9c49e
-  io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08
+  io-console (0.9.5) sha256=83dd9bbf4c4680416629245b39cd4212eb5f4d9a4ea91804870c1f6b846414d5
   jaro_winkler (1.5.6) sha256=007db7805527ada1cc12f2547676181d63b0a504ec4dd7a9a2eb2424521ccd81
   logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
   method_source (1.1.0) sha256=181301c9c45b731b4769bc81e8860e72f9161ad7d66dd99103c9ab84f560f5c5
-  openapi_azureipranges (1.1.0)
+  openapi_azureipranges (1.2.0)
   parallel (1.28.0) sha256=33e6de1484baf2524792d178b0913fc8eb94c628d6cfe45599ad4458c638c970
-  parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828
-  pry (0.16.0) sha256=d76c69065698ed1f85e717bd33d7942c38a50868f6b0673c636192b3d1b6054e
+  parser (3.3.13.0) sha256=e02f9b63c2fe05b0c68f692ba4df89b3cb113b663964f75d988fbebfd6c3deca
+  pry (0.16.1) sha256=d92d82c86e7f2dc34beec6d2892d5cf5ea517eea22eed3ceabb38ee62a98accc
   pry-byebug (3.12.0) sha256=594e094ae8a8390a7ad4c7b36ae36e13304ed02664c67417d108dc5f7213d1b7
   psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
@@ -131,15 +131,15 @@ CHECKSUMS
   rake (13.0.6) sha256=5ce4bf5037b4196c24ac62834d8db1ce175470391026bd9e557d669beeb19097
   reline (0.7.0) sha256=5b012d8e55dbf9d450f12bde2cf7d15ff546ae80b3f8f3b30e570d431815583d
   rspec (3.13.2) sha256=206284a08ad798e61f86d7ca3e376718d52c0bc944626b2349266f239f820587
-  rspec-core (3.13.6) sha256=a8823c6411667b60a8bca135364351dda34cd55e44ff94c4be4633b37d828b2d
-  rspec-expectations (3.13.5) sha256=33a4d3a1d95060aea4c94e9f237030a8f9eae5615e9bd85718fe3a09e4b58836
-  rspec-mocks (3.13.8) sha256=086ad3d3d17533f4237643de0b5c42f04b66348c28bf6b9c2d3f4a3b01af1d47
-  rspec-support (3.13.7) sha256=0640e5570872aafefd79867901deeeeb40b0c9875a36b983d85f54fb7381c47c
+  rspec-core (3.13.7) sha256=c64ff16d9788119805cbc6a3f4b6d87cc22417c2d25976a3330de136896b5469
+  rspec-expectations (3.13.6) sha256=bf538ca6d367ff5b0d85a87fdb5c0c6038f2cd1308a0eeba07476caa02d22f35
+  rspec-mocks (3.13.9) sha256=ea5c7ff3054a6098ca6039aacef80aec69d5a8a3ef80be8fc88337359b672a30
+  rspec-support (3.13.8) sha256=e4160030309b7e3e9d9863dfe720a35dfcc577162f5402cd68fc8c5258a0ffd6
   rubocop (0.66.0) sha256=f05a6896f367765b3f0fba663d0add120444f8de604dada405662b10a0860f5a
   ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
   stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1
-  typhoeus (1.6.0) sha256=bacc41c23e379547e29801dc235cd1699b70b955a1ba3d32b2b877aa844c331d
+  typhoeus (1.7.1) sha256=86dcb6d787ee08e34947c9436b24af3c4b02880dc83c466b6ca4dbfc53c2ee7f
   unicode-display_width (1.5.0) sha256=9890eebd24feb4cb0e0542c9b8c6beecb40cda27be8c7afe49312625b36156eb
 
 BUNDLED WITH
-  4.0.19
+  4.0.24

data/README.md

@@ -6,9 +6,9 @@ No description provided (generated by Openapi Generator https://github.com/opena
 
 This SDK is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
-- API version: 1.1.0
-- Package version: 1.1.0
-- Generator version: 7.24.0
+- API version: 1.2.0
+- Package version: 1.2.0
+- Generator version: 7.26.0
 - Build package: org.openapitools.codegen.languages.RubyClientCodegen
 For more information, please visit [https://github.com/oapicf/openapi-azureipranges](https://github.com/oapicf/openapi-azureipranges)
 
@@ -25,16 +25,16 @@ gem build openapi_azureipranges.gemspec
 Then either install the gem locally:
 
 ```shell
-gem install ./openapi_azureipranges-1.1.0.gem
+gem install ./openapi_azureipranges-1.2.0.gem
 ```
 
-(for development, run `gem install --dev ./openapi_azureipranges-1.1.0.gem` to install the development dependencies)
+(for development, run `gem install --dev ./openapi_azureipranges-1.2.0.gem` to install the development dependencies)
 
 or publish the gem to a gem hosting service, e.g. [RubyGems](https://rubygems.org/).
 
 Finally add this to the Gemfile:
 
-    gem 'openapi_azureipranges', '~> 1.1.0'
+    gem 'openapi_azureipranges', '~> 1.2.0'
 
 ### Install from Git
 

data/bin/byebug

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby3.3
+#!/usr/bin/env ruby
 # frozen_string_literal: true
 
 #

data/bin/coderay

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby3.3
+#!/usr/bin/env ruby
 # frozen_string_literal: true
 
 #

data/bin/htmldiff

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby3.3
+#!/usr/bin/env ruby
 # frozen_string_literal: true
 
 #

data/bin/ldiff

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby3.3
+#!/usr/bin/env ruby
 # frozen_string_literal: true
 
 #

data/bin/pry

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby3.3
+#!/usr/bin/env ruby
 # frozen_string_literal: true
 
 #

data/bin/racc

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby3.3
+#!/usr/bin/env ruby
 # frozen_string_literal: true
 
 #

data/bin/rake

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby3.3
+#!/usr/bin/env ruby
 # frozen_string_literal: true
 
 #

data/bin/rspec

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby3.3
+#!/usr/bin/env ruby
 # frozen_string_literal: true
 
 #

data/bin/rubocop

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby3.3
+#!/usr/bin/env ruby
 # frozen_string_literal: true
 
 #

data/bin/ruby-parse

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby3.3
+#!/usr/bin/env ruby
 # frozen_string_literal: true
 
 #

data/bin/ruby-rewrite

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby3.3
+#!/usr/bin/env ruby
 # frozen_string_literal: true
 
 #

data/git_push.sh

@@ -8,24 +8,24 @@ git_repo_id=$2
 release_note=$3
 git_host=$4
 
-if [ "$git_host" = "" ]; then
+if [ -z "${git_host}" ]; then
     git_host="github.com"
-    echo "[INFO] No command line input provided. Set \$git_host to $git_host"
+    echo "[INFO] No command line input provided. Set \${git_host} to ${git_host}"
 fi
 
-if [ "$git_user_id" = "" ]; then
+if [ -z "${git_user_id}" ]; then
     git_user_id="oapicf"
-    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+    echo "[INFO] No command line input provided. Set \${git_user_id} to ${git_user_id}"
 fi
 
-if [ "$git_repo_id" = "" ]; then
+if [ -z "${git_repo_id}" ]; then
     git_repo_id="openapi-azureipranges"
-    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+    echo "[INFO] No command line input provided. Set \${git_repo_id} to ${git_repo_id}"
 fi
 
-if [ "$release_note" = "" ]; then
+if [ -z "${release_note}" ]; then
     release_note="Minor update"
-    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+    echo "[INFO] No command line input provided. Set \${release_note} to ${release_note}"
 fi
 
 # Initialize the local directory as a Git repository
@@ -35,19 +35,16 @@ git init
 git add .
 
 # Commits the tracked changes and prepares them to be pushed to a remote repository.
-git commit -m "$release_note"
+git commit -m "${release_note}"
 
 # Sets the new remote
-git_remote=$(git remote)
-if [ "$git_remote" = "" ]; then # git remote not defined
-
-    if [ "$GIT_TOKEN" = "" ]; then
-        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
-        git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
+if [ -z "$(git remote)" ]; then # git remote not defined
+    if [ -z "${GIT_TOKEN:-}" ]; then
+        echo "[INFO] \${GIT_TOKEN} (environment variable) is not set. Using the git credential in your environment."
+        git remote add origin "https://${git_host}/${git_user_id}/${git_repo_id}.git"
     else
-        git remote add origin https://${git_user_id}:"${GIT_TOKEN}"@${git_host}/${git_user_id}/${git_repo_id}.git
+        git remote add origin "https://${git_user_id}:${GIT_TOKEN}@${git_host}/${git_user_id}/${git_repo_id}.git"
     fi
-
 fi
 
 git pull origin master

data/lib/openapi_azureipranges/api/default_api.rb

@@ -3,10 +3,10 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 1.1.0
+The version of the OpenAPI document: 1.2.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.24.0
+Generator version: 7.26.0
 
 =end
 

data/lib/openapi_azureipranges/api_client.rb

@@ -3,10 +3,10 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 1.1.0
+The version of the OpenAPI document: 1.2.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.24.0
+Generator version: 7.26.0
 
 =end
 

data/lib/openapi_azureipranges/api_error.rb

@@ -3,10 +3,10 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 1.1.0
+The version of the OpenAPI document: 1.2.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.24.0
+Generator version: 7.26.0
 
 =end
 

data/lib/openapi_azureipranges/api_model_base.rb

@@ -3,10 +3,10 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 1.1.0
+The version of the OpenAPI document: 1.2.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.24.0
+Generator version: 7.26.0
 
 =end
 

data/lib/openapi_azureipranges/configuration.rb

@@ -3,10 +3,10 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 1.1.0
+The version of the OpenAPI document: 1.2.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.24.0
+Generator version: 7.26.0
 
 =end
 

data/lib/openapi_azureipranges/models/change.rb

@@ -3,10 +3,10 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 1.1.0
+The version of the OpenAPI document: 1.2.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.24.0
+Generator version: 7.26.0
 
 =end
 
@@ -57,6 +57,16 @@ module OpenApiAzureIpRangesClient
       ])
     end
 
+    # Returns attribute type mapping
+    def self.acceptable_openapi_types
+      openapi_types
+    end
+
+    # Returns the nullable attributes
+    def self.acceptable_openapi_nullable
+      openapi_nullable
+    end
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -131,18 +141,20 @@ module OpenApiAzureIpRangesClient
     def self.build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       attributes = attributes.transform_keys(&:to_sym)
+      # include attributes inherited from allOf parents (the nearest declaration wins)
+      map = acceptable_attribute_map
       transformed_hash = {}
-      openapi_types.each_pair do |key, type|
-        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+      acceptable_openapi_types.each_pair do |key, type|
+        if attributes.key?(map[key]) && attributes[map[key]].nil?
           transformed_hash["#{key}"] = nil
         elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
-          if attributes[attribute_map[key]].is_a?(Array)
-            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
+          if attributes[map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[map[key]].map { |v| _deserialize($1, v) }
           end
-        elsif !attributes[attribute_map[key]].nil?
-          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
+        elsif !attributes[map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[map[key]])
         end
       end
       new(transformed_hash)
@@ -152,10 +164,11 @@ module OpenApiAzureIpRangesClient
     # @return [Hash] Returns the object in the form of hash
     def to_hash
       hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
+      # include attributes inherited from allOf parents (the nearest declaration wins)
+      self.class.acceptable_attribute_map.each_pair do |attr, param|
         value = self.send(attr)
         if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
+          is_nullable = self.class.acceptable_openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
 

data/lib/openapi_azureipranges/models/value.rb

@@ -3,10 +3,10 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 1.1.0
+The version of the OpenAPI document: 1.2.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.24.0
+Generator version: 7.26.0
 
 =end
 
@@ -57,6 +57,16 @@ module OpenApiAzureIpRangesClient
       ])
     end
 
+    # Returns attribute type mapping
+    def self.acceptable_openapi_types
+      openapi_types
+    end
+
+    # Returns the nullable attributes
+    def self.acceptable_openapi_nullable
+      openapi_nullable
+    end
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -129,18 +139,20 @@ module OpenApiAzureIpRangesClient
     def self.build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       attributes = attributes.transform_keys(&:to_sym)
+      # include attributes inherited from allOf parents (the nearest declaration wins)
+      map = acceptable_attribute_map
       transformed_hash = {}
-      openapi_types.each_pair do |key, type|
-        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+      acceptable_openapi_types.each_pair do |key, type|
+        if attributes.key?(map[key]) && attributes[map[key]].nil?
           transformed_hash["#{key}"] = nil
         elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
-          if attributes[attribute_map[key]].is_a?(Array)
-            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
+          if attributes[map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[map[key]].map { |v| _deserialize($1, v) }
           end
-        elsif !attributes[attribute_map[key]].nil?
-          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
+        elsif !attributes[map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[map[key]])
         end
       end
       new(transformed_hash)
@@ -150,10 +162,11 @@ module OpenApiAzureIpRangesClient
     # @return [Hash] Returns the object in the form of hash
     def to_hash
       hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
+      # include attributes inherited from allOf parents (the nearest declaration wins)
+      self.class.acceptable_attribute_map.each_pair do |attr, param|
         value = self.send(attr)
         if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
+          is_nullable = self.class.acceptable_openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
 

data/lib/openapi_azureipranges/models/value_properties.rb

@@ -3,10 +3,10 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 1.1.0
+The version of the OpenAPI document: 1.2.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.24.0
+Generator version: 7.26.0
 
 =end
 
@@ -78,6 +78,16 @@ module OpenApiAzureIpRangesClient
       ])
     end
 
+    # Returns attribute type mapping
+    def self.acceptable_openapi_types
+      openapi_types
+    end
+
+    # Returns the nullable attributes
+    def self.acceptable_openapi_nullable
+      openapi_nullable
+    end
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -174,18 +184,20 @@ module OpenApiAzureIpRangesClient
     def self.build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       attributes = attributes.transform_keys(&:to_sym)
+      # include attributes inherited from allOf parents (the nearest declaration wins)
+      map = acceptable_attribute_map
       transformed_hash = {}
-      openapi_types.each_pair do |key, type|
-        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+      acceptable_openapi_types.each_pair do |key, type|
+        if attributes.key?(map[key]) && attributes[map[key]].nil?
           transformed_hash["#{key}"] = nil
         elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
-          if attributes[attribute_map[key]].is_a?(Array)
-            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
+          if attributes[map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[map[key]].map { |v| _deserialize($1, v) }
           end
-        elsif !attributes[attribute_map[key]].nil?
-          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
+        elsif !attributes[map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[map[key]])
         end
       end
       new(transformed_hash)
@@ -195,10 +207,11 @@ module OpenApiAzureIpRangesClient
     # @return [Hash] Returns the object in the form of hash
     def to_hash
       hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
+      # include attributes inherited from allOf parents (the nearest declaration wins)
+      self.class.acceptable_attribute_map.each_pair do |attr, param|
         value = self.send(attr)
         if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
+          is_nullable = self.class.acceptable_openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
 

data/lib/openapi_azureipranges/version.rb

@@ -3,13 +3,13 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 1.1.0
+The version of the OpenAPI document: 1.2.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.24.0
+Generator version: 7.26.0
 
 =end
 
 module OpenApiAzureIpRangesClient
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/lib/openapi_azureipranges.rb

@@ -3,10 +3,10 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 1.1.0
+The version of the OpenAPI document: 1.2.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.24.0
+Generator version: 7.26.0
 
 =end
 

data/openapi_azureipranges.gemspec

@@ -5,10 +5,10 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 1.1.0
+The version of the OpenAPI document: 1.2.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.24.0
+Generator version: 7.26.0
 
 =end
 

data/spec/api/default_api_spec.rb

@@ -3,10 +3,10 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 1.1.0
+The version of the OpenAPI document: 1.2.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.24.0
+Generator version: 7.26.0
 
 =end
 

data/spec/models/change_spec.rb

@@ -3,10 +3,10 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 1.1.0
+The version of the OpenAPI document: 1.2.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.24.0
+Generator version: 7.26.0
 
 =end
 

data/spec/models/value_properties_spec.rb

@@ -3,10 +3,10 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 1.1.0
+The version of the OpenAPI document: 1.2.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.24.0
+Generator version: 7.26.0
 
 =end
 

data/spec/models/value_spec.rb

@@ -3,10 +3,10 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 1.1.0
+The version of the OpenAPI document: 1.2.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.24.0
+Generator version: 7.26.0
 
 =end
 

data/spec/spec_helper.rb

@@ -3,10 +3,10 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 1.1.0
+The version of the OpenAPI document: 1.2.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.24.0
+Generator version: 7.26.0
 
 =end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openapi_azureipranges
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - OpenAPI Clients Factory
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Azure IP Ranges and Service Tags - Public Cloud Ruby Gem
 test_files: