pulp_file_client 0.1.0b1 → 0.1.0b2

data/lib/pulp_file_client/api/publications_file_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.3-SNAPSHOT
 
 =end
 
-require 'uri'
+require 'cgi'
 
 module PulpFileClient
   class PublicationsFileApi
@@ -107,7 +107,7 @@ module PulpFileClient
         fail ArgumentError, "Missing the required parameter 'file_publication_href' when calling PublicationsFileApi.delete"
       end
       # resource path
-      local_var_path = '{file_publication_href}'.sub('{' + 'file_publication_href' + '}', file_publication_href.to_s)
+      local_var_path = '{file_publication_href}'.sub('{' + 'file_publication_href' + '}', CGI.escape(file_publication_href.to_s).gsub('%2F', '/'))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -147,8 +147,9 @@ module PulpFileClient
     # <!-- User-facing documentation, rendered as html--> A FilePublication contains metadata about all the <a href=\"#operation/content_file_files_list\">File Content</a> in a particular <a href=\"https://docs.pulpproject.org/en/3.0/nightly/restapi.html#operation/repositories_versions_list\">Repository Version.</a> Once a FilePublication has been created, it can be hosted using the <a href=\"#operation/distributions_file_file_list\">File Distribution API.</a>
     # @param [Hash] opts the optional parameters
     # @option opts [String] :ordering Which field to use when ordering the results.
-    # @option opts [Integer] :page A page number within the paginated result set.
-    # @option opts [Integer] :page_size Number of results to return per page.
+    # @option opts [Integer] :limit Number of results to return per page.
+    # @option opts [Integer] :offset The initial index from which to return the results.
+    # @option opts [String] :fields A list of fields to include in the response.
     # @return [InlineResponse2002]
     def list(opts = {})
       data, _status_code, _headers = list_with_http_info(opts)
@@ -159,8 +160,9 @@ module PulpFileClient
     # &lt;!-- User-facing documentation, rendered as html--&gt; A FilePublication contains metadata about all the &lt;a href&#x3D;\&quot;#operation/content_file_files_list\&quot;&gt;File Content&lt;/a&gt; in a particular &lt;a href&#x3D;\&quot;https://docs.pulpproject.org/en/3.0/nightly/restapi.html#operation/repositories_versions_list\&quot;&gt;Repository Version.&lt;/a&gt; Once a FilePublication has been created, it can be hosted using the &lt;a href&#x3D;\&quot;#operation/distributions_file_file_list\&quot;&gt;File Distribution API.&lt;/a&gt;
     # @param [Hash] opts the optional parameters
     # @option opts [String] :ordering Which field to use when ordering the results.
-    # @option opts [Integer] :page A page number within the paginated result set.
-    # @option opts [Integer] :page_size Number of results to return per page.
+    # @option opts [Integer] :limit Number of results to return per page.
+    # @option opts [Integer] :offset The initial index from which to return the results.
+    # @option opts [String] :fields A list of fields to include in the response.
     # @return [Array<(InlineResponse2002, Integer, Hash)>] InlineResponse2002 data, response status code and response headers
     def list_with_http_info(opts = {})
       if @api_client.config.debugging
@@ -172,8 +174,9 @@ module PulpFileClient
       # query parameters
       query_params = opts[:query_params] || {}
       query_params[:'ordering'] = opts[:'ordering'] if !opts[:'ordering'].nil?
-      query_params[:'page'] = opts[:'page'] if !opts[:'page'].nil?
-      query_params[:'page_size'] = opts[:'page_size'] if !opts[:'page_size'].nil?
+      query_params[:'limit'] = opts[:'limit'] if !opts[:'limit'].nil?
+      query_params[:'offset'] = opts[:'offset'] if !opts[:'offset'].nil?
+      query_params[:'fields'] = opts[:'fields'] if !opts[:'fields'].nil?
 
       # header parameters
       header_params = opts[:header_params] || {}
