pulp_maven_client 0.1.0b3.dev0.1561664543 → 0.1.0b3.dev01565206788

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb108fa8eaa118b20bdc7114e6e57f40a7ca350baa0ad09a91b92bf6a0f2a78c
-  data.tar.gz: a3a9c9ec8090eabf6bcd4719e2c9c0a4dca042b3251e17628e03b5343a47cb6b
+  metadata.gz: 5b4965a2df41a54b3e57e89797222a9d9d5951c653e94b12ce1a1656303a13ce
+  data.tar.gz: 71b83951f19caf2094ebaddcdb977677ca3df511de141253e7ebe54589d1bc83
 SHA512:
-  metadata.gz: 812d7a2315f0018897f1e86efb74e4ec2982b9cd5a79eb4c3f38185255a7ce7e0adbcf2eac8ef4ef75b53d50cb818a75abe767f0cd3e21479426d5a9e253d2d4
-  data.tar.gz: 8bd4028f9bb3434a4d2929de925ee08927cb41d60dc4cbeef1f47db47e96c2aa8b93ec9e3db8b0fe4654f66747c6c6a9d74767e8dcc2e47fbeb7e1efbc49ebaa
+  metadata.gz: 845bd969bf56ef6382ba4304a1e816af7900bd95611e4963a576ab925608fe4ea0c3903108a49ae90c07badf1c927766d43be468bd63091149a0914ff2d37f55
+  data.tar.gz: d57623570e30c65eee11dcd08f0e0d6f027db0f0ff9322208a0e3dfb8e844ad25d5665181366800b203d09af9fed142bd26e6e0896e0e3aacdc3d4a4756946e1

data/README.md

@@ -7,7 +7,7 @@ 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: v3
-- Package version: 0.1.0b3.dev0.1561664543
+- Package version: 0.1.0b3.dev01565206788
 - Build package: org.openapitools.codegen.languages.RubyClientCodegen
 
 ## Installation
@@ -23,16 +23,16 @@ gem build pulp_maven_client.gemspec
 Then either install the gem locally:
 
 ```shell
-gem install ./pulp_maven_client-0.1.0b3.dev0.1561664543.gem
+gem install ./pulp_maven_client-0.1.0b3.dev01565206788.gem
 ```
 