@@ -212,6 +215,7 @@ module PulpFileClient
     # <!-- User-facing documentation, rendered as html--> A FilePublication contains metadata about all the <a href=\"#operation/content_file_files_list\">File Content</a> in a particular <a href=\"https://docs.pulpproject.org/en/3.0/nightly/restapi.html#operation/repositories_versions_list\">Repository Version.</a> Once a FilePublication has been created, it can be hosted using the <a href=\"#operation/distributions_file_file_list\">File Distribution API.</a>
     # @param file_publication_href [String] URI of File Publication. e.g.: /pulp/api/v3/publications/file/file/1/
     # @param [Hash] opts the optional parameters
+    # @option opts [String] :fields A list of fields to include in the response.
     # @return [FilePublication]
     def read(file_publication_href, opts = {})
       data, _status_code, _headers = read_with_http_info(file_publication_href, opts)
@@ -222,6 +226,7 @@ module PulpFileClient
     # &lt;!-- User-facing documentation, rendered as html--&gt; A FilePublication contains metadata about all the &lt;a href&#x3D;\&quot;#operation/content_file_files_list\&quot;&gt;File Content&lt;/a&gt; in a particular &lt;a href&#x3D;\&quot;https://docs.pulpproject.org/en/3.0/nightly/restapi.html#operation/repositories_versions_list\&quot;&gt;Repository Version.&lt;/a&gt; Once a FilePublication has been created, it can be hosted using the &lt;a href&#x3D;\&quot;#operation/distributions_file_file_list\&quot;&gt;File Distribution API.&lt;/a&gt;
     # @param file_publication_href [String] URI of File Publication. e.g.: /pulp/api/v3/publications/file/file/1/
     # @param [Hash] opts the optional parameters
+    # @option opts [String] :fields A list of fields to include in the response.
     # @return [Array<(FilePublication, Integer, Hash)>] FilePublication data, response status code and response headers
     def read_with_http_info(file_publication_href, opts = {})
       if @api_client.config.debugging
@@ -232,10 +237,11 @@ module PulpFileClient
         fail ArgumentError, "Missing the required parameter 'file_publication_href' when calling PublicationsFileApi.read"
       end
       # resource path
-      local_var_path = '{file_publication_href}'.sub('{' + 'file_publication_href' + '}', file_publication_href.to_s)
+      local_var_path = '{file_publication_href}'.sub('{' + 'file_publication_href' + '}', CGI.escape(file_publication_href.to_s).gsub('%2F', '/'))
 
       # query parameters
       query_params = opts[:query_params] || {}
+      query_params[:'fields'] = opts[:'fields'] if !opts[:'fields'].nil?
 
       # header parameters
       header_params = opts[:header_params] || {}

data/lib/pulp_file_client/api/remotes_file_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.3-SNAPSHOT
 
 =end
 
-require 'uri'
+require 'cgi'
 
 module PulpFileClient
   class RemotesFileApi
@@ -107,7 +107,7 @@ module PulpFileClient
         fail ArgumentError, "Missing the required parameter 'file_remote_href' when calling RemotesFileApi.delete"
       end
       # resource path
-      local_var_path = '{file_remote_href}'.sub('{' + 'file_remote_href' + '}', file_remote_href.to_s)
+      local_var_path = '{file_remote_href}'.sub('{' + 'file_remote_href' + '}', CGI.escape(file_remote_href.to_s).gsub('%2F', '/'))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -156,8 +156,9 @@ module PulpFileClient
     # @option opts [String] :_last_updated__gte Filter results where _last_updated is greater than or equal to value
     # @option opts [String] :_last_updated__range Filter results where _last_updated is between two comma separated values
     # @option opts [String] :_last_updated ISO 8601 formatted dates are supported
-    # @option opts [Integer] :page A page number within the paginated result set.
-    # @option opts [Integer] :page_size Number of results to return per page.
+    # @option opts [Integer] :limit Number of results to return per page.
+    # @option opts [Integer] :offset The initial index from which to return the results.
+    # @option opts [String] :fields A list of fields to include in the response.
     # @return [InlineResponse2003]
     def list(opts = {})
       data, _status_code, _headers = list_with_http_info(opts)