-(for development, run `gem install --dev ./pulp_maven_client-0.1.0b3.dev0.1561664543.gem` to install the development dependencies)
+(for development, run `gem install --dev ./pulp_maven_client-0.1.0b3.dev01565206788.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 'pulp_maven_client', '~> 0.1.0b3.dev0.1561664543'
+    gem 'pulp_maven_client', '~> 0.1.0b3.dev01565206788'
 
 ### Install from Git
 
@@ -59,8 +59,8 @@ require 'pulp_maven_client'
 # Setup authorization
 PulpMavenClient.configure do |config|
   # Configure HTTP basic authorization: Basic
-  config.username = 'YOUR USERNAME'
-  config.password = 'YOUR PASSWORD'
+  config.username = 'YOUR_USERNAME'
+  config.password = 'YOUR_PASSWORD'
 end
 
 api_instance = PulpMavenClient::ContentArtifactApi.new

data/docs/InlineResponse200.md

@@ -4,9 +4,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**count** | **Integer** |  | 
 **_next** | **String** |  | [optional] 
 **previous** | **String** |  | [optional] 
-**count** | **Integer** |  | 
 **results** | [**Array<MavenArtifact>**](MavenArtifact.md) |  | 
 
 ## Code Sample
@@ -14,9 +14,9 @@ Name | Type | Description | Notes
 ```ruby
 require 'PulpMavenClient'
 
-instance = PulpMavenClient::InlineResponse200.new(_next: null,
+instance = PulpMavenClient::InlineResponse200.new(count: null,
+                                 _next: null,
                                  previous: null,
-                                 count: null,
                                  results: null)
 ```
 

data/docs/InlineResponse2001.md

@@ -4,9 +4,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**count** | **Integer** |  | 
 **_next** | **String** |  | [optional] 
 **previous** | **String** |  | [optional] 
-**count** | **Integer** |  | 
 **results** | [**Array<MavenDistribution>**](MavenDistribution.md) |  | 
 
 ## Code Sample
@@ -14,9 +14,9 @@ Name | Type | Description | Notes
 ```ruby
 require 'PulpMavenClient'
 
-instance = PulpMavenClient::InlineResponse2001.new(_next: null,
+instance = PulpMavenClient::InlineResponse2001.new(count: null,
+                                 _next: null,
                                  previous: null,
-                                 count: null,
                                  results: null)
 ```
 

data/docs/InlineResponse2002.md

@@ -4,9 +4,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**count** | **Integer** |  | 
 **_next** | **String** |  | [optional] 
 **previous** | **String** |  | [optional] 
-**count** | **Integer** |  | 
 **results** | [**Array<MavenRemote>**](MavenRemote.md) |  | 
 
 ## Code Sample
@@ -14,9 +14,9 @@ Name | Type | Description | Notes
 ```ruby
 require 'PulpMavenClient'
 
-instance = PulpMavenClient::InlineResponse2002.new(_next: null,
+instance = PulpMavenClient::InlineResponse2002.new(count: null,
+                                 _next: null,
                                  previous: null,
-                                 count: null,
                                  results: null)
 ```
 

data/docs/MavenRemote.md

@@ -9,7 +9,6 @@ Name | Type | Description | Notes
 **_type** | **String** |  | [optional] 
 **name** | **String** | A unique name for this remote. | 
 **url** | **String** | The URL of an external content source. | 
-**validate** | **Boolean** | If True, the plugin will validate imported artifacts. | [optional] 
 **ssl_ca_certificate** | **String** | A string containing the PEM encoded CA certificate used to validate the server certificate presented by the remote server. All new line characters must be escaped. Returns SHA256 sum on GET. | [optional] 
 **ssl_client_certificate** | **String** | A string containing the PEM encoded client certificate used for authentication. All new line characters must be escaped. Returns SHA256 sum on GET. | [optional] 
 **ssl_client_key** | **String** | A PEM encoded private key used for authentication. Returns SHA256 sum on GET. | [optional] 
@@ -19,7 +18,7 @@ Name | Type | Description | Notes
 **password** | **String** | The password to be used for authentication when syncing. | [optional] 
 **_last_updated** | **DateTime** | Timestamp of the most recent update of the remote. | [optional] 
 **download_concurrency** | **Integer** | Total number of simultaneous connections. | [optional] 
-**policy** | **String** | The policy to use when downloading content. The possible values include: 'immediate', 'on_demand', and 'cache_only'. 'immediate' is the default. | [optional] [default to 'immediate']
+**policy** | **String** | The policy to use when downloading content. | [optional] [default to 'immediate']
 
 ## Code Sample
 
@@ -31,7 +30,6 @@ instance = PulpMavenClient::MavenRemote.new(_href: null,
                                  _type: null,
                                  name: null,
                                  url: null,
-                                 validate: null,
                                  ssl_ca_certificate: null,
                                  ssl_client_certificate: null,
                                  ssl_client_key: null,

data/lib/pulp_maven_client/api/content_artifact_api.rb

@@ -6,11 +6,11 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.0.0
+OpenAPI Generator version: 4.1.0-SNAPSHOT
 
 =end
 
-require 'uri'
+require 'cgi'
 
 module PulpMavenClient
   class ContentArtifactApi
@@ -190,7 +190,7 @@ module PulpMavenClient
         fail ArgumentError, "Missing the required parameter 'maven_artifact_href' when calling ContentArtifactApi.read"
       end
       # resource path
-      local_var_path = '{maven_artifact_href}'.sub('{' + 'maven_artifact_href' + '}', maven_artifact_href.to_s)
+      local_var_path = '{maven_artifact_href}'.sub('{' + 'maven_artifact_href' + '}', CGI.escape(maven_artifact_href.to_s).gsub('%2F', '/'))
 
       # query parameters
       query_params = opts[:query_params] || {}

data/lib/pulp_maven_client/api/distributions_maven_api.rb

@@ -6,11 +6,11 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.0.0
+OpenAPI Generator version: 4.1.0-SNAPSHOT
 
 =end
 
-require 'uri'
+require 'cgi'
 
 module PulpMavenClient
   class DistributionsMavenApi
@@ -107,7 +107,7 @@ module PulpMavenClient
         fail ArgumentError, "Missing the required parameter 'maven_distribution_href' when calling DistributionsMavenApi.delete"
       end
       # resource path
-      local_var_path = '{maven_distribution_href}'.sub('{' + 'maven_distribution_href' + '}', maven_distribution_href.to_s)
+      local_var_path = '{maven_distribution_href}'.sub('{' + 'maven_distribution_href' + '}', CGI.escape(maven_distribution_href.to_s).gsub('%2F', '/'))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -255,7 +255,7 @@ module PulpMavenClient
         fail ArgumentError, "Missing the required parameter 'data' when calling DistributionsMavenApi.partial_update"
       end
       # resource path
-      local_var_path = '{maven_distribution_href}'.sub('{' + 'maven_distribution_href' + '}', maven_distribution_href.to_s)
+      local_var_path = '{maven_distribution_href}'.sub('{' + 'maven_distribution_href' + '}', CGI.escape(maven_distribution_href.to_s).gsub('%2F', '/'))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -319,7 +319,7 @@ module PulpMavenClient
         fail ArgumentError, "Missing the required parameter 'maven_distribution_href' when calling DistributionsMavenApi.read"
       end
       # resource path
-      local_var_path = '{maven_distribution_href}'.sub('{' + 'maven_distribution_href' + '}', maven_distribution_href.to_s)
+      local_var_path = '{maven_distribution_href}'.sub('{' + 'maven_distribution_href' + '}', CGI.escape(maven_distribution_href.to_s).gsub('%2F', '/'))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -387,7 +387,7 @@ module PulpMavenClient
         fail ArgumentError, "Missing the required parameter 'data' when calling DistributionsMavenApi.update"
       end
       # resource path
-      local_var_path = '{maven_distribution_href}'.sub('{' + 'maven_distribution_href' + '}', maven_distribution_href.to_s)
+      local_var_path = '{maven_distribution_href}'.sub('{' + 'maven_distribution_href' + '}', CGI.escape(maven_distribution_href.to_s).gsub('%2F', '/'))
 
       # query parameters
       query_params = opts[:query_params] || {}

data/lib/pulp_maven_client/api/remotes_maven_api.rb

@@ -6,11 +6,11 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.0.0
+OpenAPI Generator version: 4.1.0-SNAPSHOT
 
 =end
 
-require 'uri'
+require 'cgi'
 
 module PulpMavenClient
   class RemotesMavenApi
@@ -107,7 +107,7 @@ module PulpMavenClient
         fail ArgumentError, "Missing the required parameter 'maven_remote_href' when calling RemotesMavenApi.delete"
       end
       # resource path
-      local_var_path = '{maven_remote_href}'.sub('{' + 'maven_remote_href' + '}', maven_remote_href.to_s)
+      local_var_path = '{maven_remote_href}'.sub('{' + 'maven_remote_href' + '}', CGI.escape(maven_remote_href.to_s).gsub('%2F', '/'))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -261,7 +261,7 @@ module PulpMavenClient
         fail ArgumentError, "Missing the required parameter 'data' when calling RemotesMavenApi.partial_update"
       end
       # resource path
-      local_var_path = '{maven_remote_href}'.sub('{' + 'maven_remote_href' + '}', maven_remote_href.to_s)
+      local_var_path = '{maven_remote_href}'.sub('{' + 'maven_remote_href' + '}', CGI.escape(maven_remote_href.to_s).gsub('%2F', '/'))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -325,7 +325,7 @@ module PulpMavenClient
         fail ArgumentError, "Missing the required parameter 'maven_remote_href' when calling RemotesMavenApi.read"
       end
       # resource path
-      local_var_path = '{maven_remote_href}'.sub('{' + 'maven_remote_href' + '}', maven_remote_href.to_s)
+      local_var_path = '{maven_remote_href}'.sub('{' + 'maven_remote_href' + '}', CGI.escape(maven_remote_href.to_s).gsub('%2F', '/'))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -393,7 +393,7 @@ module PulpMavenClient
         fail ArgumentError, "Missing the required parameter 'data' when calling RemotesMavenApi.update"
       end
       # resource path
-      local_var_path = '{maven_remote_href}'.sub('{' + 'maven_remote_href' + '}', maven_remote_href.to_s)
+      local_var_path = '{maven_remote_href}'.sub('{' + 'maven_remote_href' + '}', CGI.escape(maven_remote_href.to_s).gsub('%2F', '/'))
 
       # query parameters
       query_params = opts[:query_params] || {}

data/lib/pulp_maven_client/api_client.rb

@@ -6,16 +6,15 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.0.0
+OpenAPI Generator version: 4.1.0-SNAPSHOT
 
 =end
 
 require 'date'
+require 'faraday'
 require 'json'
 require 'logger'
 require 'tempfile'
-require 'typhoeus'
-require 'uri'
 
 module PulpMavenClient
   class ApiClient
@@ -47,26 +46,46 @@ module PulpMavenClient
     # @return [Array<(Object, Integer, Hash)>] an array of 3 elements:
     #   the data deserialized from response body (could be nil), response status code and response headers.
     def call_api(http_method, path, opts = {})
-      request = build_request(http_method, path, opts)
-      response = request.run
+      ssl_options = {
+        :ca_file => @config.ssl_ca_file,
+        :verify => @config.ssl_verify,
+        :verify => @config.ssl_verify_mode,
+        :client_cert => @config.ssl_client_cert,
+        :client_key => @config.ssl_client_key
+      }
 
-      if @config.debugging
-        @config.logger.debug "HTTP response body ~BEGIN~\n#{response.body}\n~END~\n"
+      connection = Faraday.new(:url => config.base_url, :ssl => ssl_options) do |conn|
+        conn.basic_auth(config.username, config.password)
+        if opts[:header_params]["Content-Type"] == "multipart/form-data"
+          conn.request :multipart
+          conn.request :url_encoded
+        end
+        conn.adapter(Faraday.default_adapter)
       end
 
-      unless response.success?
-        if response.timed_out?
-          fail ApiError.new('Connection timed out')
-        elsif response.code == 0
-          # Errors from libcurl will be made visible here
-          fail ApiError.new(:code => 0,
-                            :message => response.return_message)
-        else
-          fail ApiError.new(:code => response.code,
-                            :response_headers => response.headers,
-                            :response_body => response.body),
-               response.status_message
+      begin
+        response = connection.public_send(http_method.to_sym.downcase) do |req|
+          build_request(http_method, path, req, opts)
+        end
+
+        if @config.debugging
+          @config.logger.debug "HTTP response body ~BEGIN~\n#{response.body}\n~END~\n"
         end
+
+        unless response.success?
+          if response.status == 0
+            # Errors from libcurl will be made visible here
+            fail ApiError.new(:code => 0,
+                              :message => response.return_message)
+          else
+            fail ApiError.new(:code => response.status,
+                              :response_headers => response.headers,
+                              :response_body => response.body),
+                 response.reason_phrase
+          end
+        end
+      rescue Faraday::TimeoutError
+        fail ApiError.new('Connection timed out')
       end
 
       if opts[:return_type]
@@ -74,7 +93,7 @@ module PulpMavenClient
       else
         data = nil
       end
-      return data, response.code, response.headers
+      return data, response.status, response.headers
     end
 
     # Builds the HTTP request
@@ -86,7 +105,7 @@ module PulpMavenClient
     # @option opts [Hash] :form_params Query parameters
     # @option opts [Object] :body HTTP body (JSON/XML)
     # @return [Typhoeus::Request] A Typhoeus Request
-    def build_request(http_method, path, opts = {})
+    def build_request(http_method, path, request, opts = {})
       url = build_request_url(path)
       http_method = http_method.to_sym.downcase
 
@@ -96,25 +115,15 @@ module PulpMavenClient
 
       update_params_for_auth! header_params, query_params, opts[:auth_names]
 
-      # set ssl_verifyhosts option based on @config.verify_ssl_host (true/false)
-      _verify_ssl_host = @config.verify_ssl_host ? 2 : 0
-
       req_opts = {
         :method => http_method,
         :headers => header_params,
         :params => query_params,
         :params_encoding => @config.params_encoding,
         :timeout => @config.timeout,
-        :ssl_verifypeer => @config.verify_ssl,
-        :ssl_verifyhost => _verify_ssl_host,
-        :sslcert => @config.cert_file,
-        :sslkey => @config.key_file,
         :verbose => @config.debugging
       }
 
-      # set custom cert, if provided
-      req_opts[:cainfo] = @config.ssl_ca_cert if @config.ssl_ca_cert
-
       if [:post, :patch, :put, :delete].include?(http_method)
         req_body = build_request_body(header_params, form_params, opts[:body])
         req_opts.update :body => req_body
@@ -122,8 +131,10 @@ module PulpMavenClient
           @config.logger.debug "HTTP request body param ~BEGIN~\n#{req_body}\n~END~\n"
         end
       end
-
-      request = Typhoeus::Request.new(url, req_opts)
+      request.headers = header_params
+      request.body = req_body
+      request.url url
+      request.params = query_params
       download_file(request) if opts[:return_type] == 'File'
       request
     end
@@ -262,7 +273,7 @@ module PulpMavenClient
     def build_request_url(path)
       # Add leading and trailing slashes to path
       path = "/#{path}".gsub(/\/+/, '/')
-      URI.encode(@config.base_url + path)
+      @config.base_url + path
     end
 
     # Builds the HTTP request body
@@ -273,13 +284,17 @@ module PulpMavenClient
     # @return [String] HTTP body data in the form of string
     def build_request_body(header_params, form_params, body)
       # http form
-      if header_params['Content-Type'] == 'application/x-www-form-urlencoded' ||
-          header_params['Content-Type'] == 'multipart/form-data'
+      if header_params['Content-Type'] == 'application/x-www-form-urlencoded'
+        data = URI.encode_www_form(form_params)
+      elsif header_params['Content-Type'] == 'multipart/form-data'
         data = {}
         form_params.each do |key, value|
           case value
-          when ::File, ::Array, nil
-            # let typhoeus handle File, Array and nil parameters
+          when ::File, ::Tempfile
+            # TODO hardcode to application/octet-stream, need better way to detect content type
+            data[key] = Faraday::UploadIO.new(value.path, 'application/octet-stream', value.path)
+          when ::Array, nil
+            # let Faraday handle Array and nil parameters
             data[key] = value
           else
             data[key] = value.to_s

data/lib/pulp_maven_client/api_error.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.0.0
+OpenAPI Generator version: 4.1.0-SNAPSHOT
 
 =end
 

data/lib/pulp_maven_client/configuration.rb

@@ -6,12 +6,10 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.0.0
+OpenAPI Generator version: 4.1.0-SNAPSHOT
 
 =end
 
-require 'uri'
-
 module PulpMavenClient
   class Configuration
     # Defines url scheme
@@ -88,33 +86,28 @@ module PulpMavenClient
     # @note Do NOT set it to false in production code, otherwise you would face multiple types of cryptographic attacks.
     #
     # @return [true, false]
-    attr_accessor :verify_ssl
+    attr_accessor :ssl_verify
 
     ### TLS/SSL setting
-    # Set this to false to skip verifying SSL host name
-    # Default to true.
+    # Any `OpenSSL::SSL::` constant (see https://ruby-doc.org/stdlib-2.5.1/libdoc/openssl/rdoc/OpenSSL/SSL.html)
     #
     # @note Do NOT set it to false in production code, otherwise you would face multiple types of cryptographic attacks.
     #
-    # @return [true, false]
-    attr_accessor :verify_ssl_host
+    attr_accessor :ssl_verify_mode
 
     ### TLS/SSL setting
     # Set this to customize the certificate file to verify the peer.
     #
     # @return [String] the path to the certificate file
-    #
-    # @see The `cainfo` option of Typhoeus, `--cert` option of libcurl. Related source code:
-    # https://github.com/typhoeus/typhoeus/blob/master/lib/typhoeus/easy_factory.rb#L145
-    attr_accessor :ssl_ca_cert
+    attr_accessor :ssl_ca_file
 
     ### TLS/SSL setting
     # Client certificate file (for client certificate)
-    attr_accessor :cert_file
+    attr_accessor :ssl_client_cert
 
     ### TLS/SSL setting
     # Client private key file (for client certificate)
-    attr_accessor :key_file
+    attr_accessor :ssl_client_key
 
     # Set this to customize parameters encoding of array parameter with multi collectionFormat.
     # Default to nil.
@@ -135,11 +128,11 @@ module PulpMavenClient
       @api_key_prefix = {}
       @timeout = 0
       @client_side_validation = true
-      @verify_ssl = true
-      @verify_ssl_host = true
-      @params_encoding = nil
-      @cert_file = nil
-      @key_file = nil
+      @ssl_verify = true
+      @ssl_verify_mode = nil
+      @ssl_ca_file = nil
+      @ssl_client_cert = nil
+      @ssl_client_key = nil
       @debugging = false
       @inject_format = false
       @force_ending_format = false
@@ -174,8 +167,7 @@ module PulpMavenClient
     end
 
     def base_url
-      url = "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '')
-      URI.encode(url)
+      "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '')
     end
 
     # Gets API key (with prefix if set).

data/lib/pulp_maven_client/models/async_operation_response.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.0.0
+OpenAPI Generator version: 4.1.0-SNAPSHOT
 
 =end
 

data/lib/pulp_maven_client/models/inline_response200.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.0.0
+OpenAPI Generator version: 4.1.0-SNAPSHOT
 
 =end
 
@@ -14,20 +14,20 @@ require 'date'
 
 module PulpMavenClient
   class InlineResponse200
+    attr_accessor :count
+
     attr_accessor :_next
 
     attr_accessor :previous
 
-    attr_accessor :count
-
     attr_accessor :results
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
+        :'count' => :'count',
         :'_next' => :'next',
         :'previous' => :'previous',
-        :'count' => :'count',
         :'results' => :'results'
       }
     end
@@ -35,9 +35,9 @@ module PulpMavenClient
     # Attribute type mapping.
     def self.openapi_types
       {
+        :'count' => :'Integer',
         :'_next' => :'String',
         :'previous' => :'String',
-        :'count' => :'Integer',
         :'results' => :'Array<MavenArtifact>'
       }
     end
@@ -57,6 +57,10 @@ module PulpMavenClient
         h[k.to_sym] = v
       }
 
+      if attributes.key?(:'count')
+        self.count = attributes[:'count']
+      end
+
       if attributes.key?(:'_next')
         self._next = attributes[:'_next']
       end
@@ -65,10 +69,6 @@ module PulpMavenClient
         self.previous = attributes[:'previous']
       end
 
-      if attributes.key?(:'count')
-        self.count = attributes[:'count']
-      end
-
       if attributes.key?(:'results')
         if (value = attributes[:'results']).is_a?(Array)
           self.results = value
@@ -104,9 +104,9 @@ module PulpMavenClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          count == o.count &&
           _next == o._next &&
           previous == o.previous &&
-          count == o.count &&
           results == o.results
     end
 
@@ -119,7 +119,7 @@ module PulpMavenClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [_next, previous, count, results].hash
+      [count, _next, previous, results].hash
     end
 
     # Builds the object from hash