@@ -175,8 +176,9 @@ module PulpFileClient
     # @option opts [String] :_last_updated__gte Filter results where _last_updated is greater than or equal to value
     # @option opts [String] :_last_updated__range Filter results where _last_updated is between two comma separated values
     # @option opts [String] :_last_updated ISO 8601 formatted dates are supported
-    # @option opts [Integer] :page A page number within the paginated result set.
-    # @option opts [Integer] :page_size Number of results to return per page.
+    # @option opts [Integer] :limit Number of results to return per page.
+    # @option opts [Integer] :offset The initial index from which to return the results.
+    # @option opts [String] :fields A list of fields to include in the response.
     # @return [Array<(InlineResponse2003, Integer, Hash)>] InlineResponse2003 data, response status code and response headers
     def list_with_http_info(opts = {})
       if @api_client.config.debugging
@@ -195,8 +197,9 @@ module PulpFileClient
       query_params[:'_last_updated__gte'] = opts[:'_last_updated__gte'] if !opts[:'_last_updated__gte'].nil?
       query_params[:'_last_updated__range'] = opts[:'_last_updated__range'] if !opts[:'_last_updated__range'].nil?
       query_params[:'_last_updated'] = opts[:'_last_updated'] if !opts[:'_last_updated'].nil?
-      query_params[:'page'] = opts[:'page'] if !opts[:'page'].nil?
-      query_params[:'page_size'] = opts[:'page_size'] if !opts[:'page_size'].nil?
+      query_params[:'limit'] = opts[:'limit'] if !opts[:'limit'].nil?
+      query_params[:'offset'] = opts[:'offset'] if !opts[:'offset'].nil?
+      query_params[:'fields'] = opts[:'fields'] if !opts[:'fields'].nil?
 
       # header parameters
       header_params = opts[:header_params] || {}
@@ -261,7 +264,7 @@ module PulpFileClient
         fail ArgumentError, "Missing the required parameter 'data' when calling RemotesFileApi.partial_update"
       end
       # resource path
-      local_var_path = '{file_remote_href}'.sub('{' + 'file_remote_href' + '}', file_remote_href.to_s)
+      local_var_path = '{file_remote_href}'.sub('{' + 'file_remote_href' + '}', CGI.escape(file_remote_href.to_s).gsub('%2F', '/'))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -305,6 +308,7 @@ module PulpFileClient
     # <!-- User-facing documentation, rendered as html--> FileRemote represents an external source of <a href=\"#operation/content_file_files_list\">File Content</a>.  The target url of a FileRemote must contain a file manifest, which contains the metadata for all files at the source.
     # @param file_remote_href [String] URI of File Remote. e.g.: /pulp/api/v3/remotes/file/file/1/
     # @param [Hash] opts the optional parameters
+    # @option opts [String] :fields A list of fields to include in the response.
     # @return [FileRemote]
     def read(file_remote_href, opts = {})
       data, _status_code, _headers = read_with_http_info(file_remote_href, opts)
@@ -315,6 +319,7 @@ module PulpFileClient
     # &lt;!-- User-facing documentation, rendered as html--&gt; FileRemote represents an external source of &lt;a href&#x3D;\&quot;#operation/content_file_files_list\&quot;&gt;File Content&lt;/a&gt;.  The target url of a FileRemote must contain a file manifest, which contains the metadata for all files at the source.
     # @param file_remote_href [String] URI of File Remote. e.g.: /pulp/api/v3/remotes/file/file/1/
     # @param [Hash] opts the optional parameters
+    # @option opts [String] :fields A list of fields to include in the response.
     # @return [Array<(FileRemote, Integer, Hash)>] FileRemote data, response status code and response headers
     def read_with_http_info(file_remote_href, opts = {})
       if @api_client.config.debugging
@@ -325,10 +330,11 @@ module PulpFileClient
         fail ArgumentError, "Missing the required parameter 'file_remote_href' when calling RemotesFileApi.read"
       end
       # resource path
-      local_var_path = '{file_remote_href}'.sub('{' + 'file_remote_href' + '}', file_remote_href.to_s)
+      local_var_path = '{file_remote_href}'.sub('{' + 'file_remote_href' + '}', CGI.escape(file_remote_href.to_s).gsub('%2F', '/'))
 
       # query parameters
       query_params = opts[:query_params] || {}
+      query_params[:'fields'] = opts[:'fields'] if !opts[:'fields'].nil?
 
       # header parameters
       header_params = opts[:header_params] || {}
@@ -391,7 +397,7 @@ module PulpFileClient
         fail ArgumentError, "Missing the required parameter 'data' when calling RemotesFileApi.sync"
       end
       # resource path
-      local_var_path = '{file_remote_href}sync/'.sub('{' + 'file_remote_href' + '}', file_remote_href.to_s)
+      local_var_path = '{file_remote_href}sync/'.sub('{' + 'file_remote_href' + '}', CGI.escape(file_remote_href.to_s).gsub('%2F', '/'))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -461,7 +467,7 @@ module PulpFileClient
         fail ArgumentError, "Missing the required parameter 'data' when calling RemotesFileApi.update"
       end
       # resource path
-      local_var_path = '{file_remote_href}'.sub('{' + 'file_remote_href' + '}', file_remote_href.to_s)
+      local_var_path = '{file_remote_href}'.sub('{' + 'file_remote_href' + '}', CGI.escape(file_remote_href.to_s).gsub('%2F', '/'))
 
       # query parameters
       query_params = opts[:query_params] || {}

data/lib/pulp_file_client/api_client.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.3-SNAPSHOT
 
 =end
 
@@ -14,8 +14,7 @@ require 'date'
 require 'json'
 require 'logger'
 require 'tempfile'
-require 'typhoeus'
-require 'uri'
+require 'faraday'
 
 module PulpFileClient
   class ApiClient
@@ -47,26 +46,46 @@ module PulpFileClient
     # @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_mode => @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 PulpFileClient
       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 PulpFileClient
     # @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 PulpFileClient
 
       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,12 +131,46 @@ module PulpFileClient
           @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
 
+    # Builds the HTTP request body
+    #
+    # @param [Hash] header_params Header parameters
+    # @param [Hash] form_params Query parameters
+    # @param [Object] body HTTP body (JSON/XML)
+    # @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'
+        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, ::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
+          end
+        end
+      elsif body
+        data = body.is_a?(String) ? body : body.to_json
+      else
+        data = nil
+      end
+      data
+    end
+
     # Check if the given MIME is a JSON MIME.
     # JSON MIME examples:
     #   application/json
@@ -262,35 +305,7 @@ module PulpFileClient
     def build_request_url(path)
       # Add leading and trailing slashes to path
       path = "/#{path}".gsub(/\/+/, '/')
-      URI.encode(@config.base_url + path)
-    end
-
-    # Builds the HTTP request body
-    #
-    # @param [Hash] header_params Header parameters
-    # @param [Hash] form_params Query parameters
-    # @param [Object] body HTTP body (JSON/XML)
-    # @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'
-        data = {}
-        form_params.each do |key, value|
-          case value
-          when ::File, ::Array, nil
-            # let typhoeus handle File, Array and nil parameters
-            data[key] = value
-          else
-            data[key] = value.to_s
-          end
-        end
-      elsif body
-        data = body.is_a?(String) ? body : body.to_json
-      else
-        data = nil
-      end
-      data
+      @config.base_url + path
     end
 
     # Update hearder and query params based on authentication settings.

data/lib/pulp_file_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.3-SNAPSHOT
 
 =end
 

data/lib/pulp_file_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.3-SNAPSHOT
 
 =end
 
-require 'uri'
-
 module PulpFileClient
   class Configuration
     # Defines url scheme
@@ -88,33 +86,28 @@ module PulpFileClient
     # @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 PulpFileClient
       @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 PulpFileClient
     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_file_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.3-SNAPSHOT
 
 =end
 

data/lib/pulp_file_client/models/file_content.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.3-SNAPSHOT
 
 =end
 
@@ -17,12 +17,12 @@ module PulpFileClient
     # Timestamp of creation.
     attr_accessor :_created
 
-    attr_accessor :_href
+    attr_accessor :_type
 
     # Artifact file representing the physical content
     attr_accessor :_artifact
 
-    attr_accessor :_type
+    attr_accessor :_href
 
     # The MD5 checksum if available.
     attr_accessor :md5
@@ -49,9 +49,9 @@ module PulpFileClient
     def self.attribute_map
       {
         :'_created' => :'_created',
-        :'_href' => :'_href',
-        :'_artifact' => :'_artifact',
         :'_type' => :'_type',
+        :'_artifact' => :'_artifact',
+        :'_href' => :'_href',
         :'md5' => :'md5',
         :'sha1' => :'sha1',
         :'sha224' => :'sha224',
@@ -66,9 +66,9 @@ module PulpFileClient
     def self.openapi_types
       {
         :'_created' => :'DateTime',
-        :'_href' => :'String',
-        :'_artifact' => :'String',
         :'_type' => :'String',
+        :'_artifact' => :'String',
+        :'_href' => :'String',
         :'md5' => :'String',
         :'sha1' => :'String',
         :'sha224' => :'String',
@@ -98,16 +98,16 @@ module PulpFileClient
         self._created = attributes[:'_created']
       end
 
-      if attributes.key?(:'_href')
-        self._href = attributes[:'_href']
+      if attributes.key?(:'_type')
+        self._type = attributes[:'_type']
       end
 
       if attributes.key?(:'_artifact')
         self._artifact = attributes[:'_artifact']
       end
 
-      if attributes.key?(:'_type')
-        self._type = attributes[:'_type']
+      if attributes.key?(:'_href')
+        self._href = attributes[:'_href']
       end
 
       if attributes.key?(:'md5')
@@ -143,14 +143,14 @@ module PulpFileClient
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if @_artifact.nil?
-        invalid_properties.push('invalid value for "_artifact", _artifact cannot be nil.')
-      end
-
       if !@_type.nil? && @_type.to_s.length < 1
         invalid_properties.push('invalid value for "_type", the character length must be great than or equal to 1.')
       end
 
+      if @_artifact.nil?
+        invalid_properties.push('invalid value for "_artifact", _artifact cannot be nil.')
+      end
+
       if !@md5.nil? && @md5.to_s.length < 1
         invalid_properties.push('invalid value for "md5", the character length must be great than or equal to 1.')
       end
@@ -189,8 +189,8 @@ module PulpFileClient
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      return false if @_artifact.nil?
       return false if !@_type.nil? && @_type.to_s.length < 1
+      return false if @_artifact.nil?
       return false if !@md5.nil? && @md5.to_s.length < 1
       return false if !@sha1.nil? && @sha1.to_s.length < 1
       return false if !@sha224.nil? && @sha224.to_s.length < 1
@@ -292,9 +292,9 @@ module PulpFileClient
       return true if self.equal?(o)
       self.class == o.class &&
           _created == o._created &&
-          _href == o._href &&
-          _artifact == o._artifact &&
           _type == o._type &&
+          _artifact == o._artifact &&
+          _href == o._href &&
           md5 == o.md5 &&
           sha1 == o.sha1 &&
           sha224 == o.sha224 &&
@@ -313,7 +313,7 @@ module PulpFileClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [_created, _href, _artifact, _type, md5, sha1, sha224, sha256, sha384, sha512, relative_path].hash
+      [_created, _type, _artifact, _href, md5, sha1, sha224, sha256, sha384, sha512, relative_path].hash
     end
 
     # Builds the object from hash

data/lib/pulp_file_client/models/file_distribution.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.3-SNAPSHOT
 
 =end
 

data/lib/pulp_file_client/models/file_publication.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.3-SNAPSHOT
 
 =end
 

data/lib/pulp_file_client/models/file_remote.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.3-SNAPSHOT
 
 =end